This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8818

merge: improve documentation of fbid dict used for merge bid
ClosedPublic

Authored by pulkit on Jul 25 2020, 5:59 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG98218c83242f: merge: improve documentation of fbid dict used for merge bid
Summary

I improved the comments explaning what the dict contains meanwhile organizing
the comment structure which prevents some confusion.

Due to formatting issues, the empty dict was wrapped in () which might decieve
in thinking that it's a tuple of dict until you decide to find a comma.

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

pulkit created this revision.Jul 25 2020, 5:59 AM
indygreg accepted this revision.Aug 2 2020, 12:57 PM
This revision is now accepted and ready to land.Aug 2 2020, 12:57 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (11 lines)

Diff 22201

mercurial/merge.py

_(b"note: merging %s and %s using bids from ancestors %s\n") _(b"note: merging %s and %s using bids from ancestors %s\n")
% ( % (
wctx, wctx,
mctx, mctx,
_(b' and ').join(pycompat.bytestr(anc) for anc in ancestors), _(b' and ').join(pycompat.bytestr(anc) for anc in ancestors),
) )
) )
# Call for bids # mapping filename to bids (action method to list af actions)
fbids = ( # {FILENAME1 : BID1, FILENAME2 : BID2}
{} # BID is another dictionary which contains
) # mapping filename to bids (action method to list af actions) # mapping of following form:
# {ACTION_X : [info, ..], ACTION_Y : [info, ..]}
fbids = {}
diverge, renamedelete = None, None diverge, renamedelete = None, None
for ancestor in ancestors: for ancestor in ancestors:
repo.ui.note(_(b'\ncalculating bids for ancestor %s\n') % ancestor) repo.ui.note(_(b'\ncalculating bids for ancestor %s\n') % ancestor)
mresult1 = manifestmerge( mresult1 = manifestmerge(
repo, repo,
wctx, wctx,
mctx, mctx,
ancestor, ancestor,
d = fbids[f] d = fbids[f]
if m in d: if m in d:
d[m].append(a) d[m].append(a)
else: else:
d[m] = [a] d[m] = [a]
else: else:
fbids[f] = {m: [a]} fbids[f] = {m: [a]}
# Call for bids
# Pick the best bid for each file # Pick the best bid for each file
repo.ui.note(_(b'\nauction for merging merge bids\n')) repo.ui.note(_(b'\nauction for merging merge bids\n'))
actions = {} actions = {}
for f, bids in sorted(fbids.items()): for f, bids in sorted(fbids.items()):
# bids is a mapping from action method to list af actions # bids is a mapping from action method to list af actions
# Consensus? # Consensus?
if len(bids) == 1: # all bids are the same kind of method if len(bids) == 1: # all bids are the same kind of method
m, l = list(bids.items())[0] m, l = list(bids.items())[0]