This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6247

copies: fix up "fullcopy" with missing entries from "diverge"
ClosedPublic

Authored by martinvonz on Apr 16 2019, 1:16 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG22c9ffdf8ef6: copies: fix up "fullcopy" with missing entries from "diverge"
Summary

Similar to the previous patch, but this doesn't even affect tests. It
does affect tests if you change them to turn on debug logging. I'm
fixing it here so reviewers of the later rewrite patch can hard-code
debug logging to be on and more easily compare test results.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (5 lines)

Diff 14830

mercurial/copies.py

# _checkcopies() seems suspicious). Filter them out. # _checkcopies() seems suspicious). Filter them out.
for dst, src in fullcopy.copy().items(): for dst, src in fullcopy.copy().items():
if src not in mb: if src not in mb:
del fullcopy[dst] del fullcopy[dst]
# Sometimes we forget to add entries from "copy" to "fullcopy", so fix # Sometimes we forget to add entries from "copy" to "fullcopy", so fix
# that up here # that up here
for dst, src in copy.items(): for dst, src in copy.items():
fullcopy[dst] = src fullcopy[dst] = src
# Sometimes we forget to add entries from "diverge" to "fullcopy", so fix
# that up here
for src, dsts in diverge.items():
for dst in dsts:
fullcopy[dst] = src
if fullcopy and repo.ui.debugflag: if fullcopy and repo.ui.debugflag:
repo.ui.debug(" all copies found (* = to merge, ! = divergent, " repo.ui.debug(" all copies found (* = to merge, ! = divergent, "
"% = renamed and deleted):\n") "% = renamed and deleted):\n")
for f in sorted(fullcopy): for f in sorted(fullcopy):
note = "" note = ""
if f in copy: if f in copy:
note += "*" note += "*"
if f in divergeset: if f in divergeset: