autobuild 1.10.0.rc19 → 1.10.0.rc20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd8fef579b829167296d2e6b50249e68aa7cc811
-  data.tar.gz: 1d77007e89b07d5be9a72b04bd6e16938bf920d3
+  metadata.gz: ebb72391557598f96bcf4d7b8bb34e10ae44ee6e
+  data.tar.gz: 637a0ae6c9e1a70b079397985aa386d5a80c7353
 SHA512:
-  metadata.gz: 37c2ef54fca05b19d03a2a9e2f4e880de83d51767645fcf334a507746b61042ebb9b6d79224a8e19e4b8b1dfb31e00d1b61c29e9203e46d672634aff70eed364
-  data.tar.gz: e4278ec9b00fe793a23aea395423cdcf0b1c6a538eb91183b05f6719de186532ce89f3bdaa03c025cdba6c520080013017c3ceb835756c6a6888083e96becf73
+  metadata.gz: b862462f126b226fbb2326c418330578bf8454a46b64ad92a33bc030bf908120e536c8f635be79fbe9e960c267b4f7323558497b5809bce1404534c7d0fba68b
+  data.tar.gz: ce5ce2cab50ec932500ca3f684df8676170d6aeea62d4810e98cb52d862c3e2c5007920901f3169fd99c320b83ee3a07226e0ee0b64acbb2415183512ed21d10

data/lib/autobuild/import/git-lfs.rb

@@ -1,15 +1,38 @@
 # Disable git-lfs at checkout time, we run install --local and pull later 
-Autobuild::Git.default_config['filter.lfs.smudge'] = ''
+Autobuild::Git.default_config['filter.lfs.smudge'] = 'git-lfs smudge --skip -- %f'
 Autobuild::Git.default_config['filter.lfs.required'] = 'false'
 
 module Autobuild
     Git.add_post_hook do |importer, package|
         lfs_dir = File.join(package.srcdir, '.git', 'lfs')
-        if File.directory?(lfs_dir) && importer.options[:lfs] != false
-            package.run 'import', Autobuild.tool(:git), 'lfs', 'install', '--local', '--skip-smudge',
-                working_directory: package.importdir
-            package.run 'import', Autobuild.tool(:git), 'lfs', 'pull', importer.remote_name,
-                working_directory: package.importdir
+        if File.directory?(lfs_dir)
+            importer.run_git(package, 'lfs', 'install', '--force', '--local', '--skip-smudge')
+
+            includes = importer.options.fetch(:lfs_include, '')
+            if includes.empty?
+                begin
+                    importer.run_git_bare(package, 'config', '--local', '--unset', 'lfs.fetchinclude')
+                rescue SubcommandFailed => e
+                    raise if e.status != 5
+                end
+            else
+                importer.run_git_bare(package, 'config', '--local', 'lfs.fetchinclude', includes)
+            end
+
+            excludes = importer.options.fetch(:lfs_exclude, '')
+            if excludes.empty?
+                begin
+                    importer.run_git_bare(package, 'config', '--local', '--unset', 'lfs.fetchexclude')
+                rescue SubcommandFailed => e
+                    raise if e.status != 5
+                end
+            else
+                importer.run_git_bare(package, 'config', '--local', 'lfs.fetchexclude', excludes)
+            end
+
+            if importer.options[:lfs] != false
+                importer.run_git(package, 'lfs', 'pull', importer.remote_name)
+            end
         end
     end
 end

data/lib/autobuild/import/git.rb

@@ -132,7 +132,8 @@ def initialize(repository, branch = nil, options = {})
                 commit: nil,
                 repository_id: nil,
                 source_id: nil,
-                with_submodules: false
+                with_submodules: false,
+                single_branch: false
             if gitopts[:branch] && branch
                 raise ConfigException, "git branch specified with both the option hash and the explicit parameter"
             end
@@ -140,6 +141,7 @@ def initialize(repository, branch = nil, options = {})
 
             super(common)
 
+            @single_branch = gitopts[:single_branch]
             @with_submodules = gitopts.delete(:with_submodules)
             @remote_name = 'autobuild'
             @push_to = nil
@@ -243,6 +245,10 @@ def merge=(flag); @merge = flag end
         # Whether the git checkout should be done with submodules
         def with_submodules?; !!@with_submodules end
 
+        # Whether 'clone' should fetch only the remote branch, or all the
+        # branches
+        attr_predicate :single_branch?, true
+
         # @api private
         #
         # Verifies that the package's {Package#importdir} points to a git
@@ -1043,6 +1049,9 @@ def checkout(package, options = Hash.new)
             if with_submodules?
                 clone_options << '--recurse-submodules'
             end
+            if single_branch?
+                clone_options << "--branch=#{remote_branch}" << "--single-branch"
+            end
             each_alternate_path(package) do |path|
                 clone_options << '--reference' << path
             end

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.10.0.rc19" unless defined? Autobuild::VERSION
+    VERSION = "1.10.0.rc20" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.10.0.rc19
+  version: 1.10.0.rc20
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake