autobuild 1.7.10 → 1.7.11.rc1

data/Manifest.txt

@@ -27,12 +27,15 @@ lib/autobuild/packages/gnumake.rb
 lib/autobuild/packages/import.rb
 lib/autobuild/packages/orogen.rb
 lib/autobuild/packages/pkgconfig.rb
+lib/autobuild/packages/ruby.rb
+lib/autobuild/utility.rb
 lib/autobuild/parallel.rb
 lib/autobuild/pkgconfig.rb
 lib/autobuild/reporting.rb
 lib/autobuild/subcommand.rb
 lib/autobuild/timestamps.rb
 lib/autobuild/version.rb
+lib/autobuild/rake_task_extension.rb
 samples/openrobots.autobuild
 test/data/cvsroot.tar
 test/data/svnroot.tar

data/lib/autobuild.rb

@@ -4,11 +4,40 @@ if defined? Rake::DSL
     include Rake::DSL
 end
 
+module Autobuild
+end
+
+begin
+    require 'rmail'
+    require 'rmail/serialize'
+    Autobuild::HAS_RMAIL = true
+rescue LoadError
+    Autobuild::HAS_RMAIL = false
+end
+
+require 'net/smtp'
+require 'socket'
+require 'etc'
+require 'find'
+require 'thread'
+require 'pathname'
+require 'shellwords'
+require 'find'
+require 'rake/tasklib'
+require 'fileutils'
+
 require 'autobuild/version'
-require 'autobuild/config'
-require 'autobuild/configurable'
 require 'autobuild/environment'
 require 'autobuild/exceptions'
+require 'autobuild/pkgconfig'
+require 'autobuild/reporting'
+require 'autobuild/subcommand'
+require 'autobuild/timestamps'
+require 'autobuild/parallel'
+require 'autobuild/utility'
+require 'autobuild/config'
+
+require 'autobuild/importer'
 require 'autobuild/import/cvs'
 require 'autobuild/import/darcs'
 require 'autobuild/importer'
@@ -17,6 +46,9 @@ require 'autobuild/import/hg'
 require 'autobuild/import/svn'
 require 'autobuild/import/archive'
 require 'autobuild/import/tar'
+
+require 'autobuild/package'
+require 'autobuild/configurable'
 require 'autobuild/packages/autotools'
 require 'autobuild/packages/cmake'
 require 'autobuild/packages/genom'
@@ -24,9 +56,7 @@ require 'autobuild/packages/import'
 require 'autobuild/packages/orogen'
 require 'autobuild/packages/pkgconfig'
 require 'autobuild/packages/dummy'
-require 'autobuild/pkgconfig'
-require 'autobuild/reporting'
-require 'autobuild/subcommand'
-require 'autobuild/timestamps'
-require 'autobuild/parallel'
+require 'autobuild/packages/ruby'
+
+require 'autobuild/rake_task_extension'
 

data/lib/autobuild/config.rb

@@ -33,14 +33,47 @@ end
 module Autobuild
     class << self
         %w{ nice srcdir prefix
-            verbose debug do_update do_build do_rebuild do_forced_build only_doc do_doc doc_errors
+            verbose debug do_update do_build do_rebuild do_forced_build
             daemonize clean_log packages default_packages
-            doc_prefix keep_oldlogs}.each do |name|
+            keep_oldlogs}.each do |name|
             attr_accessor name
         end
 
+        # @return [{String=>Class<Utility>}] the known utilities
+        # @see {register_utility_class}
+        attr_reader :utilities
+
+        def register_utility_class(name, klass)
+            utilities[name] = klass
+            singleton_class.class_eval do
+                attr_accessor "only_#{name}"
+                attr_accessor "do_#{name}"
+                attr_accessor "#{name}_prefix"
+                attr_accessor "pass_#{name}_errors"
+            end
+            instance_variable_set "@only_#{name}", false
+            instance_variable_set "@do_#{name}", false
+            instance_variable_set "@pass_#{name}_errors", false
+            instance_variable_set "@#{name}_prefix", name
+        end
+
+        def create_utility(utility_name, package)
+            if klass = utilities[utility_name]
+                package.utilities[utility_name] = klass.new(utility_name, package)
+            else raise ArgumentError, "there is no utility called #{utility_name}, available utilities are #{utilities.keys.sort.join(", ")}"
+            end
+        end
+
 	# Configure the programs used by different packages
         attr_reader :programs
