autoproj-git 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e87c5a0adc38e2a65acbed7359c527b634986923
-  data.tar.gz: 24a902da94632e1f7eb60d1cd7adb3c05896ac27
+  metadata.gz: 7474cb8e9b1582cc738897f3808029d2030e21ab
+  data.tar.gz: 75ebdf1817d68911f86ca90595effb7510105b0f
 SHA512:
-  metadata.gz: 7bbccbd6ceb14ae9ec04be87ffa0c42200221210dd31305a8004027903a2d7be729517854db495b50189570ae8c372c68db954e583deb1c910b1bde8aa36a2c1
-  data.tar.gz: a5ee4d79a0824d076df8d652cf0379bcaff51cc18b62327eec45be27b97b14574edcd93c5e46bdddd16afad04e322014087c441280538836975bbf952293daff
+  metadata.gz: ab0478a5b553af6beb1568e1d93c24f2e83c7319c4e4d6075d0af90364b6c529043bbf9cd7a38debf596c367783b60275aafe1fb3f222a740894457addf300e3
+  data.tar.gz: 8eff2bd002be02900e6d9e11576041ad6926b41a8e6cf35ec1486f1d56475f269d21a65e171c18ce73bd25c2e3678b75fb13661595bb9dd712e9ed796af53e66

data/lib/autoproj/cli/git.rb

@@ -15,21 +15,46 @@ module Autoproj
                     pkg if pkg.importer.kind_of?(Autobuild::Git)
                 end.compact
 
-                git_packages.each_with_index do |pkg, i|
-                    cleanup_package(pkg, "[#{i}/#{git_packages.size}] ",
-                                    local: options[:local],
-                                    remove_obsolete_remotes: options[:remove_obsolete_remotes])
+                package_failures = []
+                pool = Concurrent::FixedThreadPool.new(4)
+                futures = git_packages.each_with_index.map do |pkg, i|
+                    Concurrent::Future.execute(executor: pool) do
+                        begin
+                            cleanup_package(pkg, " [#{i}/#{git_packages.size}]",
+                                            local: options[:local],
+                                            remove_obsolete_remotes: options[:remove_obsolete_remotes])
+                            nil
+                        rescue Autobuild::SubcommandFailed => e
+                            Autoproj.error "failed: #{e.message}"
+                            e
+                        end
+                    end
+                end
+                package_failures = futures.each(&:execute).map(&:value!).compact
+            rescue Interrupt => interrupt
+            ensure
+                pool.shutdown if pool
+                Autobuild::Reporting.report_finish_on_error(
+                    package_failures, on_package_failures: :raise, interrupted_by: interrupt)
+            end
+
+            def git_clean_invalid_refs(pkg, progress)
+                output = pkg.importer.run_git_bare(pkg, 'show-ref')
+                output.each do |line|
+                    if m = line.match(/error: (.*) does not point to a valid object!/)
+                        pkg.importer.run_git_bare(pkg, 'update-ref', '-d', m[1])
+                    end
                 end
             end
 
             def git_gc(pkg, progress)
-                pkg.progress_start "#{progress}%s: gc", done_message: "#{progress}%s: gc" do
+                pkg.progress_start "gc %s#{progress}", done_message: "gc %s#{progress}" do
                     pkg.importer.run_git_bare(pkg, 'gc')
                 end
             end
 
             def git_repack(pkg, progress)
-                pkg.progress_start "#{progress}%s: repack", done_message: "#{progress}%s: repack" do
+                pkg.progress_start "repack %s#{progress}", done_message: "repack %s#{progress}" do
                     pkg.importer.run_git_bare(pkg, 'repack', '-adl')
                 end
             end
@@ -44,11 +69,8 @@ module Autoproj
             end
  
             def git_remote_prune(pkg, progress)
-                remotes = git_all_remotes(pkg)
-                remotes.each do |remote_name|
-                    pkg.progress_start "#{progress}%s: pruning #{remote_name}", done_message: "#{progress}%s: pruned #{remote_name}" do
-                        pkg.importer.run_git(pkg, 'remote', 'prune', remote_name)
-                    end
+                pkg.progress_start "pruning %s#{progress}", done_message: "pruned %s#{progress}" do
+                    pkg.importer.run_git(pkg, 'fetch', '-p')
                 end
             end
 
@@ -59,13 +81,14 @@ module Autoproj
                 end
 
                 remotes.each do |remote_name|
-                    pkg.progress_start "#{progress}%s: removing remote #{remote_name}", done_message: "#{progress}%s: removed remote #{remote_name}" do
+                    pkg.progress_start "removing remote %s/#{remote_name}#{progress}", done_message: "removed remote %s/#{remote_name}#{progress}" do
                         pkg.importer.run_git(pkg, 'remote', 'rm', remote_name)
                     end
                 end
             end
 
             def cleanup_package(pkg, progress, options = Hash.new)
+                git_clean_invalid_refs(pkg, progress)
                 if options[:remove_obsolete_remotes]
                     git_remove_obsolete_remotes(pkg, progress)
                 end

data/lib/autoproj/git/version.rb

@@ -1,5 +1,5 @@
 module Autoproj
     module Git
-        VERSION = "1.0.3"
+        VERSION = "1.0.4"
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj-git
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-02 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autoproj