From patchwork Wed Oct 16 17:33:55 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D7121: copies: get copies information directly from _copies
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 42413
Message-Id: <456b48dc4acf9c6eb749d2707cba2309@localhost.localdomain>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Wed, 16 Oct 2019 17:33:55 +0000

Closed by commit rHG32943e8c8d68: copies: get copies information directly from _copies (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7121?vs=17240&id=17247

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




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

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)