Show More
@@ -1701,7 +1701,6 b' class queue(object):' | |||
|
1701 | 1701 | # caching against the next repo.status call |
|
1702 | 1702 | mm, aa, dd = repo.status(patchparent, top)[:3] |
|
1703 | 1703 | ctx = repo[top] |
|
1704 | man = ctx.manifest() | |
|
1705 | 1704 | aaa = aa[:] |
|
1706 | 1705 | match1 = scmutil.match(repo[None], pats, opts) |
|
1707 | 1706 | # in short mode, we only diff the files included in the |
@@ -1778,13 +1777,12 b' class queue(object):' | |||
|
1778 | 1777 | repo.dirstate.add(dst) |
|
1779 | 1778 | # remember the copies between patchparent and qtip |
|
1780 | 1779 | for dst in aaa: |
|
1781 |
|
|
|
1782 | src = f.renamed(man[dst]) | |
|
1780 | src = ctx[dst].copysource() | |
|
1783 | 1781 | if src: |
|
1784 |
copies.setdefault(src |
|
|
1782 | copies.setdefault(src, []).extend( | |
|
1785 | 1783 | copies.get(dst, [])) |
|
1786 | 1784 | if dst in a: |
|
1787 |
copies[src |
|
|
1785 | copies[src].append(dst) | |
|
1788 | 1786 | # we can't copy a file created by the patch itself |
|
1789 | 1787 | if dst in copies: |
|
1790 | 1788 | del copies[dst] |
General Comments 0
You need to be logged in to leave comments.
Login now