Mercurial > hgsubversion

diff hgsubversion/stupid.py @ 1549:8410a978c650

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compathacks: be compatible with upstream 8a0cac20a1ad memfilectx change See hg change 8a0cac20a1ad. Since the interface has changed more than one time, switch to explicit keywords arguments to avoid surprises. Since hgsubversion targets hg >= 3.2.4, drop support for hg 3.0 and 3.1 here.
author Jun Wu <quark@fb.com>
date Tue, 19 Dec 2017 14:29:55 -0800
parents d03995e69785
children cff81f35b31e
line wrap: on
line diff
--- a/hgsubversion/stupid.py
+++ b/hgsubversion/stupid.py
@@ -347,6 +347,7 @@ def diff_branchrev(ui, svn, meta, branch
         if copied not in parentctx.manifest():
             copied = None
         return compathacks.makememfilectx(repo,
+                                          memctx=memctx,
                                           path=path,
                                           data=data,
                                           islink=islink,
@@ -559,6 +560,7 @@ def fetch_branchrev(svn, meta, branch, b
         if copied not in parentctx.manifest():
             copied = None
         return compathacks.makememfilectx(repo,
+                                          memctx=memctx,
                                           path=path,
                                           data=data,
                                           islink=islink,
@@ -736,6 +738,7 @@ def convert_rev(ui, meta, svn, r, tbdelt
                 if externals[path] is None:
                     raise IOError(errno.ENOENT, 'no externals')
                 return compathacks.makememfilectx(repo,
+                                                  memctx=memctx,
                                                   path=path,
                                                   data=externals[path],
                                                   islink=False,