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.

Download Raw Diff

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

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJul 25 2020, 5:59 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

pulkit added a child revision: D8819: merge: make mergeresult constructor initialize empty object.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

pulkit added a commit: rHG98218c83242f: merge: improve documentation of fbid dict used for merge bid.Aug 2 2020, 1:43 PM

Closed by commit rHG98218c83242f: merge: improve documentation of fbid dict used for merge bid (authored by pulkit). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/merge.py (11 lines)

Status	Author	Revision
Closed	pulkit	D8837 mergeresult: make actionmapping a dict of dict instead of dict of lists
Closed	pulkit	D8836 largefiles: introduce a constant for 'lfmr' action
Closed	pulkit	D8835 largefiles: override merge.emptyactions() to include `lfmr`
Closed	pulkit	D8834 merge: unify logic of couple of if-else's in manifestmerge()
Closed	pulkit	D8833 sparse: add comment for an if condition which I tried to refactor
Closed	pulkit	D8832 mergeactions: use action constants instead of string values
Closed	pulkit	D8831 merge: use the new action based mapping introduced in mergeresult obj
Closed	pulkit	D8830 mergeresult: introduce action -> (filename, data, msg) mapping and related API
Closed	pulkit	D8829 mergeresult: rename _actions to _filemapping
Closed	pulkit	D8828 sparse: pass mergeresult obj in sparse.filterupdatesactions() (API)
Closed	pulkit	D8827 merge: filter actions before calling _resolvetrivial()
Closed	pulkit	D8826 merge: introduce mergeresult.updateactions() and use it
Closed	pulkit	D8825 merge: pass mergeresult instead of actions in _checkunknownfiles() (API)
Closed	pulkit	D8824 merge: pass mergeresult obj instead of actions dict in _resolvetrivial()
Closed	pulkit	D8823 merge: pass mergeresult obj instead of actions in _filternarrowactions()
Closed	pulkit	D8822 merge: pass mergeresult in checkpassconflicts() instead of actions (API)
Closed	pulkit	D8821 merge: add removefile() to mergeresult object
Closed	pulkit	D8820 merge: introduce mergeresult.addfile() and use it
Closed	pulkit	D8819 merge: make mergeresult constructor initialize empty object
Closed	pulkit	D8818 merge: improve documentation of fbid dict used for merge bid
Closed	pulkit	D8817 merge: move conversion of file-key dict to action-key dict in mergeresult
Closed	pulkit	D8816 merge: introduce hasconflicts() on mergeresult object
Closed	pulkit	D8744 merge: remove no longer required ACTION_GET_OTHER_AND_STORE
Closed	pulkit	D8743 merge: pass commitinfo to applyupdates() and get it stored in mergestate
Closed	pulkit	D8742 merge: introduce 'commitinfo' in mergeresult
Closed	pulkit	D8799 merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API)

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]

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22102		Jul 25 2020, 5:59 AM	★	★
Diff 2	22201	rHG98218c83242f6574b4e586942814fbef2c3926e8	Jul 24 2020, 5:45 AM	★	★