autobuild 1.6.2.b10 → 1.6.2.b11

data/lib/autobuild/import/git.rb

@@ -203,7 +203,7 @@ module Autobuild
                     end
                 end
 
-                status = merge_status(remote_commit)
+                status = merge_status(package, remote_commit)
                 `git diff --quiet`
                 if $?.exitstatus != 0
                     status.uncommitted_code = true
@@ -279,7 +279,16 @@ module Autobuild
             end
         end
 
-        def merge_status(fetch_commit, reference_commit = "HEAD")
+        # Computes the update status to update a branch whose tip is at
+        # reference_commit (which can be a symbolic reference) using the
+        # fetch_commit commit
+        #
+        # I.e. this compute what happens if one would do
+        #
+        #   git checkout reference_commit
+        #   git merge fetch_commit
+        #
+        def merge_status(package, fetch_commit, reference_commit = "HEAD")
             common_commit = `git merge-base #{reference_commit} #{fetch_commit}`.chomp
             if $?.exitstatus != 0
                 raise PackageException.new(package, 'import'), "failed to find the merge-base between #{reference_commit} and #{fetch_commit}. Are you sure these commits exist ?"
@@ -314,12 +323,12 @@ module Autobuild
                 # If we are tracking a commit/tag, just check it out and return
                 if commit || tag
                     target_commit = (commit || tag)
-                    status_to_head = merge_status(target_commit, "HEAD")
+                    status_to_head = merge_status(package, target_commit, "HEAD")
                     if status_to_head.status == Status::UP_TO_DATE
                         # Check if by any chance we could switch back to a
                         # proper branch instead of having a detached HEAD
                         if detached_head?
-                            status_to_remote = merge_status(target_commit, fetch_commit)
+                            status_to_remote = merge_status(package, target_commit, fetch_commit)
                             if status_to_remote.status != Status::UP_TO_DATE
                                 package.message "  the package is on a detached HEAD because of commit pinning"
                                 return
@@ -331,11 +340,11 @@ module Autobuild
                         raise PackageException.new(package, 'import'), "checking out the specified commit #{target_commit} would be a non-simple operation (i.e. the current state of the repository is not a linear relationship with the specified commit), do it manually"
                     end
 
-                    status_to_remote = merge_status(target_commit, fetch_commit)
+                    status_to_remote = merge_status(package, target_commit, fetch_commit)
                     if status_to_remote.status != Status::UP_TO_DATE
                         # Try very hard to avoid creating a detached HEAD
                         if local_branch
-                            status_to_branch = merge_status(target_commit, local_branch)
+                            status_to_branch = merge_status(package, target_commit, local_branch)
                             if status_to_branch.status == Status::UP_TO_DATE # Checkout the branch
                                 package.message "  checking out specific commit %s for %s. It will checkout branch %s." % [target_commit.to_s, package.name, local_branch]
                                 Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', local_branch)
@@ -364,7 +373,7 @@ module Autobuild
                     end
                 end
 
-                status = merge_status(fetch_commit)
+                status = merge_status(package, fetch_commit)
                 if status.needs_update?
                     if !merge? && status.status == Status::NEEDS_MERGE
                         raise PackageException.new(package, 'import'), "the local branch '#{local_branch}' and the remote branch #{branch} of #{package.name} have diverged, and I therefore refuse to update automatically. Go into #{package.srcdir} and either reset the local branch or merge the remote changes"
@@ -395,7 +404,7 @@ module Autobuild
 
                 # If we are tracking a commit/tag, just check it out
                 if commit || tag
-                    status = merge_status(commit || tag)
+                    status = merge_status(package, commit || tag)
                     if status.status != Status::UP_TO_DATE
                         package.message "  checking out specific commit for %s. This will create a detached HEAD." % [package.name]
                         Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', commit || tag)

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.6.2.b10" unless defined? Autobuild::VERSION
+    VERSION = "1.6.2.b11" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,73 +1,97 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: autobuild
-version: !ruby/object:Gem::Version
-  version: 1.6.2.b10
+version: !ruby/object:Gem::Version 
+  hash: -3493996294
   prerelease: 6
+  segments: 
+  - 1
+  - 6
+  - 2
+  - b
+  - 11
+  version: 1.6.2.b11
 platform: ruby
-authors:
+authors: 
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-15 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &14268080 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
         version: 0.7.0
   type: :runtime
-  prerelease: false
-  version_requirements: *14268080
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: utilrb
-  requirement: &14265920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
   type: :runtime
-  prerelease: false
-  version_requirements: *14265920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &14264700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
-  prerelease: false
-  version_requirements: *14264700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: hoe
-  requirement: &14263180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
   type: :development
-  prerelease: false
-  version_requirements: *14263180
-description: Collection of classes to handle build systems (CMake, autotools, ...)
-  and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration
-  to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj)
-  integrated software project management tool.
+  version_requirements: *id004
+description: Collection of classes to handle build systems (CMake, autotools, ...) and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj) integrated software project management tool.
 email: rock-dev@dfki.de
-executables:
+executables: 
 - autobuild
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - Changes.txt
 - Manifest.txt
 - README.txt
-files:
+files: 
 - Changes.txt
 - Manifest.txt
 - README.txt
@@ -113,32 +137,42 @@ files:
 - .gemtest
 homepage: http://rock-robotics.org/stable/documentation/autoproj
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.txt
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: autobuild
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Library to handle build systems and import mechanisms
-test_files:
-- test/test_import_cvs.rb
-- test/test_subcommand.rb
+test_files: 
 - test/test_import_svn.rb
 - test/test_import_tar.rb
+- test/test_subcommand.rb
+- test/test_import_cvs.rb