+	# A cache of entries in programs to their resolved full path 
+        #
+        # @return [{String=>[String,String,String]}] the triplet (full path,
+        #   tool name, value of ENV['PATH']). The last two values are used to
+        #   invalidate the cache when needed
+        #
+        # @see tool_in_path
+        attr_reader :programs_in_path
 	# The directory in which logs are saved. Defaults to PREFIX/log.
         attr_writer :logdir
 
@@ -52,6 +85,9 @@ module Autobuild
             do_build && !only_doc && packages.empty?
         end
     end
+    @utilities = Hash.new
+    register_utility_class 'doc', Utility
+    register_utility_class 'test', Utility
 
     @console = HighLine.new
 
@@ -74,11 +110,10 @@ module Autobuild
     DEFAULT_OPTIONS = { :nice => nil,
         :srcdir => Dir.pwd, :prefix => Dir.pwd, :logdir => nil,
         :verbose => false, :debug => false, :do_build => true, :do_forced_build => false, :do_rebuild => false, :do_update => true, 
-        :daemonize => false, :packages => [], :default_packages => [],
-        :only_doc => false, :do_doc => true, :doc_errors => false,
-        :doc_prefix => 'doc', :keep_oldlogs => false }
+        :daemonize => false, :packages => [], :default_packages => [], :keep_oldlogs => false }
 
     @programs = Hash.new
+    @programs_in_path = Hash.new
     DEFAULT_OPTIONS.each do |name, value|
         send("#{name}=", value)
     end
@@ -167,6 +202,40 @@ module Autobuild
             programs[name.to_sym] || programs[name.to_s] || name.to_s
         end
 
+        # Resolves the absolute path to a given tool
+        def tool_in_path(name)
+            path, path_name, path_env = programs_in_path[name]
+            current = tool(name)
+            if path_env != ENV['PATH'] || path_name != current
+                # Delete the current entry given that it is invalid
+                programs_in_path.delete(name)
+                if current[0, 1] == "/"
+                    # This is already a full path
+                    path = current
+                else
+                    path = ENV['PATH'].split(':').
+                        find { |dir| File.exists?(File.join(dir, current)) }
+                    if path
+                        path = File.join(path, current)
+                    end
+                end
+
+                if !path
+                    raise ArgumentError, "tool #{name}, set to #{current}, can not be found in PATH=#{path_env}"
+                end
+
+                # Verify that the new value is a file and is executable
+                if !File.file?(path)
+                    raise ArgumentError, "tool #{name} is set to #{current}, but this resolves to #{path} which is not a file"
+                elsif !File.executable?(path)
+                    raise ArgumentError, "tool #{name} is set to #{current}, but this resolves to #{path} which is not executable"
+                end
+                programs_in_path[name] = [path, current, ENV['PATH']]
+            end
+
+            return path
+        end
+
 	# Gets autobuild options from the command line and returns the
 	# remaining elements
         def commandline(args)
@@ -192,7 +261,7 @@ module Autobuild
                 opts.on("--rebuild",  "clean and rebuild") do |v| Autobuild.do_forced_build = v end 
                 opts.on("--only-doc", "only generate documentation") do |v| Autobuild.only_doc = v end
                 opts.on("--no-doc", "don't generate documentation") do |v| Autobuild.do_doc = v end
-                opts.on("--doc-errors", "treat documentation failure as error") do |v| Autobuild.doc_errors = v end
+                opts.on("--doc-errors", "treat documentation failure as error") do |v| Autobuild.pass_doc_errors = v end
 
                 opts.separator ""
                 opts.separator "Program output"
@@ -239,7 +308,7 @@ module Autobuild
         end
     end
 
-    def self.apply(packages, buildname = "autobuild")
+    def self.apply(packages, buildname = "autobuild", phases = [])
         if Autobuild.mail[:to]
             if !Autobuild::HAS_RMAIL
                 Autobuild.warn "RMail is not available. Mail notification is disabled"
@@ -261,13 +330,16 @@ module Autobuild
             end
         end
 
