braid 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afbdb15969e052393b88693a8b6079066d180052
-  data.tar.gz: a5198d79c0cff3d4ba868d3e644d4233d2838e99
+  metadata.gz: 78d66492c589068152aee142e694bf02ee1201bd
+  data.tar.gz: 54d080bf631011a6c09e8882337539eaed2b510f
 SHA512:
-  metadata.gz: 75ffd2beb47c5cb36320e1a326ffb48d6bc6d2e8aaaf83e809b5e22cbbf763cbe63e31261f577fff8d6cad4102247fb98315362d095dbcc3e5da2471e09910a0
-  data.tar.gz: 0c53d7fda15233809526ef8b45318ce9175a8d2ea4030d786e46a9601fc397a822674842a9a9975e67a22716846c8a6a97e77d025de362a4974d6292d1197225
+  metadata.gz: dbde11ac65aae3c78581e0d99e90def3b997d72929723abcb9fb097d7743cd8ebb8697a8ae161a5af1795fdc632745f86928bddae45b08cc847d6ded37dbdebb
+  data.tar.gz: 1e52e6ad9304532cf6c8e340b9b57643e5550e9f4858ac1d798abcc116d1cc1e45355ada3b92cd76ac3d60ffcb9b4ad0c03650ea3b3550032b26fb1d24c83a6d

data/README.md

@@ -76,6 +76,12 @@ to the grit project:
 
     braid diff lib/grit > grit.patch
 
+Alternatively you can push changes back to the source directory directly using the following command. The command
+will push the changes to the branch `myproject_customizations` that has been branched off the source branch (`master`
+in this example). Omit the `--branch` argument to push directly to the source branch.
+
+    braid push lib/grit --branch myproject_customizations
+
 Once those changes have been applied to grit you probably want to update your local version of grit again.
 
     braid update lib/grit

data/bin/braid

@@ -40,11 +40,11 @@ Main {
       . braid add http://remote/path local/dir
     TXT
 
-    mixin :argument_url, :optional_path, :option_branch, :option_revision, :option_full, :option_verbose
+    mixin :argument_url, :optional_path, :option_branch, :option_revision, :option_full, :option_verbose, :option_remote_path
 
     run {
       Braid.verbose = verbose
-      Braid::Command.run(:add, url, {'path' => path, 'branch' => branch, 'revision' => revision, 'full' => full})
+      Braid::Command.run(:add, url, {'path' => path, 'branch' => branch, 'revision' => revision, 'full' => full, 'remote_path' => remote_path})
     }
   }
 
@@ -113,6 +113,7 @@ Main {
       options = {
         'keep' => keep
       }
+      Braid.verbose = verbose
       Braid::Command.run(:diff, path, options)
     }
   }
@@ -206,6 +207,15 @@ Main {
     }
   }
 
