D7121: copies: get copies information directly from _copies
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Wed Oct 16 17:49:53 EDT 2019
marmoute updated this revision to Diff 17271.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7121?vs=17247&id=17271
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7121/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7121
AFFECTED FILES
mercurial/copies.py
CHANGE DETAILS
diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -207,13 +207,14 @@
return copies
for i, c in enumerate(children[r]):
childctx = repo[c]
+ p1copies, p2copies = childctx._copies
if r == childctx.p1().rev():
parent = 1
- childcopies = childctx.p1copies()
+ childcopies = p1copies
else:
assert r == childctx.p2().rev()
parent = 2
- childcopies = childctx.p2copies()
+ childcopies = p2copies
if not alwaysmatch:
childcopies = {
dst: src for dst, src in childcopies.items() if match(dst)
To: marmoute, #hg-reviewers, martinvonz
Cc: martinvonz, mercurial-devel
More information about the Mercurial-devel
mailing list