autobuild 1.5.23 → 1.5.24

data/Changes.txt

@@ -1,3 +1,10 @@
+== Version 1.5.24
+* fix bug with git importer and the push_to option. The pushurl configuration
+  option was not set in just-cloned repositories
+* improve error message in the "merge" case of git updates
+* fix appearance of a backtrace when CTRL+C was hit just at the same time that
+  we start a subcommand
+
 == Version 1.5.23
 * fix bug with paths that contain regexp special characters like C++
 

data/lib/autobuild/configurable.rb

@@ -120,3 +120,4 @@ module Autobuild
     end
 end
 
+

data/lib/autobuild/import/archive.rb

@@ -94,6 +94,13 @@ module Autobuild
         # is the same than the source dir
         def archive_dir; @options[:archive_dir] || tardir end
 
+        # Returns a string that identifies the remote repository uniquely
+        #
+        # This is meant for display purposes
+        def repository_id
+            url.dup
+        end
+
 	# Creates a new importer which downloads +url+ in +cachedir+ and unpacks it. The following options
 	# are allowed:
 	# [:cachedir] the cache directory. Defaults to "#{Autobuild.prefix}/cache"

data/lib/autobuild/import/git.rb

@@ -46,6 +46,19 @@ module Autobuild
             super(common)
         end
 
+        # Returns a string that identifies the remote repository uniquely
+        #
+        # This is meant for display purposes
+        def repository_id
+            result = "git:#{repository} branch=#{branch}"
+            if commit
+                result << " commit=#{commit}"
+            elsif tag
+                result << " tag=#{tag}"
+            end
+            result
+        end
+
         # The remote repository URL.
         #
         # See also #push_to
@@ -265,7 +278,7 @@ module Autobuild
                 status = merge_status(fetch_commit)
                 if status.needs_update?
                     if !merge? && status.status == Status::NEEDS_MERGE
-                        raise PackageException, "importing the current version of #{package.name} would require a merge"
+                        raise PackageException, "the local and remote branches #{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"
                     end
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'merge', fetch_commit)
                 end
@@ -279,10 +292,14 @@ module Autobuild
             end
 
             Subprocess.run(package, :import,
-                Autobuild.tool('git'), 'clone', '-o', 'autobuild',
-                repository, package.srcdir)
+                Autobuild.tool('git'), 'clone', '-o', 'autobuild', repository, package.srcdir)
 
             Dir.chdir(package.srcdir) do
+                if push_to
+                    Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
+                                   "--replace-all", "remote.autobuild.pushurl", push_to)
+                end
+
                 # If we are tracking a commit/tag, just check it out
                 if commit || tag
                     Subprocess.run(package, :import, Autobuild.tool('git'),

data/lib/autobuild/import/svn.rb

@@ -19,6 +19,13 @@ module Autobuild
             super(options)
         end
 
+        # Returns a string that identifies the remote repository uniquely
+        #
+        # This is meant for display purposes
+        def repository_id
+            @source.dup
+        end
+
         private
 
         def update(package) # :nodoc:

data/lib/autobuild/packages/orogen.rb

@@ -186,13 +186,6 @@ module Autobuild
             end
         end
 
-        def self.map_dependencies_with(&block)
-            @dependency_mapper = block
-        end
-        def self.dependency_mapper
-            @dependency_mapper
-        end
-
         attr_writer :orocos_target
         def orocos_target
             if @orocos_target.nil?
@@ -261,8 +254,6 @@ module Autobuild
                 target = "pkgconfig/#{pkg_name}"
                 if Autobuild::Package[target]
                     depends_on target
-                elsif self.class.dependency_mapper && target = self.class.dependency_mapper[pkg_name]
-                    depends_on target
                 end
             end
 
@@ -306,7 +297,15 @@ module Autobuild
         def regen
             cmdline = [guess_ruby_name, self.class.orogen_bin]
             cmdline << '--corba' if corba
-            cmdline << '--extended-states' if extended_states
+
+            ext_states = extended_states
+            if !ext_states.nil?
+                if ext_states
+                    cmdline << '--extended-states'
+                else
+                    cmdline << '--no-extended-states'
+                end
+            end
             cmdline << orogen_file
 
             progress "generating oroGen project %s"

data/lib/autobuild/subcommand.rb

@@ -141,8 +141,8 @@ module Autobuild::Subprocess
             cwrite.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
 
             pid = fork do
-                cwrite.sync = true
                 begin
+                    cwrite.sync = true
                     if Autobuild.nice
                         Process.setpriority(Process::PRIO_PROCESS, 0, Autobuild.nice)
                     end

data/lib/autobuild/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 51
   prerelease: false
   segments: 
   - 1
   - 5
-  - 23
-  version: 1.5.23
+  - 24
+  version: 1.5.24
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 +01:00
+date: 2010-11-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,9 +107,9 @@ dependencies:
         hash: 19
         segments: 
         - 2
-        - 6
-        - 2
-        version: 2.6.2
+        - 7
+        - 0
+        version: 2.7.0
   type: :development
   version_requirements: *id006
 description: |-