remote-hg: use marks instead of inlined files

So that we can find already exported ones. We can never be 100% sure
that we already exported such data, due to mercurial design, it at least
sometimes we should detect them, and so should give us some performance
boost.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index f80236be63dbaeba92dcaaaaa7e77173d0d394c1..d0e552c0a24ba1ef50ba5e0948f2f83bf750329c 100755 (executable)
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -126,6 +126,10 @@ class Marks:
     def to_rev(self, mark):
         return self.rev_marks[mark]
 
     def to_rev(self, mark):
         return self.rev_marks[mark]
 

+    def next_mark(self):
+        self.last_mark += 1
+        return self.last_mark
+

     def get_mark(self, rev):
         self.last_mark += 1
         self.marks[str(rev)] = self.last_mark
     def get_mark(self, rev):
         self.last_mark += 1
         self.marks[str(rev)] = self.last_mark


@@ -218,12 +222,29 @@ def fix_file_path(path):
         return path
     return os.path.relpath(path, '/')
 
         return path
     return os.path.relpath(path, '/')
 

-def export_file(fc):
-    d = fc.data()
-    path = fix_file_path(fc.path())
-    print "M %s inline %s" % (gitmode(fc.flags()), path)
-    print "data %d" % len(d)
-    print d
+def export_files(files):
+    global marks, filenodes
+
+    final = []
+    for f in files:
+        fid = node.hex(f.filenode())
+
+        if fid in filenodes:
+            mark = filenodes[fid]
+        else:
+            mark = marks.next_mark()
+            filenodes[fid] = mark
+            d = f.data()
+
+            print "blob"
+            print "mark :%u" % mark
+            print "data %d" % len(d)
+            print d
+
+        path = fix_file_path(f.path())
+        final.append((gitmode(f.flags()), mark, path))
+
+    return final

 
 def get_filechanges(repo, ctx, parent):
     modified = set()
 
 def get_filechanges(repo, ctx, parent):
     modified = set()


@@ -413,6 +434,8 @@ def export_ref(repo, name, kind, head):
         if len(parents) == 0 and rev:
             print 'reset %s/%s' % (prefix, ename)
 
         if len(parents) == 0 and rev:
             print 'reset %s/%s' % (prefix, ename)
 

+        modified_final = export_files(c.filectx(f) for f in modified)
+

         print "commit %s/%s" % (prefix, ename)
         print "mark :%d" % (marks.get_mark(rev))
         print "author %s" % (author)
         print "commit %s/%s" % (prefix, ename)
         print "mark :%d" % (marks.get_mark(rev))
         print "author %s" % (author)


@@ -425,8 +448,8 @@ def export_ref(repo, name, kind, head):
             if len(parents) > 1:
                 print "merge :%s" % (rev_to_mark(parents[1]))
 
             if len(parents) > 1:
                 print "merge :%s" % (rev_to_mark(parents[1]))
 

-        for f in modified:
-            export_file(c.filectx(f))
+        for f in modified_final:
+            print "M %s :%u %s" % f

         for f in removed:
             print "D %s" % (fix_file_path(f))
         print
         for f in removed:
             print "D %s" % (fix_file_path(f))
         print


@@ -878,6 +901,7 @@ def main(args):
     global peer, mode, bad_mail, bad_name
     global track_branches, force_push, is_tmp
     global parsed_tags
     global peer, mode, bad_mail, bad_name
     global track_branches, force_push, is_tmp
     global parsed_tags

+    global filenodes

 
     alias = args[1]
     url = args[2]
 
     alias = args[1]
     url = args[2]


@@ -921,6 +945,7 @@ def main(args):
     parsed_refs = {}
     marks = None
     parsed_tags = {}
     parsed_refs = {}
     marks = None
     parsed_tags = {}

+    filenodes = {}

 
     repo = get_repo(url, alias)
     prefix = 'refs/hg/%s' % alias
 
     repo = get_repo(url, alias)
     prefix = 'refs/hg/%s' % alias