changeset 1201:65631b2c61fb

stupid: call makememfilectx
author Sean Farley <sean.michael.farley@gmail.com>
date Mon, 02 Jun 2014 19:09:35 -0500
parents 4b6b101474e6
children cccc7a50f66d
files hgsubversion/stupid.py
diffstat 1 files changed, 18 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/stupid.py
+++ b/hgsubversion/stupid.py
@@ -367,8 +367,12 @@ def diff_branchrev(ui, svn, meta, branch
         # and this may actually imply a bug in getcopies
         if copied not in parentctx.manifest():
             copied = None
-        return context.memfilectx(path=path, data=data, islink=islink,
-                                  isexec=isexe, copied=copied)
+        return compathacks.makememfilectx(repo,
+                                          path=path,
+                                          data=data,
+                                          islink=islink,
+                                          isexec=isexe,
+                                          copied=copied)
 
     return list(touched_files), filectxfn
 
@@ -572,8 +576,12 @@ def fetch_branchrev(svn, meta, branch, b
         # and this may actually imply a bug in getcopies
         if copied not in parentctx.manifest():
             copied = None
-        return context.memfilectx(path=path, data=data, islink=islink,
-                                  isexec=isexec, copied=copied)
+        return compathacks.makememfilectx(repo,
+                                          path=path,
+                                          data=data,
+                                          islink=islink,
+                                          isexec=isexec,
+                                          copied=copied)
 
     return files, filectxfn
 
@@ -736,9 +744,12 @@ def convert_rev(ui, meta, svn, r, tbdelt
             if path in externals:
                 if externals[path] is None:
                     raise IOError(errno.ENOENT, 'no externals')
-                return context.memfilectx(path=path, data=externals[path],
-                                          islink=False, isexec=False,
-                                          copied=None)
+                return compathacks.makememfilectx(repo,
+                                                  path=path,
+                                                  data=externals[path],
+                                                  islink=False,
+                                                  isexec=False,
+                                                  copied=None)
             for bad in bad_branch_paths[b]:
                 if path.startswith(bad):
                     raise IOError(errno.ENOENT, 'Path %s is bad' % path)