autobuild 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d3bb942267370ce2e0ae0788d95dbae126bb822
-  data.tar.gz: 1b4d9cd82f441501de25ca9c257bf87e2a2b1a93
+  metadata.gz: 5d07251a9467505108e7d4ffa2a83480e77b4051
+  data.tar.gz: f9d440c442f763d121bb589810fb2e97210911c7
 SHA512:
-  metadata.gz: b4c2c503656df061fd82e4defddac037294bff228c62b2d7dba636cea89e22dbfc5e0da42fe497971205a2f20b8184a9b8198da80fc64ef54667b0fb046ac449
-  data.tar.gz: 7fe3027e64442123763bef17d20d433889dd2886c4896914ae3f67b2a11c6ac703d310ed8ff9eacf6bd68e8aa2021995ca924e4feed594bf3e40ac6fef760ee2
+  metadata.gz: 11958c9d1bfa46c8d3abfe37dfe4e414f316b7e0162cafdcf0abda4228e27ed902b02bc2ff942ef42ba41996878a6c18eb38d82d2708b7ee2c808d073fd85a5b
+  data.tar.gz: 78b12476fd6c0a16573db0a46f6e4e500dd42da24fd8471440b5487ca00236f51e003afa5c56b8fd1a6d5b449ae4a04420e5e5f95b3c0ffeb816d654fa37423b

data/Manifest.txt

@@ -42,9 +42,6 @@ samples/openrobots.autobuild
 test/data/cvsroot.tar
 test/data/gitrepo-with-extra-commit-and-tag.tar
 test/data/gitrepo.tar
-test/data/gitrepo/test
-test/data/gitrepo/test2
-test/data/gitrepo/test3
 test/data/svnroot.tar
 test/data/tarimport.tar.gz
 test/import/test_cvs.rb

data/lib/autobuild/import/git.rb

@@ -623,22 +623,36 @@ module Autobuild
             end
         end
 
-        def commit_pinning(package, target_commit, fetch_commit)
-            current_head = rev_parse(package, 'HEAD')
-
-            # Check whether the current HEAD is present on the remote
-            # repository. We'll refuse resetting if there are uncommitted
-            # changes
-            head_to_remote = merge_status(package, fetch_commit, current_head)
-            status_to_remote = head_to_remote.status
-            if status_to_remote == Status::ADVANCED || status_to_remote == Status::NEEDS_MERGE
-                raise ImporterCannotReset.new(package, 'import'), "branch #{local_branch} of #{package.name} contains commits that do not seem to be present on the branch #{remote_branch} of the remote repository. I can't go on as it could make you loose some stuff. Update the remote branch in your overrides, push your changes or reset to the remote commit manually before trying again"
-            end
-
-            head_to_target = merge_status(package, target_commit, current_head)
+        # Safely resets the current branch to a given commit
+        #
+        # This method safely resets the current branch to a given commit,
+        # not requiring a clean working copy (i.e. it can handle local changes).
+        #
+        # It verifies that the current HEAD will not be lost by the operation,
+        # either because it is included in the target commit or because it is
+        # present remotely
+        #
+        # @param [Package] package the package we handle
+        # @param [String] target_commit the commit we want to reset HEAD to
+        # @param [String] fetch_commit the state of the remote branch. This is
+        #   used to avoid losing commits if HEAD is not included in
+        #   target_commit
+        def reset_head_to_commit(package, target_commit, fetch_commit)
+            current_head     = rev_parse(package, 'HEAD')
+            head_to_target   = merge_status(package, target_commit, current_head)
             status_to_target = head_to_target.status
+
             if status_to_target == Status::UP_TO_DATE
                 return
+            elsif status_to_target == Status::SIMPLE_UPDATE
+                run_git(package, 'merge', target_commit)
+            else
+                # Check whether the current HEAD is present on the remote
+                # repository. We'll refuse resetting if there are uncommitted
+                # changes
+                if !commit_present_in?(package, current_head, fetch_commit)
+                    raise ImporterCannotReset.new(package, 'import'), "branch #{local_branch} of #{package.name} contains commits that do not seem to be present on the branch #{remote_branch} of the remote repository. I can't go on as it could make you loose some stuff. Update the remote branch in your overrides, push your changes or reset to the remote commit manually before trying again"
+                end
             end
 
             package.message "  %%s: resetting branch %s to %s" % [local_branch, target_commit.to_s]
