snapshot.rb in autoproj-1.13.0.b4

- old
+ new

@@ -29,13 +29,13 @@
             end
             result
         end
 
         def sort_versions(versions)
-            pkg_sets, pkgs = versions.partition { |n, _| n =~ /^pkg_set:/ }
-            pkg_sets.sort_by { |n, _| n.keys.first } +
-                pkgs.sort_by { |n, _| n.keys.first }
+            pkg_sets, pkgs = versions.partition { |vcs| vcs.keys.first =~ /^pkg_set:/ }
+            pkg_sets.sort_by { |vcs| vcs.keys.first } +
+                pkgs.sort_by { |vcs| vcs.keys.first }
         end
 
         def save_versions( versions, versions_file, options = Hash.new )
             options = Kernel.validate_options options,
                 replace: false
@@ -212,11 +212,11 @@
         #   importer. The git commit is created in this repository
         # @param [String] path the file to be created or updated, relative to
         #   the root of the git repository
         # @param [String] the commit message
         # @return [String] the commit ID
-        def self.create_commit(pkg, path, message)
+        def self.create_commit(pkg, path, message, parent_id = nil)
             importer = pkg.importer
             object_id = Tempfile.open 'autoproj-versions' do |io|
                 yield(io)
                 io.flush
                 importer.run_git_bare(
@@ -245,14 +245,14 @@
             ensure
                 ENV.delete('GIT_INDEX_FILE')
                 FileUtils.rm_f our_index
             end
 
-            head_id = importer.rev_parse(pkg, 'HEAD')
+            parent_id ||= importer.rev_parse(pkg, 'HEAD')
 
             importer.run_git_bare(
                 pkg, 'commit-tree',
-                tree_id, '-p', head_id, input_streams: [message]).first
+                tree_id, '-p', parent_id, input_streams: [message]).first
         end
     end
     end
 end