Ticket #11137: capistrano-distributed-git.diff

test/deploy/scm/git_test.rb

@@ -19 +19 @@
-    assert_equal "master", @source.head
-  end
-
+  def origin
+    asser_equal "origin", @source.origin
+    @config[:remote] = "git"
+    assert_equal "git", @source.origin
+  end
+
-  def test_checkout
-    @config[:repository] = "git@somehost.com:project.git"
-    dest = "/var/www"
-
+
+
-
-    # With branch
-    @config[:branch] = "origin/foo"
-origin/foo", @source.checkout('Not used'
+-b deploy #{rev}", @source.checkout(rev
-  end
-
-  def test_diff
@@ -51 +58 @@
-
-  def test_sync
-    dest = "/var/www"
-
+
+
-
-    # With branch
-
-
+
+
+
-
-    # With :scm_command
-
-
+
+
+
-  end
-
+  def test_sync_with_remote
+    dest = "/var/www"
+    rev = 'c2d9e79'
+    remote = "username"
+    repository = "git@somehost.com:project.git"
+
+    @config[:repository] = repository
+    @config[:remote] = remote
+
+    assert_equal "cd #{dest} && git config remote.#{remote}.url #{repository} && git config remote.#{remote}.fetch +refs/heads/*:refs/remotes/#{remote}/* && git fetch #{remote} && git reset --hard #{rev}", @source.sync(rev, dest)
+  end
+
-  def test_shallow_clone
-    @config[:repository] = "git@somehost.com:project.git"
-    @config[:git_shallow_clone] = 1
-    dest = "/var/www"
-
+
+
-
-    # With branch
-    @config[:branch] = "origin/foo"
-
+
+
-  end
-
+  def test_remote_clone
+    @config[:repository] = "git@somehost.com:project.git"
+    @config[:remote] = "username"
+    dest = "/var/www"
+    rev = 'c2d9e79'
+    assert_equal "git clone -o username git@somehost.com:project.git /var/www && cd /var/www && git checkout -b deploy #{rev}", @source.checkout(rev, dest)
+
+    # With branch
+    @config[:branch] = "foo"
+    assert_equal "git clone -o username git@somehost.com:project.git /var/www && cd /var/www && git checkout -b deploy #{rev}", @source.checkout(rev, dest)
+  end
+
-  # Tests from base_test.rb, makin' sure we didn't break anything up there!
-  def test_command_should_default_to_default_command
-    assert_equal "git", @source.command

lib/capistrano/recipes/deploy/scm/git.rb

@@ -49 +49 @@
-      # You may set <tt>:branch</tt>, which is the reference to the branch, tag,
-      # or any SHA1 you are deploying, for example:
-      #
-origin/
+
-      #
-      # Otherwise, HEAD is assumed.  I strongly suggest you set this.  HEAD is
-      # not always the best assumption.
-      #
+      # You may also set <tt>:remote</tt>, which will be used as a name for remote
+      # tracking of repositories. This option is intended for use with the
+      # <tt>:remote_cache</tt> strategy in a distributed git environment.
+      #
+      # For example in the projects <tt>config/deploy.rb</tt>:
+      #
+      #   set :repository, "#{scm_user}@somehost:~/projects/project.git"
+      #   set :remote, "#{scm_user}"
+      #
+      # Then each person with deploy priveledges can add the following to their
+      # local <tt>~/.caprc</tt> file:
+      #
+      #   set :scm_user, 'someuser'
+      #
+      # Now any time a person deploys the project, their repository will be
+      # setup as a remote git repository within the cached repository.
+      #
-      # The <tt>:scm_command</tt> configuration variable, if specified, will
-      # be used as the full path to the git executable on the *remote* machine:
-      #
@@ -78 +95 @@
-      #   set :deploy_via, :remote_cache
-      #
-      # For faster clone, you can also use shallow cloning.  This will set the
- 
+
-      # together with the :remote_cache strategy
-      #
-      #   set :git_shallow_clone, 1
@@ -88 +105 @@
-      #
-      # Garry Dolley http://scie.nti.st
-      # Contributions by Geoffrey Grosenbach http://topfunky.com
-
-
+
+
+
-      class Git < Base
-        # Sets the default command name for this SCM on your *local* machine.
-        # Users may override this by setting the :scm_command variable.
@@ -102 +120 @@
-          configuration[:branch] || 'HEAD'
-        end
-
+        def origin
+          configuration[:remote] || 'origin'
+        end
+
-        # Performs a clone on the remote machine, then checkout on the branch
-        # you want to deploy.
-        def checkout(revision, destination)
-
+
+
-
-
+
+
+
+
+
-
-          fail "No branch specified, use for example 'set :branch, \"origin/master\"' in your deploy.rb" unless branch
-
-          execute = []
-depth = configuration[:git_shallow_clone]
- << "#{git} clone --depth #{depth}
+args.empty?
+<< "#{git} clone
-          else
- << "#{git} clone
+<< "#{git} clone #{args.join(' ')}
-          end
-
-
-
+
+
+
-          if configuration[:git_enable_submodules]
- 
- 
+
+
-          end
-
-          execute.join(" && ")
@@ -131 +157 @@
-        # Merges the changes to 'head' since the last fetch, for remote_cache
-        # deployment strategy
-        def sync(revision, destination)
-
+
+
+
-          execute = []
- && #{git} fetch origin
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-          end
-
+
+
+
+
-          if configuration[:git_enable_submodules]
-            execute << "#{git} submodule update"
-          end