This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6564

copies: avoid reusing the same variable for two different copy dicts
ClosedPublic

Authored by martinvonz on Jun 20 2019, 7:15 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe7c55e24d6bf: copies: avoid reusing the same variable for two different copy dicts
Summary

"childcopies" is initally the copies the current changeset to one of
its children and then we reassign it with the copies from the start of
the chain to the child. Let's use different names for these two
things.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jun 20 2019, 7:15 PM
pulkit accepted this revision.Jun 22 2019, 9:31 AM
This revision is now accepted and ready to land.Jun 22 2019, 9:31 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (14 lines)

Diff 15632

mercurial/copies.py

assert r == childctx.p2().rev() assert r == childctx.p2().rev()
parent = 2 parent = 2
childcopies = childctx.p2copies() childcopies = childctx.p2copies()
if not alwaysmatch: if not alwaysmatch:
childcopies = {dst: src for dst, src in childcopies.items() childcopies = {dst: src for dst, src in childcopies.items()
if match(dst)} if match(dst)}
# Copy the dict only if later iterations will also need it # Copy the dict only if later iterations will also need it
if i != len(children[r]) - 1: if i != len(children[r]) - 1:
copies = copies.copy() newcopies = copies.copy()
if childcopies:
childcopies = _chain(copies, childcopies)
else: else:
childcopies = copies newcopies = copies
if childcopies:
newcopies = _chain(newcopies, childcopies)
for f in childctx.filesremoved(): for f in childctx.filesremoved():
if f in childcopies: if f in newcopies:
del childcopies[f] del newcopies[f]
heapq.heappush(work, (c, parent, childcopies)) heapq.heappush(work, (c, parent, newcopies))
assert False assert False
def _forwardcopies(a, b, match=None): def _forwardcopies(a, b, match=None):
"""find {dst@b: src@a} copy mapping where a is an ancestor of b""" """find {dst@b: src@a} copy mapping where a is an ancestor of b"""
match = a.repo().narrowmatch(match) match = a.repo().narrowmatch(match)
# check for working copy # check for working copy
if b.rev() is None: if b.rev() is None: