D6561: copies: simplify merging of copy dicts on merge commits

[martinvonz (Martin von Zweigbergk)]

martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  After we removed some filtering in 35d674a3d5db <https://phab.mercurial-scm.org/rHG35d674a3d5db319b47560f1ef8949b0f77c1cafb> (copies: don't filter
  out copy targets created on other side of merge commit, 2019-04-18),
  we will always include all entries from "copies1", so we can simplify
  the code based on that.

REPOSITORY
  rHG Mercurial

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

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
@@ -272,25 +272,19 @@
     heapq.heapify(work)
     alwaysmatch = match.always()
     while work:
-        r, i1, copies1 = heapq.heappop(work)
+        r, i1, copies = heapq.heappop(work)
         if work and work[0][0] == r:
             # We are tracing copies from both parents
             r, i2, copies2 = heapq.heappop(work)
-            copies = {}
-            allcopies = set(copies1) | set(copies2)
-            for dst in allcopies:
+            for dst, src in copies2.items():
                 # Unlike when copies are stored in the filelog, we consider
                 # it a copy even if the destination already existed on the
                 # other branch. It's simply too expensive to check if the
                 # file existed in the manifest.
-                if dst in copies1:
-                    # If it was copied on the p1 side, mark it as copied from
+                if dst not in copies:
+                    # If it was copied on the p1 side, leave it as copied from
                     # that side, even if it was also copied on the p2 side.
-                    copies[dst] = copies1[dst]
-                else:
                     copies[dst] = copies2[dst]
-        else:
-            copies = copies1
         if r == b.rev():
             _filter(a, b, copies)
             return copies



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