diff tests/test_single_dir_push.py @ 1549:8410a978c650

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 0ebcc5bbf692
children d55c9d0ba350
line wrap: on
line diff
--- a/tests/test_single_dir_push.py
+++ b/tests/test_single_dir_push.py
@@ -24,6 +24,7 @@ class TestSingleDirPush(test_util.TestBa
         def file_callback(repo, memctx, path):
             if path == 'adding_file':
                 return compathacks.makememfilectx(repo,
+                                                  memctx=memctx,
                                                   path=path,
                                                   data='foo',
                                                   islink=False,
@@ -31,6 +32,7 @@ class TestSingleDirPush(test_util.TestBa
                                                   copied=False)
             elif path == 'adding_binary':
                 return compathacks.makememfilectx(repo,
+                                                  memctx=memctx,
                                                   path=path,
                                                   data='\0binary',
                                                   islink=False,
@@ -65,6 +67,7 @@ class TestSingleDirPush(test_util.TestBa
                                             subdir='trunk')
         def filectxfn(repo, memctx, path):
             return compathacks.makememfilectx(repo,
+                                              memctx=memctx,
                                               path=path,
                                               data='contents of %s' % path,
                                               islink=False,
@@ -99,6 +102,7 @@ class TestSingleDirPush(test_util.TestBa
         self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed'})
         def file_callback(repo, memctx, path):
             return compathacks.makememfilectx(repo,
+                                              memctx=memctx,
                                               path=path,
                                               data='data of %s' % path,
                                               islink=False,
@@ -131,6 +135,7 @@ class TestSingleDirPush(test_util.TestBa
             def cb(repo, memctx, path):
                 if path == data:
                     return compathacks.makememfilectx(repo,
+                                                      memctx=memctx,
                                                       path=path,
                                                       data=data,
                                                       islink=False,
@@ -180,6 +185,7 @@ class TestSingleDirPush(test_util.TestBa
         def file_callback(repo, memctx, path):
             if path == 'adding_file':
                 return compathacks.makememfilectx(repo,
+                                                  memctx=memctx,
                                                   path=path,
                                                   data='foo',
                                                   islink=False,