autobuild 1.2.14 → 1.2.15

data/Changes.txt

@@ -1,3 +1,7 @@
+== Version 1.2.15
+* fix branch switching in the git importer: the build will not fail anymore if
+  autobuild has to switch to an already existing branch
+
 == Version 1.2.14
 * fix git importer's handling of branch names: the importer now always works on
   a local branch that has the same name than the remote branch.

data/lib/autobuild.rb

@@ -3,6 +3,6 @@ require 'autobuild/reporting'
 require 'autobuild/package'
 
 module Autobuild
-    VERSION = "1.2.14" unless defined? Autobuild::VERSION
+    VERSION = "1.2.15" unless defined? Autobuild::VERSION
 end
 

data/lib/autobuild/import/git.rb

@@ -44,23 +44,29 @@ module Autobuild
                 # create it from FETCH_HEAD
                 current_branch = `git symbolic-ref HEAD`.chomp
                 if current_branch != "refs/heads/#{branch}"
-                    Subprocess.run(package.name, :import, Autobuild.tool('git'), 'checkout', '-b', branch, "FETCH_HEAD")
-                else
-                    # Otherwise, check that the merge is a fast-forward
-                    fetch_commit = File.readlines( File.join('.git', 'FETCH_HEAD') ).
-                        delete_if { |l| l =~ /not-for-merge/ }
-                    return if fetch_commit.empty?
-                    fetch_commit = fetch_commit.first.split(/\s+/).first
+                    # Check if the target branch already exists. If it is the
+                    # case, check it out. Otherwise, create it.
+                    if File.file?(File.join(".git", "refs", "heads", branch))
+                        Subprocess.run(package.name, :import, Autobuild.tool('git'), 'checkout', branch)
+                    else
+                        Subprocess.run(package.name, :import, Autobuild.tool('git'), 'checkout', '-b', branch, "FETCH_HEAD")
+                    end
+                end
+
+                # Now that we are on the right branch, update it
+                fetch_commit = File.readlines( File.join('.git', 'FETCH_HEAD') ).
+                    delete_if { |l| l =~ /not-for-merge/ }
+                return if fetch_commit.empty?
+                fetch_commit = fetch_commit.first.split(/\s+/).first
 
-                    common_commit = `git merge-base HEAD #{fetch_commit}`.chomp
-                    head_commit   = `git rev-parse #{current_branch}`.chomp
+                common_commit = `git merge-base HEAD #{fetch_commit}`.chomp
+                head_commit   = `git rev-parse #{branch}`.chomp
 
-                    if common_commit != fetch_commit
-                        if merge? || common_commit == head_commit
-                            Subprocess.run(package.name, :import, Autobuild.tool('git'), 'merge', fetch_commit)
-                        else
-                            raise "importing the current version would lead to a non fast-forward"
-                        end
+                if common_commit != fetch_commit
+                    if merge? || common_commit == head_commit
+                        Subprocess.run(package.name, :import, Autobuild.tool('git'), 'merge', fetch_commit)
+                    else
+                        raise "importing the current version would lead to a non fast-forward"
                     end
                 end
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.2.14
+  version: 1.2.15
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-08 00:00:00 +02:00
+date: 2009-09-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.12.2
+        version: 2.3.3
     version: 
 description: |-
   This work is licensed under the GPLv2 license. See License.txt for details
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: autobuild
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Rake-based utility to build and install multiple packages with dependencies