@@ -706,8 +720,6 @@ module Autobuild
                 if options[:reset]
                     if current_head == pinned_state
                         return
-                    elsif merge_if_simple(package, pinned_state)
-                        return
                     end
                 elsif commit_present_in?(package, pinned_state, current_head)
                     return
@@ -718,7 +730,7 @@ module Autobuild
 
             fetch_commit ||= current_remote_commit(package, options[:only_local])
             if options[:reset]
-                commit_pinning(package, target_commit, fetch_commit)
+                reset_head_to_commit(package, target_commit, fetch_commit)
             else
                 merge_if_simple(package, target_commit)
             end

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.9.0" unless defined? Autobuild::VERSION
+    VERSION = "1.9.1" unless defined? Autobuild::VERSION
 end
 
 

data/test/import/test_git.rb

@@ -240,37 +240,37 @@ describe Autobuild::Git do
                 # We relocate to a non-existing repository to ensure that it
                 # does not try to access it
                 importer.relocate('/does/not/exist')
-                pin_importer(1)
+                pin_importer('tip~1')
                 importer.import(pkg, reset: false)
-                assert_on_commit 0
+                assert_on_commit "tip"
             end
             it "does not access the repository if the target is already HEAD and reset is true" do
                 importer.import(pkg)
-                pin_importer(0)
+                pin_importer('tip')
                 importer.relocate('/does/not/exist')
                 importer.import(pkg, reset: true)
-                assert_on_commit 0
+                assert_on_commit "tip"
             end
             it "does not access the remote repository if the commit is present locally" do
-                pin_importer(1)
+                pin_importer('tip~1')
                 importer.import(pkg)
-                pin_importer(0)
+                pin_importer('tip')
                 importer.relocate('/does/not/exist')
                 importer.import(pkg, reset: false)
-                assert_on_commit 0
+                assert_on_commit "tip"
             end
             it "attempts to merge the target commit if it is not present in HEAD" do
-                pin_importer(1)
+                pin_importer('tip~1')
                 importer.import(pkg)
-                pin_importer(0)
+                pin_importer('tip')
                 importer.import(pkg, reset: false)
-                assert_on_commit 0
+                assert_on_commit "tip"
             end
             it "resets if reset is true" do
                 importer.import(pkg)
-                pin_importer(1)
+                pin_importer('tip~1')
                 importer.import(pkg, reset: true)
-                assert_on_commit 1
+                assert_on_commit "tip~1"
             end
             it "refuses to reset if some commits are present locally but not in the remote branch" do
                 importer.import(pkg)
@@ -280,7 +280,7 @@ describe Autobuild::Git do
                 importer.run_git(pkg, 'add', 'test3')
                 importer.run_git(pkg, 'commit', '-a', '-m', 'third commit')
                 current_head = importer.rev_parse(pkg, 'HEAD')
-                pin_importer(1)
+                pin_importer('tip~1')
                 assert_raises(Autobuild::ImporterCannotReset) do
                     importer.import(pkg, reset: true)
                 end
@@ -317,6 +317,7 @@ describe Autobuild::Git do
                     importer.import(pkg)
                 end
             end
+
             it "switches to the local branch regardless of the presence of the tag or commit" do
                 importer.import(pkg)
                 head = importer.rev_parse(pkg, 'HEAD')
@@ -328,6 +329,44 @@ describe Autobuild::Git do
                 assert_equal 'refs/heads/local', importer.current_branch(pkg)
                 assert_equal head, importer.rev_parse(pkg, 'refs/remotes/autobuild/master')
             end
