Mercurial > hg > hg-git

diff hggit/git_handler.py @ 739:e034e5196d6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
git_handler: update memfilectx creation per Mercurial changes Mercurial commit 503bb3af70fe changed the signature of the memfilectx constructor.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 17 Jun 2014 12:49:33 -0700
parents 268b9f6ed1c8
children a46cd7139699
line wrap: on
line diff
--- a/hggit/git_handler.py
+++ b/hggit/git_handler.py
@@ -817,7 +817,16 @@
                 e = fc.flags()
                 copied_path = fc.renamed()
 
-            return context.memfilectx(f, data, 'l' in e, 'x' in e, copied_path)
+            try:
+                return context.memfilectx(self.repo, f, data,
+                                          islink='l' in e,
+                                          isexec='x' in e,
+                                          copied=copied_path)
+            except TypeError:
+                return context.memfilectx(f, data,
+                                          islink='l' in e,
+                                          isexec='x' in e,
+                                          copied=copied_path)
 
         p1, p2 = (nullid, nullid)
         octopus = False