-        if Autobuild.only_doc
-            phases  = ['doc']
-        else
-            phases  = ['import']
-            phases += ['prepare', 'build'] if Autobuild.do_build
-            phases << 'doc' if Autobuild.do_doc
+        if phases.empty?
+            if Autobuild.only_doc
+                phases  = ['doc']
+            else
+                phases  = ['import']
+                phases += ['prepare', 'build'] if Autobuild.do_build
+                phases << 'doc' if Autobuild.do_doc
+            end
         end
+
         phases.each do |phase|
             # We create a dummy task listing what needs to be done, and then we
             # call it

data/lib/autobuild/configurable.rb

@@ -1,10 +1,3 @@
-require 'pathname'
-require 'autobuild/timestamps'
-require 'autobuild/environment'
-require 'autobuild/package'
-require 'autobuild/subcommand'
-require 'shellwords'
-
 module Autobuild
     # Base class for packages that require a configuration + build step.
     #

data/lib/autobuild/environment.rb

@@ -414,10 +414,9 @@ module Autobuild
             end
 
             require 'rbconfig'
-            ruby_arch    = File.basename(RbConfig::CONFIG['archdir'])
-            candidates = %w{rubylibdir archdir sitelibdir sitearchdir vendorlibdir vendorarchdir}.
+            %w{rubylibdir archdir sitelibdir sitearchdir vendorlibdir vendorarchdir}.
                 map { |key| RbConfig::CONFIG[key] }.
