Mercurial > hgsubversion
comparison tests/test_util.py @ 1223:7e70337c5be4 stable
test_util: call makememfilectx
| author | Sean Farley <sean.michael.farley@gmail.com> |
|---|---|
| date | Mon, 02 Jun 2014 19:54:02 -0500 |
| parents | 97a064e2075d |
| children | ba8485b9fee0 |
comparison
equal
deleted
inserted
replaced
| 1222:afd047a7df45 | 1223:7e70337c5be4 |
|---|---|
| 24 from mercurial import node | 24 from mercurial import node |
| 25 from mercurial import scmutil | 25 from mercurial import scmutil |
| 26 from mercurial import ui | 26 from mercurial import ui |
| 27 from mercurial import util | 27 from mercurial import util |
| 28 from mercurial import extensions | 28 from mercurial import extensions |
| 29 | |
| 30 from hgsubversion import compathacks | |
| 29 | 31 |
| 30 try: | 32 try: |
| 31 from mercurial import obsolete | 33 from mercurial import obsolete |
| 32 obsolete._enabled | 34 obsolete._enabled |
| 33 except ImportError: | 35 except ImportError: |
| 663 if newdata is None: | 665 if newdata is None: |
| 664 newdata = parentctx[source].data() | 666 newdata = parentctx[source].data() |
| 665 copied = None | 667 copied = None |
| 666 if source != dest: | 668 if source != dest: |
| 667 copied = source | 669 copied = source |
| 668 return context.memfilectx(path=dest, | 670 return compathacks.makememfilectx(repo, |
| 669 data=newdata, | 671 path=dest, |
| 670 islink=False, | 672 data=newdata, |
| 671 isexec=False, | 673 islink=False, |
| 672 copied=copied) | 674 isexec=False, |
| 675 copied=copied) | |
| 673 | 676 |
| 674 ctx = context.memctx(repo, | 677 ctx = context.memctx(repo, |
| 675 (parentctx.node(), node.nullid), | 678 (parentctx.node(), node.nullid), |
| 676 message, | 679 message, |
| 677 changed + removed, | 680 changed + removed, |
