Mercurial > hgsubversion

comparison tests/test_utility_commands.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 0ebcc5bbf692
children cff81f35b31e
comparison
equal deleted inserted replaced
1548:7f83be82d03f 1549:8410a978c650
160 u = self.ui() 160 u = self.ui()
161 u.pushbuffer() 161 u.pushbuffer()
162 parents = (self.repo['the_branch'].node(), revlog.nullid,) 162 parents = (self.repo['the_branch'].node(), revlog.nullid,)
163 def filectxfn(repo, memctx, path): 163 def filectxfn(repo, memctx, path):
164 return compathacks.makememfilectx(repo, 164 return compathacks.makememfilectx(repo,
165 memctx=memctx,
165 path=path, 166 path=path,
166 data='added', 167 data='added',
167 islink=False, 168 islink=False,
168 isexec=False, 169 isexec=False,
169 copied=False) 170 copied=False)
205 repo, repo_path = self.load_and_fetch('two_heads.svndump') 206 repo, repo_path = self.load_and_fetch('two_heads.svndump')
206 u = self.ui() 207 u = self.ui()
207 parents = (self.repo['the_branch'].node(), revlog.nullid,) 208 parents = (self.repo['the_branch'].node(), revlog.nullid,)
208 def filectxfn(repo, memctx, path): 209 def filectxfn(repo, memctx, path):
209 return compathacks.makememfilectx(repo, 210 return compathacks.makememfilectx(repo,
211 memctx=memctx,
210 path=path, 212 path=path,
211 data='added', 213 data='added',
212 islink=False, 214 islink=False,
213 isexec=False, 215 isexec=False,
214 copied=False) 216 copied=False)
237 def test_rebase(self): 239 def test_rebase(self):
238 self._load_fixture_and_fetch('two_revs.svndump') 240 self._load_fixture_and_fetch('two_revs.svndump')
239 parents = (self.repo[0].node(), revlog.nullid,) 241 parents = (self.repo[0].node(), revlog.nullid,)
240 def filectxfn(repo, memctx, path): 242 def filectxfn(repo, memctx, path):
241 return compathacks.makememfilectx(repo, 243 return compathacks.makememfilectx(repo,
244 memctx=memctx,
242 path=path, 245 path=path,
243 data='added', 246 data='added',
244 islink=False, 247 islink=False,
245 isexec=False, 248 isexec=False,
246 copied=False) 249 copied=False)