-                map { |path| path.gsub(/.*lib(?:32|64)?\/(\w*ruby\/)/, '\\1') }.
+                map { |path| path.gsub(/.*lib(?:32|64)?\//, '\\1') }.
                 each do |subdir|
                     if File.directory?("#{newprefix}/lib/#{subdir}")
                         env_add_path("RUBYLIB", "#{newprefix}/lib/#{subdir}")

data/lib/autobuild/import/archive.rb

@@ -32,6 +32,30 @@ module Autobuild
 	# Known URI schemes for +url+
         VALID_URI_SCHEMES = [ 'file', 'http', 'https', 'ftp' ]
 
+        class << self
+            # The directory in which downloaded files are saved
+            #
+            # It defaults, by order of priority, to the archives/ subdirectory
+            # of the environment variable AUTOBUILD_CACHE_DIR (if set), to the
+            # AUTOBUILD_ARCHIVES_CACHE_DIR (if set) environment variable and to
+            # #{prefix}/cache
+            def cachedir
+                if @cachedir then @cachedir
+                elsif dir = ENV['AUTOBUILD_ARCHIVES_CACHE_DIR']
+                    @cachedir = File.expand_path(dir)
+                elsif dir = ENV['AUTOBUILD_CACHE_DIR']
+                    @cachedir = File.join(File.expand_path(dir), 'archives')
+                else
+                    @cachedir = "#{Autobuild.prefix}/cache"
+                end
+            end
+
+            # Sets the directory in which files get cached
+            attr_writer :cachedir
+        end
+
+        @cachedir = nil
+
 	# Returns the unpack mode from the file name
         def self.filename_to_mode(filename)
             case filename
@@ -112,7 +136,7 @@ module Autobuild
                     size  = File.stat(@url.path).size
                     mtime = File.stat(@url.path).mtime
                 else
-                    open @url, :content_length_proc => lambda { |size| } do |file| 
+                    open @url, :content_length_proc => lambda { |v| size = v } do |file| 
                         mtime = file.last_modified
                     end
                 end
@@ -163,7 +187,9 @@ module Autobuild
 	# The unpack mode. One of Zip, Bzip, Gzip or Plain
 	attr_reader :mode
 	# The directory in which remote files are cached
-        def cachedir; @options[:cachedir] end
+        #
+        # Defaults to ArchiveImporter.cachedir
+        attr_accessor :cachedir
 	# The directory contained in the tar file
         #
         # DEPRECATED use #archive_dir instead
@@ -192,7 +218,7 @@ module Autobuild
             if !@options.has_key?(:update_cached_file)
                 @options[:update_cached_file] = false
             end
-            @options[:cachedir] ||= "#{Autobuild.prefix}/cache"
+            @cachedir = @options[:cachedir] || ArchiveImporter.cachedir
 
             relocate(url)
         end
@@ -214,7 +240,11 @@ module Autobuild
             end
         end
 
-        def update(package) # :nodoc:
+        def update(package,only_local = false) # :nodoc:
+            if only_local
+                Autobuild.warn "The importer #{self.class} does not support local updates, skipping #{self}"
+                return
+            end
             needs_update = update_cache(package)
 
             if !File.file?(checkout_digest_stamp(package))

data/lib/autobuild/import/cvs.rb

@@ -1,7 +1,3 @@
-require 'autobuild/config'
-require 'autobuild/subcommand'
-require 'autobuild/importer'
-
 module Autobuild
     class CVSImporter < Importer
 	# Creates a new importer which gets the module +name+ from the
@@ -38,7 +34,11 @@ module Autobuild
 
         private
 
-        def update(package) # :nodoc:
+        def update(package,only_local=false) # :nodoc:
+            if only_local
+                Autobuild.warn "The importer #{self.class} does not support local updates, skipping #{self}"
+                return
+            end
             Dir.chdir(package.srcdir) do
 		if !File.exists?("#{package.srcdir}/CVS/Root")
 		    raise ConfigException.new(package, 'import'), "#{package.srcdir} is not a CVS working copy"

data/lib/autobuild/import/darcs.rb

@@ -22,7 +22,11 @@ module Autobuild
         
         private
 
-        def update(package) # :nodoc:
+        def update(package,only_local=false) # :nodoc:
+            if only_local
+                Autobuild.warn "The importer #{self.class} does not support local updates, skipping #{self}"
+                return
+            end
 	    if !File.directory?( File.join(package.srcdir, '_darcs') )
 		raise ConfigException.new(package, 'import'), "#{package.srcdir} is not a Darcs repository"
 	    end

data/lib/autobuild/import/git.rb

@@ -5,6 +5,36 @@ require 'utilrb/kernel/options'
 
 module Autobuild
     class Git < Importer
+        class << self
+            # Sets the default alternates path used by all Git importers
+            #
+            # Setting it explicitly overrides any value we get from the
+            # AUTOBUILD_CACHE_DIR and AUTOBUILD_GIT_CACHE_DIR environment
+            # variables.
+            #
+            # @see default_alternates
+            attr_writer :default_alternates
+
+            # A default list of repositories that should be used as reference
+            # repositories for all Git importers
+            #
+            # It is initialized (by order of priority) using the
+            # AUTOBUILD_GIT_CACHE_DIR and AUTOBUILD_CACHE_DIR environment
+            # variables
+            #
+            # @return [Array]
+            # @see default_alternates=, Git#alternates
+            def default_alternates
+                if @default_alternates then @default_alternates
+                elsif cache_dir = ENV['AUTOBUILD_GIT_CACHE_DIR']
+                    @default_alternates = cache_dir.split(':').map { |path| File.expand_path(path) }
+                elsif cache_dir = ENV['AUTOBUILD_CACHE_DIR']
+                    @default_alternates = cache_dir.split(':').map { |path| File.join(File.expand_path(path), 'git') }
+                else Array.new
+                end
+            end
+        end
+
         # Creates an importer which tracks the given repository
         # and branch. +source+ is [repository, branch]
         #
@@ -14,6 +44,7 @@ module Autobuild
 	#   Autobuild.programs['git'] = 'my_git_tool'
         def initialize(repository, branch = nil, options = {})
             @repository = repository.to_str
+            @alternates = Git.default_alternates.dup
 
             if branch.respond_to?(:to_hash)
                 options = branch.to_hash
@@ -28,11 +59,12 @@ module Autobuild
                 Autobuild.warn "   Autobuild.git 'git://gitorious.org/rock/buildconf.git', :branch => 'master'"
             end
 
-            gitopts, common = Kernel.filter_options options, :push_to => nil, :branch => nil, :tag => nil, :commit => nil
+            gitopts, common = Kernel.filter_options options, :push_to => nil, :branch => nil, :tag => nil, :commit => nil, :with_submodules => false
             if gitopts[:branch] && branch
                 raise ConfigException, "git branch specified with both the option hash and the explicit parameter"
             end
             @push_to = gitopts[:push_to]
+            @with_submodules = gitopts[:with_submodules]
             branch = gitopts[:branch] || branch
             tag    = gitopts[:tag]
             commit = gitopts[:commit]
@@ -40,6 +72,7 @@ module Autobuild
             @branch = branch || 'master'
             @tag    = tag
             @commit = commit
+            @remote_name = 'autobuild'
             super(common)
         end
 
@@ -50,6 +83,11 @@ module Autobuild
             "git:#{repository}"
         end
 
+        # The name of the remote that should be set up by the importer
+        #
+        # Defaults to 'autobuild'
+        attr_accessor :remote_name
+
         # The remote repository URL.
         #
         # See also #push_to
@@ -67,6 +105,11 @@ module Autobuild
         # Defaults to #branch
         attr_writer :remote_branch
 
+        # Set to true if checkout should be done with submodules
+        #
+        # Defaults to #false
+        attr_writer :with_submodules
+
         # The branch this importer is tracking
         #
         # If set, both commit and tag have to be nil.
@@ -77,6 +120,24 @@ module Autobuild
         # If not set, it defaults to #branch
         attr_writer :local_branch
 
+        # A list of local (same-host) repositories that will be used instead of
+        # the remote one when possible. It has one major issue (see below), so
+        # use at your own risk.
+        #
+        # The paths must point to the git directory, so either the .git
+        # directory in a checked out git repository, or the repository itself in
+        # a bare repository.
+        #
+        # A default reference repository can be given through the
+        # AUTOBUILD_GIT_CACHE environment variable.
+        #
+        # Note that it has the major caveat that if objects disappear from the
+        # reference repository, the current one will be broken. See the git
+        # documentation for more information.
+        #
+        # @return [Array<String>]
+        attr_accessor :alternates
+
         # The branch that should be used on the local clone
         #
         # Defaults to #branch
@@ -106,6 +167,10 @@ module Autobuild
         # a fast-forward
         def merge?; !!@merge end
 
+        #Return true if the git checkout should be done with submodules
+        #detaul it false
+        def with_submodules?; !!@with_submodules end
+
         # Set the merge flag. See #merge?
         def merge=(flag); @merge = flag end
 
@@ -151,70 +216,73 @@ module Autobuild
             end
         end
 
+        def update_cache(package, cache_dir, phase)
+            remote_name = package.name.gsub(/[^\w]/, '_')
+            Subprocess.run(*git, "remote.#{remote_name}.url", repository)
+            Subprocess.run(*git, "remote.#{remote_name}.fetch",  "+refs/heads/*:refs/remotes/#{remote_name}/*")
+            Subprocess.run(*git, 'fetch', '--tags', remote_name)
+        end
+
+        # Updates the git repository's configuration for the target remote
+        def update_remotes_configuration(package, phase)
+            git = [package, phase, Autobuild.tool(:git), '--git-dir', File.join(package.importdir, '.git'), 'config', '--replace-all']
+            Subprocess.run(*git, "remote.#{remote_name}.url", repository)
+            if push_to
+                Subprocess.run(*git, "remote.#{remote_name}.pushurl", push_to)
+            end
+            Subprocess.run(*git, "remote.#{remote_name}.fetch",  "+refs/heads/*:refs/remotes/#{remote_name}/*")
+
+            if remote_branch && local_branch
+                Subprocess.run(*git, "remote.#{remote_name}.push",  "refs/heads/#{local_branch}:refs/heads/#{remote_branch}")
+            else
+                Subprocess.run(*git, "remote.#{remote_name}.push",  "refs/heads/*:refs/heads/*")
+            end
+
+            if local_branch
+                Subprocess.run(*git, "branch.#{local_branch}.remote",  remote_name)
+                Subprocess.run(*git, "branch.#{local_branch}.merge", "refs/heads/#{local_branch}")
+            end
+        end
+
         # Fetches updates from the remote repository. Returns the remote commit
         # ID on success, nil on failure. Expects the current directory to be the
         # package's source directory.
         def fetch_remote(package)
             validate_importdir(package)
-            Dir.chdir(package.importdir) do
-                # If we are checking out a specific commit, we don't know which
-                # branch to refer to in git fetch. So, we have to set up the
-                # remotes and call git fetch directly (so that all branches get
-                # fetch)
-                #
-                # Otherwise, do git fetch now
-                #
-                # Doing it now is better as it makes sure that we replace the
-                # configuration parameters only if the repository and branch are
-                # OK (i.e. we keep old working configuration instead)
-                if branch || tag
-                    Subprocess.run(package, :import, Autobuild.tool('git'), 'fetch', repository, branch || tag)
-                elsif commit
-                    Subprocess.run(package, :import, Autobuild.tool('git'), 'fetch', repository)
-                end
-
-                Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
-                               "--replace-all", "remote.autobuild.url", repository)
-                if push_to
-                    Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
-                                   "--replace-all", "remote.autobuild.pushurl", push_to)
-                end
-                Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
-                               "--replace-all", "remote.autobuild.fetch",  "+refs/heads/*:refs/remotes/autobuild/*")
-
-                if remote_branch && local_branch
-                    Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
-                               "--replace-all", "remote.autobuild.push",  "refs/heads/#{local_branch}:refs/heads/#{remote_branch}")
-                else
-                    Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
-                               "--replace-all", "remote.autobuild.push",  "refs/heads/*:refs/heads/*")
-                end
-
-                if local_branch
-                    Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
-                                   "--replace-all", "branch.#{local_branch}.remote",  "autobuild")
-                    Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
-                                   "--replace-all", "branch.#{local_branch}.merge", "refs/heads/#{local_branch}")
-                end
-
-                # Now get the actual commit ID from the FETCH_HEAD file, and
-                # return it
-                commit_id = if File.readable?( File.join('.git', 'FETCH_HEAD') )
-                    fetch_commit = File.readlines( File.join('.git', 'FETCH_HEAD') ).
-                        delete_if { |l| l =~ /not-for-merge/ }
-                    if !fetch_commit.empty?
-                        fetch_commit.first.split(/\s+/).first
-                    end
-                end
-
-                # Update the remote tag if needs be
-                if branch && commit_id
-                    Subprocess.run(package, :import, Autobuild.tool('git'), 'update-ref',
-                                   "-m", "updated by autobuild", "refs/remotes/autobuild/#{remote_branch}", commit_id)
+            git = [package, :import, Autobuild.tool('git'), '--git-dir', File.join(package.importdir, '.git')]
+
+            # If we are checking out a specific commit, we don't know which
+            # branch to refer to in git fetch. So, we have to set up the
+            # remotes and call git fetch directly (so that all branches get
+            # fetch)
+            #
+            # Otherwise, do git fetch now
+            #
+            # Doing it now is better as it makes sure that we replace the
+            # configuration parameters only if the repository and branch are
+            # OK (i.e. we keep old working configuration instead)
+            refspec = [branch || tag].compact
+            Subprocess.run(*git, 'fetch', '--tags', repository, *refspec)
+
+            update_remotes_configuration(package, :import)
+
+            # Now get the actual commit ID from the FETCH_HEAD file, and
+            # return it
+            commit_id = if File.readable?( File.join(package.importdir, '.git', 'FETCH_HEAD') )
+                fetch_commit = File.readlines( File.join(package.importdir, '.git', 'FETCH_HEAD') ).
+                    delete_if { |l| l =~ /not-for-merge/ }
+                if !fetch_commit.empty?
+                    fetch_commit.first.split(/\s+/).first
                 end
