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