comparison tests/test_util.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 adba152a5177
children ed2df771f578
comparison
equal deleted inserted replaced
1548:7f83be82d03f 1549:8410a978c650
710 newdata = parentctx[source].data() 710 newdata = parentctx[source].data()
711 copied = None 711 copied = None
712 if source != dest: 712 if source != dest:
713 copied = source 713 copied = source
714 return compathacks.makememfilectx(repo, 714 return compathacks.makememfilectx(repo,
715 memctx=memctx,
715 path=dest, 716 path=dest,
716 data=newdata, 717 data=newdata,
717 islink=False, 718 islink=False,
718 isexec=False, 719 isexec=False,
719 copied=copied) 720 copied=copied)