+            end
 
-                commit_id
+            # Update the remote tag if needs be
+            if branch && commit_id
+                Subprocess.run(*git, 'update-ref',
+                               "-m", "updated by autobuild", "refs/remotes/#{remote_name}/#{remote_branch}", commit_id)
             end
+
+            commit_id
         end
 
         # Returns a Importer::Status object that represents the status of this
@@ -224,7 +292,7 @@ module Autobuild
                 validate_importdir(package)
                 remote_commit = nil
                 if only_local
-                    remote_commit = `git show-ref -s refs/remotes/autobuild/#{remote_branch}`.chomp
+                    remote_commit = `git show-ref -s refs/remotes/#{remote_name}/#{remote_branch}`.chomp
                 else	
                     remote_commit =
                         begin fetch_remote(package)
@@ -355,10 +423,48 @@ module Autobuild
             Status.new(status, fetch_commit, head_commit, common_commit)
         end
 
-        def update(package)
+        # Updates the git alternates file in the already checked out package to
+        # match {#alternates}
+        #
+        # @param [Package] package the already checked-out package
+        # @return [void]
+        def update_alternates(package)
+            alternates_path = File.join(package.importdir, '.git', 'objects', 'info', 'alternates')
+            current_alternates =
+                if File.file?(alternates_path)
+                    File.readlines(alternates_path).map(&:strip).find_all { |l| !l.empty? }
+                else Array.new
+                end
+
+            alternates = self.alternates.map do |path|
+                File.join(path, 'objects')
+            end
+
+            if current_alternates.sort != alternates.sort
+                # Warn that something is fishy, but assume that the user knows
+                # what he is doing
+                package.warn "%s: the list of git alternates listed in the repository differs from the one set up in autobuild."
+                package.warn "%s: I will update, but that is dangerous"
+                package.warn "%s: using git alternates is for advanced users only, who know git very well."
+                package.warn "%s: Don't complain if something breaks"
+            end
+            if alternates.empty?
+                FileUtils.rm_f alternates_path
+            else
+                File.open(alternates_path, 'w') do |io|
+                    io.write alternates.join("\n")
+                end
+            end
+        end
+
+        def update(package,only_local = false)
             validate_importdir(package)
