norbert-braid 0.4.12 → 0.4.13

data/bin/braid

@@ -54,7 +54,7 @@ Main {
     mixin :argument_url, :option_type, :optional_path, :option_branch, :option_rails_plugin, :option_revision, :option_full, :option_verbose
 
     run {
-      Braid::Operations::VERBOSE = verbose
+      Braid.verbose = verbose
       Braid::Command.run(:add, url, { "type" => type, "path" => path, "branch" => branch, "rails_plugin" => rails_plugin, "revision" => revision, "full" => full })
     }
   }
@@ -75,11 +75,11 @@ Main {
       . braid update local/dir
     TXT
 
-    mixin :optional_path, :option_revision, :option_head, :option_safe, :option_verbose
+    mixin :optional_path, :option_revision, :option_head, :option_verbose
 
     run {
-      Braid::Operations::VERBOSE = verbose
-      Braid::Command.run(:update, path, { "revision" => revision, "head" => head , "safe" => safe })
+      Braid.verbose = verbose
+      Braid::Command.run(:update, path, { "revision" => revision, "head" => head })
     }
   }
 
@@ -99,7 +99,7 @@ Main {
     mixin :argument_path, :option_verbose
 
     run {
-      Braid::Operations::VERBOSE = verbose
+      Braid.verbose = verbose
       Braid::Command.run(:remove, path)
     }
   }
@@ -116,7 +116,7 @@ Main {
     mixin :optional_path, :option_verbose
 
     run {
-      Braid::Operations::VERBOSE = verbose
+      Braid.verbose = verbose
       Braid::Command.run(:setup, path)
     }
   }
@@ -133,7 +133,6 @@ Main {
     mixin :argument_path, :option_verbose
 
     run {
-      Braid::Operations::VERBOSE = verbose
       Braid::Command.run(:diff, path)
     }
   }
@@ -216,14 +215,6 @@ Main {
     }
   }
 