+
+            describe "the reset behaviour" do
+                it "checks out the local branch even if its original state was diverged from the current commit" do
+                    pin_importer 'fork'
+                    importer.import(pkg)
+                    assert_on_commit 'fork'
+                end
+                it "resets the local branch even if it diverged from the current commit" do
+                    importer.import(pkg)
+                    pin_importer 'fork'
+                    importer.import(pkg, reset: true)
+                    assert_on_commit 'fork'
+                end
+                it "refuses to reset the local branch if HEAD is not present remotely" do
+                    importer.import(pkg)
+                    File.open(File.join(tempdir, 'git', 'test'), 'a') do |io|
+                        io.puts "test"
+                    end
+                    importer.run_git(pkg, 'commit', '-a', '-m', 'a fork commit')
+                    new_head = importer.rev_parse(pkg, 'HEAD')
+                    pin_importer 'fork'
+                    assert_raises(Autobuild::ImporterCannotReset) do
+                        importer.import(pkg, reset: true)
+                    end
+                    assert_equal new_head, importer.rev_parse(pkg, 'HEAD')
+                end
+                it "cleanly resets to the start state if local changes make the checkout abort" do
+                    importer.import(pkg)
+                    File.open(File.join(tempdir, 'git', 'test'), 'a') do |io|
+                        io.puts "test"
+                    end
+                    pin_importer 'fork'
+                    assert_raises(Autobuild::SubcommandFailed) do
+                        importer.import(pkg, reset: true)
+                    end
+                    assert_on_commit 'tip'
+                end
+            end
         end
         describe "with a specific commit given" do
             def assert_on_commit(id)
@@ -339,9 +378,11 @@ describe Autobuild::Git do
                     pkg = Autobuild::Package.new 'commits'
                     pkg.srcdir = gitrepo
                     pkg.importer = importer
-                    @commits = [
-                        importer.rev_parse(pkg, 'HEAD'),
-                        importer.rev_parse(pkg, 'HEAD~1')]
+                    @commits = Hash[
+                        'tip' => importer.rev_parse(pkg, 'master'),
+                        'tip~1' => importer.rev_parse(pkg, 'master~1'),
+                        'fork' => importer.rev_parse(pkg, 'fork'),
+                    ]
                 end
                 @commits
             end
@@ -369,11 +410,15 @@ describe Autobuild::Git do
                 pkg = Autobuild::Package.new 'commits'
                 pkg.srcdir = gitrepo
                 pkg.importer = importer
-                importer.run_git_bare(pkg, 'tag', "tag0", "HEAD")
-                importer.run_git_bare(pkg, 'tag', "tag1", "HEAD~1")
-                @commits = [
-                    importer.rev_parse(pkg, 'HEAD'),
-                    importer.rev_parse(pkg, 'HEAD~1')]
+                importer.run_git_bare(pkg, 'tag', "tag0", "refs/heads/master")
+                importer.run_git_bare(pkg, 'tag', "tag1", "refs/heads/master~1")
+                importer.run_git_bare(pkg, 'tag', "forktag", "refs/heads/fork")
+                @pins = Hash['tip' => 'tag0', 'tip~1' => 'tag1', 'fork' => 'forktag']
+                @commits = Hash[
+                    'tip' => importer.rev_parse(pkg, 'refs/heads/master'),
+                    'tip~1' => importer.rev_parse(pkg, 'refs/heads/master~1'),
+                    'fork' => importer.rev_parse(pkg, 'refs/heads/fork'),
+                ]
             end
 
             def assert_on_commit(id)
@@ -381,7 +426,7 @@ describe Autobuild::Git do
             end
 
             def pin_importer(id, options = Hash.new)
-                importer.relocate(importer.repository, options.merge(tag: "tag#{id}"))
+                importer.relocate(importer.repository, options.merge(tag: @pins[id]))
             end
 
             it "fetches from the remote repository if the commit is not present locally" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -138,9 +138,6 @@ files:
 - test/data/cvsroot.tar
 - test/data/gitrepo-with-extra-commit-and-tag.tar
 - test/data/gitrepo.tar
-- test/data/gitrepo/test
-- test/data/gitrepo/test2
-- test/data/gitrepo/test3
 - test/data/svnroot.tar
 - test/data/tarimport.tar.gz
 - test/import/test_cvs.rb