+            update_alternates(package)
             Dir.chdir(package.importdir) do
-                fetch_commit = fetch_remote(package)
+                #Checking if we should only merge our repro to remotes/HEAD without updateing from the remote side...
+                if !only_local
+                    fetch_commit = fetch_remote(package)
+                end
 
                 # If we are tracking a commit/tag, just check it out and return
                 if commit || tag
@@ -429,17 +535,25 @@ module Autobuild
                 FileUtils.mkdir_p base_dir
             end
 
+            clone_options = ['-o', remote_name]
+
+            if with_submodules?
+                clone_options << '--recurse-submodules'
+            end
+            alternates.each do |path|
+                clone_options << '--reference' << path
+            end
             Subprocess.run(package, :import,
-                Autobuild.tool('git'), 'clone', '-o', 'autobuild', repository, package.importdir)
+                Autobuild.tool('git'), 'clone', *clone_options, repository, package.importdir)
 
             Dir.chdir(package.importdir) do
                 if push_to
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
-                                   "--replace-all", "remote.autobuild.pushurl", push_to)
+                                   "--replace-all", "remote.#{remote_name}.pushurl", push_to)
                 end
                 if local_branch && remote_branch
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
-                                   "--replace-all", "remote.autobuild.push", "refs/heads/#{local_branch}:refs/heads/#{remote_branch}")
+                                   "--replace-all", "remote.#{remote_name}.push", "refs/heads/#{local_branch}:refs/heads/#{remote_branch}")
                 end
 
                 # If we are tracking a commit/tag, just check it out