+  mixin(:option_remote_path) {
+    option(:remote_path, :p) {
+      optional
+      argument :required
+      desc 'remote path'
+      attr
+    }
+  }
+
   mixin(:option_revision) {
     option(:revision, :r) {
       optional

data/lib/braid/command.rb

@@ -89,7 +89,7 @@ module Braid
     end
 
     def validate_new_revision(mirror, new_revision)
-      return git.rev_parse(mirror.remote) unless new_revision
+      return git.rev_parse("#{mirror.remote}/#{mirror.branch}") unless new_revision
 
       new_revision = git.rev_parse(new_revision)
       old_revision = mirror.revision
@@ -101,8 +101,8 @@ module Braid
       new_revision
     end
 
-    def determine_target_revision(new_revision)
-      git.rev_parse(new_revision)
+    def determine_target_revision(mirror, new_revision)
+      git.rev_parse(mirror.versioned_path(new_revision))
     end
   end
 end

data/lib/braid/commands/add.rb

@@ -4,6 +4,7 @@ module Braid
       def run(url, options = {})
         with_reset_on_error do
           mirror           = config.add_from_options(url, options)
+          add_config_file
 
           branch_message   = (mirror.branch == 'master') ? '' : " branch '#{mirror.branch}'"
           revision_message = options['revision'] ? " at #{display_revision(mirror, options['revision'])}" : ''
@@ -16,7 +17,7 @@ module Braid
           mirror.fetch
 
           new_revision    = validate_new_revision(mirror, options['revision'])
-          target_revision = determine_target_revision(new_revision)
+          target_revision = determine_target_revision(mirror, new_revision)
 
           unless mirror.squashed?
             git.merge_ours(target_revision)

data/lib/braid/commands/diff.rb

@@ -2,14 +2,12 @@ module Braid
   module Commands
     class Diff < Command
       def run(path = nil, options = {})
-        with_reset_on_error do
-          path ? diff_one(path, options) : diff_all(options)
-        end
+        path ? diff_one(path, options) : diff_all(options)
       end
 
       protected
 
-       def diff_all(options = {})
+      def diff_all(options = {})
         print "\n"
         msg "Diffing all mirrors.\n=======================================================\n"
         config.mirrors.each do |path|

data/lib/braid/commands/push.rb

@@ -12,7 +12,7 @@ module Braid
         setup_remote(mirror)
         mirror.fetch
 
-        base_revision = git.rev_parse(mirror.remote)
+        base_revision = git.rev_parse("#{mirror.remote}/#{mirror.branch}")
         unless mirror.merged?(base_revision)
           msg 'Mirror is not up to date. Stopping.'
           clear_remote(mirror, options)
@@ -40,7 +40,9 @@ module Braid
           git.fetch(mirror.cached_url) if File.exist?(mirror.cached_url)
           git.fetch(remote_url, "+refs/heads/#{mirror.branch}")
           git.checkout(base_revision)
-          git.apply(diff)
+          args =[]
+          args << "--directory=#{mirror.remote_path}" if mirror.remote_path
+          git.apply(diff, args)
           system('git commit -v')
           msg "Pushing changes to remote branch #{branch}."
           git.push(remote_url, "HEAD:refs/heads/#{branch}")

data/lib/braid/commands/setup.rb

@@ -29,7 +29,7 @@ module Braid
 
         msg "Setup: Creating remote for '#{mirror.path}'." if verbose?
         url = use_local_cache? ? git_cache.path(mirror.url) : mirror.url
-        git.remote_add(mirror.remote, url, mirror.branch)
+        git.remote_add(mirror.remote, url)
       end
     end
   end

data/lib/braid/commands/status.rb

@@ -13,7 +13,7 @@ module Braid
         print "\n"
         msg "Listing all mirrors.\n=======================================================\n"
         config.mirrors.each do |path|
-          list_one(path, options)
+          status_one(path, options)
         end
         print "\n"
       end

data/lib/braid/commands/update.rb

@@ -45,19 +45,17 @@ module Braid
         rescue InvalidRevision
           # Ignored as it means the revision matches expected
         end
-        target_revision = determine_target_revision(new_revision)
+        target_revision = determine_target_revision(mirror, new_revision)
+        current_revision = determine_target_revision(mirror, mirror.base_revision)
 
-        if (options['revision'] && was_locked && target_revision == mirror.base_revision) ||
-          (options['revision'].nil? && !was_locked && mirror.merged?(target_revision))
+        if (options['revision'] && was_locked && target_revision == current_revision) ||
+          (options['revision'].nil? && !was_locked && mirror.merged?(git.rev_parse(new_revision)))
           msg "Mirror '#{mirror.path}' is already up to date."
           clear_remote(mirror, options)
           return
         end
 
-        if mirror.squashed?
-          diff          = mirror.diff
-          base_revision = mirror.base_revision
-        end
+        base_revision = mirror.base_revision if mirror.squashed?
 
         mirror.revision = new_revision
         mirror.lock = new_revision if options['revision']
@@ -67,7 +65,7 @@ module Braid
         begin
           if mirror.squashed?
             local_hash                    = git.rev_parse('HEAD')
-            base_hash                     = generate_tree_hash(mirror, base_revision)
+            base_hash                     = generate_tree_hash(mirror, mirror.versioned_path(base_revision))
             remote_hash                   = generate_tree_hash(mirror, target_revision)
             ENV["GITHEAD_#{local_hash}"]  = 'HEAD'
             ENV["GITHEAD_#{remote_hash}"] = target_revision

data/lib/braid/mirror.rb

@@ -1,6 +1,6 @@
 module Braid
   class Mirror
-    ATTRIBUTES = %w(url branch squashed revision lock)
+    ATTRIBUTES = %w(url branch squashed revision lock remote_path)
 
     class UnknownType < BraidError
       def message
@@ -32,7 +32,9 @@ module Braid
 
       squashed = !options['full']
 
-      attributes = {'url' => url, 'branch' => branch, 'squashed' => squashed}
+      remote_path = options['remote_path']
+
+      attributes = {'url' => url, 'branch' => branch, 'squashed' => squashed, 'remote_path' => remote_path}
       self.new(path, attributes)
     end
 
@@ -59,9 +61,13 @@ module Braid
       end
     end
 
+    def versioned_path(revision)
+      "#{revision}:#{self.remote_path}"
+    end
+
     def diff
       fetch
-      remote_hash = git.rev_parse("#{base_revision}:")
+      remote_hash = git.rev_parse(versioned_path(base_revision))
       local_hash  = git.tree_hash(path)
       remote_hash != local_hash ? git.diff_tree(remote_hash, local_hash) : ''
     end
@@ -95,10 +101,10 @@ module Braid
 
     def method_missing(name, *args)
       if ATTRIBUTES.find { |attribute| name.to_s =~ /^(#{attribute})(=)?$/ }
-        unless $2
-          attributes[$1]
-        else
+        if $2
           attributes[$1] = args[0]
+        else
+          attributes[$1]
         end
       else
         raise NameError, "unknown attribute `#{name}'"
@@ -113,7 +119,8 @@ module Braid
       hash          = nil
       local_commits.each do |local_commit|
         local_tree = git.tree_hash(path, local_commit)
-        if match = remote_hashes.find { |_, remote_tree| local_tree == remote_tree }
+        match = remote_hashes.find { |_, remote_tree| local_tree == remote_tree }
+        if match
           hash = match[0]
           break
         end

data/lib/braid/operations.rb

@@ -219,8 +219,8 @@ module Braid
       end
 
       # Implies tracking.
-      def remote_add(remote, path, branch)
-        invoke(:remote, 'add', "-t #{branch} -m #{branch}", remote, path)
+      def remote_add(remote, path)
+        invoke(:remote, 'add', remote, path)
         true
       end
 

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = '1.0.15'
+  VERSION = '1.0.16'
 end

data/spec/integration/adding_spec.rb

@@ -31,7 +31,7 @@ describe 'Adding a mirror in a clean repository' do
         run_command("#{BRAID_BIN} add #{@skit1}")
       end
 
-      braids = YAML::load_file("#{@shiny}/#{Braid::CONFIG_FILE}")
+      braids = YAML::load_file("#{@shiny}/.braids.json")
       braids['skit1']['squashed'].should == true
       braids['skit1']['url'].should == @skit1
       braids['skit1']['revision'].should_not be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braid
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Cristi Balan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main