This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8967

merge: show number of ancestors in bid merge debug notes
ClosedPublic

Authored by pulkit on Aug 27 2020, 5:39 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGe7c8a5030a90: merge: show number of ancestors in bid merge debug notes
Summary

A good number of times, we don't generate an action for a file in
manifestmerge() which can result in bid merge doing the wrong thing.

Mentioning the number of ancestors from which we are bidding will help spot such
cases where we are not returning an action.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit created this revision.Aug 27 2020, 5:39 AM
pulkit updated this revision to Diff 22502.Sep 1 2020, 8:15 AM
marmoute accepted this revision.Sep 11 2020, 8:51 AM
marmoute added a subscriber: marmoute.

♥

pulkit added a commit: rHGe7c8a5030a90: merge: show number of ancestors in bid merge debug notes.Sep 11 2020, 11:26 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe7c8a5030a90: merge: show number of ancestors in bid merge debug notes (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (5 lines)
Mtests/test-merge-criss-cross.t (12 lines)

Diff 22513

mercurial/merge.py

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 # 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 (%d ancestors)\n')
% len(ancestors)
)
for f, bids in sorted(fbids.items()): for f, bids in sorted(fbids.items()):
repo.ui.note(_(b" %s:\n list of bids:\n") % f) repo.ui.note(_(b" %s:\n list of bids:\n") % f)
for m, l in sorted(bids.items()): for m, l in sorted(bids.items()):
for _f, args, msg in l: for _f, args, msg in l:
repo.ui.note(b' %s -> %s\n' % (msg, m)) repo.ui.note(b' %s -> %s\n' % (msg, m))
# 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

tests/test-merge-criss-cross.t

calculating bids for ancestor 40663881a6dd calculating bids for ancestor 40663881a6dd
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922
f1: versions differ -> m f1: versions differ -> m
f2: remote unchanged -> k f2: remote unchanged -> k
auction for merging merge bids auction for merging merge bids (2 ancestors)
f1: f1:
list of bids: list of bids:
remote is newer -> g remote is newer -> g
versions differ -> m versions differ -> m
picking 'get' action picking 'get' action
f2: f2:
list of bids: list of bids:
remote unchanged -> k remote unchanged -> k
calculating bids for ancestor 40663881a6dd calculating bids for ancestor 40663881a6dd
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5
f1: versions differ -> m f1: versions differ -> m
f2: remote is newer -> g f2: remote is newer -> g
auction for merging merge bids auction for merging merge bids (2 ancestors)
f1: f1:
list of bids: list of bids:
remote unchanged -> k remote unchanged -> k
versions differ -> m versions differ -> m
picking 'keep' action picking 'keep' action
f2: f2:
list of bids: list of bids:
remote is newer -> g remote is newer -> g
note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd
calculating bids for ancestor 0f6b37dbe527 calculating bids for ancestor 0f6b37dbe527
resolving manifests resolving manifests
calculating bids for ancestor 40663881a6dd calculating bids for ancestor 40663881a6dd
resolving manifests resolving manifests
auction for merging merge bids auction for merging merge bids (2 ancestors)
f1: f1:
list of bids: list of bids:
remote is newer -> g remote is newer -> g
versions differ -> m versions differ -> m
picking 'get' action picking 'get' action
f2: f2:
list of bids: list of bids:
remote unchanged -> k remote unchanged -> k
calculating bids for ancestor 40663881a6dd calculating bids for ancestor 40663881a6dd
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922
f1: versions differ -> m f1: versions differ -> m
f2: remote unchanged -> k f2: remote unchanged -> k
auction for merging merge bids auction for merging merge bids (2 ancestors)
f1: f1:
list of bids: list of bids:
remote is newer -> g remote is newer -> g
versions differ -> m versions differ -> m
picking 'get' action picking 'get' action
f2: f2:
list of bids: list of bids:
remote unchanged -> k remote unchanged -> k
note: merging 0d355fdef312+ and 4b8b546a3eef using bids from ancestors 70008a2163f6 and b211bbc6eb3c note: merging 0d355fdef312+ and 4b8b546a3eef using bids from ancestors 70008a2163f6 and b211bbc6eb3c
calculating bids for ancestor 70008a2163f6 calculating bids for ancestor 70008a2163f6
resolving manifests resolving manifests
calculating bids for ancestor b211bbc6eb3c calculating bids for ancestor b211bbc6eb3c
resolving manifests resolving manifests
auction for merging merge bids auction for merging merge bids (2 ancestors)
x: x:
list of bids: list of bids:
versions differ -> m versions differ -> m
versions differ -> m versions differ -> m
ambiguous merge - picked m action ambiguous merge - picked m action
end of auction end of auction
merging x merging x
discovered dir src: 'd1/' -> dst: 'd2/' discovered dir src: 'd1/' -> dst: 'd2/'
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 154e6000f54e, local: c0ef19750a22+, remote: 6ca01f7342b9 ancestor: 154e6000f54e, local: c0ef19750a22+, remote: 6ca01f7342b9
d1/a: other deleted -> r d1/a: other deleted -> r
d1/b: other deleted -> r d1/b: other deleted -> r
d2/b: remote created -> g d2/b: remote created -> g
auction for merging merge bids auction for merging merge bids (2 ancestors)
d1/a: d1/a:
list of bids: list of bids:
ancestor missing, remote missing -> k ancestor missing, remote missing -> k
other deleted -> r other deleted -> r
picking 'keep' action picking 'keep' action
d1/b: d1/b:
list of bids: list of bids:
ancestor missing, remote missing -> k ancestor missing, remote missing -> k