@@ -453,10 +567,10 @@ module Autobuild
                     current_branch = `git symbolic-ref HEAD`.chomp
                     if current_branch == "refs/heads/#{local_branch}"
                         Subprocess.run(package, :import, Autobuild.tool('git'),
-                            'reset', '--hard', "autobuild/#{branch}")
+                            'reset', '--hard', "#{remote_name}/#{branch}")
                     else
                         Subprocess.run(package, :import, Autobuild.tool('git'),
-                            'checkout', '-b', local_branch, "autobuild/#{branch}")
+                            'checkout', '-b', local_branch, "#{remote_name}/#{branch}")
                     end
                 end
             end
@@ -466,6 +580,38 @@ module Autobuild
         def relocate(repository)
             @repository = repository
         end
+
+        # Tests whether the given directory is a git repository
+        def self.can_handle?(path)
+            File.directory?(File.join(path, '.git'))
+        end
+
+        # Returns a hash that represents the configuration of a git importer
+        # based on the information contained in the git configuration
+        #
+        # @raise [ArgumentError] if the path does not point to a git repository
+        def self.vcs_definition_for(path)
+            if !can_handle?(path)
+                raise ArgumentError, "#{path} is not a git repository"
+            end
+
+            Dir.chdir(path) do
+                vars = `git config -l`.
+                    split("\n").
+                    inject(Hash.new) do |h, line|
+                        k, v = line.strip.split('=', 2)
+                        h[k] = v
+                        h
+                    end
+                url = vars["remote.#{remote_name}.url"] ||
+                    vars['remote.origin.url']
+                if url
+                    return Hash[:type => :git, :url => url]
+                else
+                    return Hash[:type => :git]
+                end
+            end
+        end
     end
 
     # Creates a git importer which gets the source for the given repository and branch