-  mixin(:option_safe) {
-    option(:safe) {
-      optional
-      desc 'safe on merge errors'
-      attr
-    }
-  }
-  
   mixin(:option_verbose) {
     option(:verbose, :v) {
       optional 

data/braid.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = %q{braid}
-  s.version = "0.4.12"
+  s.version = "0.4.13"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cristi Balan", "Norbert Crombach"]
-  s.date = %q{2008-10-04}
+  s.date = %q{2008-10-23}
   s.default_executable = %q{braid}
   s.description = %q{A simple tool for tracking vendor branches in git.}
   s.email = %q{evil@che.lu}

data/lib/braid/command.rb

@@ -35,6 +35,10 @@ module Braid
     end
 
     private
+      def use_local_cache?
+        Braid.use_local_cache
+      end
+
       def self.verify_git_version!
         git.require_version!(REQUIRED_GIT_VERSION)
       end
@@ -108,7 +112,7 @@ module Braid
         new_revision
       end
 
-      def determine_target_commit(mirror, new_revision)
+      def determine_target_revision(mirror, new_revision)
         unless mirror.type == "svn"
           git.rev_parse(new_revision)
         else

data/lib/braid/commands/add.rb

@@ -8,7 +8,7 @@ module Braid
           mirror = config.add_from_options(url, options)
 
           branch_message = (mirror.type == "svn" || mirror.branch == "master") ? "" : " branch '#{mirror.branch}'"
-          revision_message = options["revision"] ? " at #{display_revision(mirror)}" : ""
+          revision_message = options["revision"] ? " at #{display_revision(mirror, options["revision"])}" : ""
           msg "Adding #{mirror.type} mirror of '#{mirror.url}'#{branch_message}#{revision_message}."
 
           # these commands are explained in the subtree merge guide
@@ -18,12 +18,12 @@ module Braid
           mirror.fetch
 
           new_revision = validate_new_revision(mirror, options["revision"])
-          target_hash = determine_target_commit(mirror, new_revision)
+          target_revision = determine_target_revision(mirror, new_revision)
 
           unless mirror.squashed?
-            git.merge_ours(target_hash)
+            git.merge_ours(target_revision)
           end
-          git.read_tree(target_hash, mirror.path)
+          git.read_tree_prefix(target_revision, mirror.path)
 
           mirror.revision = new_revision
           mirror.lock = new_revision if options["revision"]

data/lib/braid/commands/setup.rb

@@ -16,14 +16,15 @@ module Braid
         def setup_one(path)
           mirror = config.get!(path)
 
-          if git.remote_exists?(mirror.remote)
+          if git.remote_url(mirror.remote)
             msg "Mirror '#{mirror.path}/' already has a remote. Skipping."
             return
           end
 
           msg "Setting up remote for '#{mirror.path}/'."
           unless mirror.type == "svn"
-            git.remote_add(mirror.remote, mirror.cached_url, mirror.branch)
+            url = use_local_cache? ? git_cache.path(mirror.url) : mirror.url
+            git.remote_add(mirror.remote, url, mirror.branch)
           else
             git_svn.init(mirror.remote, mirror.url)
           end

data/lib/braid/commands/update.rb

@@ -35,44 +35,62 @@ module Braid
           mirror.fetch
 
           new_revision = validate_new_revision(mirror, options["revision"])
-          target_hash = determine_target_commit(mirror, new_revision)
+          target_revision = determine_target_revision(mirror, new_revision)
 
-          if mirror.merged?(target_hash)
+          if mirror.merged?(target_revision)
             msg "Mirror '#{mirror.path}/' is already up to date. Skipping."
             return
           end
 
-          diff = mirror.diff if mirror.squashed? # get diff before setting revision
+          if mirror.squashed?
+            diff = mirror.diff
+            base_revision = mirror.base_revision
+          end
 
           mirror.revision = new_revision
           mirror.lock = new_revision if options["revision"]
-          config.update(mirror)
 
           msg "Updating mirror '#{mirror.path}/'."
-          if mirror.squashed?
-            git.rm_r(mirror.path)
-            git.read_tree(target_hash, mirror.path)
-            unless diff.empty?
-              git.apply(diff, *(options["safe"] ? ["--reject"] : []))
+          begin
+            if mirror.squashed?
+              local_hash = git.rev_parse("HEAD")
+              if diff
+                base_hash = generate_tree_hash(mirror, base_revision)
+              else
+                base_hash = local_hash
+              end
+              remote_hash = generate_tree_hash(mirror, target_revision)
+              ENV["GITHEAD_#{local_hash}"] = "HEAD"
+              ENV["GITHEAD_#{remote_hash}"] = target_revision
+              git.merge_recursive(base_hash, local_hash, remote_hash)
+            else
+              git.merge_subtree(target_revision)
             end
-          else
-            git.merge_subtree(target_hash)
+          rescue Operations::MergeError => error
+            msg "Caught merge error. Breaking."
           end
 
+          config.update(mirror)
           add_config_file
 
-          revision_message = " to " + (options["revision"] ? display_revision(mirror) : "HEAD")
-          commit_message = "Update mirror '#{mirror.path}/'#{revision_message}"
-          git.commit(commit_message)
+          commit_message = "Update mirror '#{mirror.path}/' to #{display_revision(mirror)}"
 
-        rescue Operations::ShellExecutionError => error
-          if options["safe"]
-            msg "Caught shell error. Breaking."
-            exit(0)
+          if error
+            File.open(".git/MERGE_MSG", 'w') { |f| f.puts(commit_message) }
+            return
           else
-            raise error
+            git.commit(commit_message)
           end
         end
+
+        def generate_tree_hash(mirror, revision)
+          git.rm_r(mirror.path)
+          git.read_tree_prefix(revision, mirror.path)
+          success = git.commit("Temporary commit for mirror '#{mirror.path}/'")
+          hash = git.rev_parse("HEAD")
+          git.reset_hard("HEAD^") if success
+          hash
+        end
     end
   end
 end

data/lib/braid/mirror.rb

@@ -91,23 +91,27 @@ module Braid
 
     def fetch
       unless type == "svn"
-        init_or_fetch_local_cache
+        git_cache.fetch(url) if cached?
         git.fetch(remote)
       else
         git_svn.fetch(remote)
       end
     end
 
-    def cached_url
-      if Braid::USE_LOCAL_CACHE
-        File.join(Braid::LOCAL_CACHE_DIR, url.gsub(/[\/:@]/, "_"))
-      else
-        url
-      end
+    def cached?
+      git.remote_url(remote) == git_cache.path(url)
     end
 
-    def init_or_fetch_local_cache
-      git_cache.init_or_fetch(url, cached_url)
+    def base_revision
+      if revision
+        unless type == "svn"
+          git.rev_parse(revision)
+        else
+          git_svn.commit_hash(remote, revision)
+        end
+      else
+        inferred_revision
+      end
     end
 
     private
@@ -123,18 +127,6 @@ module Braid
         end
       end
 
-      def base_revision
-        if revision
-          unless type == "svn"
-            git.rev_parse(revision)
-          else
-            git_svn.commit_hash(remote, revision)
-          end
-        else
-          inferred_revision
-        end
-      end
-
       def inferred_revision
         local_commits = git.rev_list("HEAD", "-- #{path}").split("\n")
         remote_hashes = git.rev_list("--pretty=format:\"%T\"", remote).split("commit ").map do |chunk|

data/lib/braid/operations.rb

@@ -34,13 +34,9 @@ module Braid
         "local changes are present"
       end
     end
-    class LocalCacheDirBroken < BraidError
-      def initialize(dir)
-        @dir = dir
-      end
-
+    class MergeError < BraidError
       def message
-        "Local cache '#{@dir}' needs to be recreated. Remove the directory and run the command again."
+        "could not merge"
       end
     end
 
@@ -49,7 +45,6 @@ module Braid
       include Singleton
 
       def self.command; name.split('::').last.downcase; end # hax!
-      def self.verbose; Braid::Operations::VERBOSE ; end
 
       def version
         status, out, err = exec!("#{self.class.command} --version")
@@ -103,7 +98,7 @@ module Braid
           ENV['LANG'] = 'C'
 
           out, err = nil
-          puts "executing cmd(#{cmd})" if Proxy.verbose
+          log(cmd)
           status = Open4.popen4(cmd) do |pid, stdin, stdout, stderr|
             out = stdout.read
             err = stderr.read
@@ -120,10 +115,25 @@ module Braid
           [status, out, err]
         end
 
+        def sh(cmd, message = nil)
+          message ||= "could not fetch" if cmd =~ /fetch/
+          log(cmd)
+          system(cmd)
+          raise ShellExecutionError, message unless $? == 0
+          true
+        end
+
         def msg(str)
           puts str
         end
 
+        def log(cmd)
+          msg "Executing `#{cmd}`" if verbose?
+        end
+
+        def verbose?
+          Braid.verbose
+        end
     end
 
     class Git < Proxy
@@ -139,16 +149,13 @@ module Braid
         end
       end
 
-      def fetch(remote)
+      def fetch(remote = nil)
+        args = remote && "-n #{remote}"
         # open4 messes with the pipes of index-pack
-        system("git fetch -n #{remote} 2>&1 >/dev/null")
-        raise ShellExecutionError, "could not fetch" unless $? == 0
-        true
+        sh("git fetch #{args} 2>&1 >/dev/null")
       end
 
       def checkout(treeish)
-        # TODO debug
-        msg "Checking out '#{treeish}'."
         invoke(:checkout, treeish)
         true
       end
@@ -173,9 +180,15 @@ module Braid
       end
 
       # Checks git and svn remotes.
-      def remote_exists?(remote)
-        # TODO clean up and maybe return more information
-        !!File.readlines(".git/config").find { |line| line =~ /^\[(svn-)?remote "#{Regexp.escape(remote)}"\]/ }
+      def remote_url(remote)
+        key = "remote.#{remote}.url"
+        begin
+          invoke(:config, key)
+        rescue ShellExecutionError
+          invoke(:config, "svn-#{key}")
+        end
+      rescue ShellExecutionError
+        nil
       end
 
       def reset_hard(target)
@@ -194,9 +207,18 @@ module Braid
         # TODO which options are needed?
         invoke(:merge, "-s subtree --no-commit --no-ff", opt)
         true
+      rescue ShellExecutionError
+        raise MergeError
+      end
+
+      def merge_recursive(base_hash, local_hash, remote_hash)
+        invoke(:merge_recursive, base_hash, "-- #{local_hash} #{remote_hash}")
+        true
+      rescue ShellExecutionError
+        raise MergeError
       end
 
-      def read_tree(treeish, prefix)
+      def read_tree_prefix(treeish, prefix)
         invoke(:read_tree, "--prefix=#{prefix}/ -u", treeish)
         true
       end
@@ -248,6 +270,11 @@ module Braid
         true
       end
 
+      def clone(*args)
+        # overrides builtin
+        invoke(:clone, *args)
+      end
+
       private
         def command(name)
           "#{self.class.command} #{name.to_s.gsub('_', '-')}"
@@ -261,14 +288,11 @@ module Braid
         out = invoke(:log, "--show-commit --oneline", "-r #{revision}", remote)
         part = out.to_s.split(" | ")[1]
         raise UnknownRevision, "r#{revision}" unless part
-        Git.instance.rev_parse(part) # FIXME ugly ugly ugly
+        git.rev_parse(part)
       end
 
       def fetch(remote)
-        # open4 messes with the pipes of index-pack
-        system("git svn fetch #{remote} 2>&1 >/dev/null")
-        raise ShellExecutionError, "could not fetch" unless $? == 0
-        true
+        sh("git svn fetch #{remote} 2>&1 >/dev/null")
       end
 
       def init(remote, path)
@@ -280,6 +304,10 @@ module Braid
         def command(name)
           "#{self.class.command} #{name}"
         end
+
+        def git
+          Git.instance
+        end
     end
 
     class Svn < Proxy
@@ -295,25 +323,39 @@ module Braid
       end
     end
 
-    class GitCache < Proxy
-      def init_or_fetch(url, dir)
-        if File.exists? dir
-          # bail if the local cache was created with --no-checkout
-          if File.exists? "#{dir}/.git"
-            raise LocalCacheDirBroken.new(dir)
-          end
+    class GitCache
+      include Singleton
+
+      def fetch(url)
+        dir = path(url)
 
-          msg "Updating local cache of '#{url}' into '#{dir}'."
-          FileUtils.cd(dir) do |d|
-            status, out, err = exec!("git fetch")
+        # remove local cache if it was created with --no-checkout
+        if File.exists?("#{dir}/.git")
+          FileUtils.rm_r(dir)
+        end
+
+        if File.exists?(dir)
+          Dir.chdir(dir) do
+            git.fetch
           end
         else
-          FileUtils.mkdir_p(Braid::LOCAL_CACHE_DIR)
-
-          msg "Caching '#{url}' into '#{dir}'."
-          status, out, err = exec!("git clone --mirror #{url} #{dir}")
+          FileUtils.mkdir_p(local_cache_dir)
+          git.clone("--mirror", url, dir)
         end
       end
+
+      def path(url)
+        File.join(local_cache_dir, url.gsub(/[\/:@]/, "_"))
+      end
+
+      private
+        def local_cache_dir
+          Braid.local_cache_dir
+        end
+
+        def git
+          Git.instance
+        end
     end
 
     module VersionControl
@@ -335,5 +377,3 @@ module Braid
     end
   end
 end
-
-

data/lib/braid.rb

@@ -1,13 +1,17 @@
 $:.unshift File.dirname(__FILE__)
 
 module Braid
-  VERSION = "0.4.12"
+  VERSION = "0.4.13"
 
   CONFIG_FILE = ".braids"
-  USE_LOCAL_CACHE = ENV["BRAID_USE_LOCAL_CACHE"] != "no"
-  LOCAL_CACHE_DIR = ENV["BRAID_LOCAL_CACHE_DIR"] || "#{ENV["HOME"]}/.braid/cache/"
   REQUIRED_GIT_VERSION = "1.6"
 
+  def self.verbose; @verbose || false; end
+  def self.verbose=(new_value); @verbose = !!new_value; end
+
+  def self.use_local_cache; [nil, "true", "1"].include?(ENV["BRAID_USE_LOCAL_CACHE"]); end
+  def self.local_cache_dir; File.expand_path(ENV["BRAID_LOCAL_CACHE_DIR"] || "#{ENV["HOME"]}/.braid/cache"); end
+
   class BraidError < StandardError
     def message
       value = super

data/test/integration/updating_test.rb

@@ -41,7 +41,7 @@ describe "Updating a mirror without conflicts" do
 
       output = `git log --pretty=oneline`.split("\n")
       output.length.should == 3
-      output[0].should =~ "Update mirror 'skit1/' to HEAD"
+      output[0].should =~ /Update mirror 'skit1\/' to '[0-9a-f]{7}'/
     end
 
   end
@@ -79,7 +79,7 @@ describe "Updating a mirror without conflicts" do
 
       output = `git log --pretty=oneline`.split("\n")
       output.length.should == 3
-      output[0].should =~ "Update mirror 'skit1/' to HEAD"
+      output[0].should =~ "Update mirror 'skit1/' to r3"
     end
 
   end

data/test/mirror_test.rb

@@ -71,13 +71,13 @@ describe "Braid::Mirror#base_revision" do
     @mirror = build_mirror
     @mirror.revision.should.be.nil
     @mirror.expects(:inferred_revision).returns('b' * 40)
-    @mirror.send(:base_revision).should == 'b' * 40
+    @mirror.base_revision.should == 'b' * 40
   end
 
   it "should be the parsed hash for git mirrors" do
     @mirror = build_mirror("revision" => 'a' * 7)
     git.expects(:rev_parse).with('a' * 7).returns('a' * 40)
-    @mirror.send(:base_revision).should == 'a' * 40
+    @mirror.base_revision.should == 'a' * 40
   end
 end
 
@@ -93,26 +93,18 @@ describe "Braid::Mirror#inferred_revision" do
   end
 end
 
-describe "Braid::Mirror#cached_url" do
-  it "should return a valid local cache name" do
-    @mirror = new_from_options("git://remoteurl/path/to/repo.git")
-    @mirror.cached_url.should == "#{ENV["HOME"]}/.braid/cache/git___remoteurl_path_to_repo.git"
-
-    @mirror = new_from_options("git@remoteurl/path/to/repo.git")
-    @mirror.cached_url.should == "#{ENV["HOME"]}/.braid/cache/git_remoteurl_path_to_repo.git"
-
-    @mirror = new_from_options("remoteurl/path/to/repo/", "type" => "git")
-    @mirror.cached_url.should == "#{ENV["HOME"]}/.braid/cache/remoteurl_path_to_repo"
+describe "Braid::Mirror#cached?" do
+  before(:each) do
+    @mirror = new_from_options("git://path")
   end
-end
 
-describe "Braid::Mirror#init_or_fetch_local_cache" do
-  it "should " do
-    @mirror = new_from_options("git@remoteurl/path/to/repo.git")
-    git_cache.expects(:init_or_fetch).with("git@remoteurl/path/to/repo.git", "#{ENV["HOME"]}/.braid/cache/git_remoteurl_path_to_repo.git")
-    @mirror.init_or_fetch_local_cache
+  it "should be true when the remote path matches the cache path" do
+    git.expects(:remote_url).with(@mirror.remote).returns(git_cache.path(@mirror.url))
+    @mirror.should.be.cached
   end
 
+  it "should be false if the remote does not point to the cache" do
+    git.expects(:remote_url).with(@mirror.remote).returns(@mirror.url)
+    @mirror.should.not.be.cached
+  end
 end
-
-

data/test/operations_test.rb

@@ -1,20 +1,10 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-describe "Braid::Operations::Git#remote_exists?" do
-  before(:each) do
-    File.expects(:readlines).returns(["[remote \"braid/git/one\"]\n", "[svn-remote \"braid/git/two\"]\n"])
-  end
-
-  it "should return true for existing git remotes" do
-    git.remote_exists?("braid/git/one").should == true
-  end
-
-  it "should return true for existing svn remotes" do
-    git.remote_exists?("braid/git/two").should == true
-  end
-
-  it "should return false for nonexistent remotes" do
-    git.remote_exists?("N/A").should == false
+describe "Braid::Operations::Git#remote_url" do
+  it "should use git config" do
+    # FIXME weak test
+    git.expects(:invoke).with(:config, 'remote.braid/git/one.url').returns("git://path")
+    git.remote_url("braid/git/one").should == "git://path"
   end
 end
 
@@ -68,7 +58,9 @@ describe "Braid::Operations::Git#require_version" do
   end
 end
 
-describe "Braid::Operations::GitCache#init_or_fetch" do
-  it "should initialize or fetch a local clone of the given url in the given directory" do
+describe "Braid::Operations::GitCache#path" do
+  it "should use the local cache directory and strip characters" do
+    git_cache.path("git://path").should == File.join(Braid.local_cache_dir, "git___path")
+    git_cache.path("git@domain:repository.git").should == File.join(Braid.local_cache_dir, "git_domain_repository.git")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: norbert-braid
 version: !ruby/object:Gem::Version 
-  version: 0.4.12
+  version: 0.4.13
 platform: ruby
 authors: 
 - Cristi Balan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-04 00:00:00 -07:00
+date: 2008-10-23 00:00:00 -07:00
 default_executable: braid
 dependencies: 
 - !ruby/object:Gem::Dependency