Patchwork D7122: copies: avoid instancing more changectx to access parent revisions

login
register
mail settings
Submitter phabricator
Date Oct. 16, 2019, 9:49 p.m.
Message ID <370fbe6ff72fb86f38301fbb858e72fd@localhost.localdomain>
Download mbox | patch
Permalink /patch/42438/
State Not Applicable
Headers show

Comments

phabricator - Oct. 16, 2019, 9:49 p.m.
marmoute updated this revision to Diff 17272.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7122?vs=17248&id=17272

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7122/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7122

AFFECTED FILES
  mercurial/copies.py

CHANGE DETAILS




To: marmoute, #hg-reviewers, martinvonz
Cc: martinvonz, mercurial-devel

Patch

diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -207,12 +207,13 @@ 
             return copies
         for i, c in enumerate(children[r]):
             childctx = repo[c]
+            p1, p2 = cl.parentrevs(c)
             p1copies, p2copies = childctx._copies
-            if r == childctx.p1().rev():
+            if r == p1:
                 parent = 1
                 childcopies = p1copies
             else:
-                assert r == childctx.p2().rev()
+                assert r == p2
                 parent = 2
                 childcopies = p2copies
             if not alwaysmatch: