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
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.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 22631

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)
)
mresult = mergeresult() mresult = mergeresult()
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]
if all(a == l[0] for a in l[1:]): # len(bids) is > 1 if all(a == l[0] for a in l[1:]): # len(bids) is > 1
repo.ui.note(_(b" %s: consensus for %s\n") % (f, m)) repo.ui.note(_(b" %s: consensus for %s\n") % (f, m))

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: picking 'get' action f1: picking 'get' action
f2: picking 'keep' action f2: picking 'keep' action
end of auction end of auction
f1: remote is newer -> g f1: remote is newer -> g
getting f1 getting f1
f2: remote unchanged -> k f2: remote unchanged -> k
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
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: picking 'keep' action f1: picking 'keep' action
f2: picking 'get' action f2: picking 'get' action
end of auction end of auction
f2: remote is newer -> g f2: remote is newer -> g
getting f2 getting f2
f1: remote unchanged -> k f1: remote unchanged -> k
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
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: picking 'get' action f1: picking 'get' action
f2: picking 'keep' action f2: picking 'keep' action
end of auction end of auction
getting f1 getting f1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
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: picking 'get' action f1: picking 'get' action
f2: picking 'keep' action f2: picking 'keep' action
end of auction end of auction
f1: remote is newer -> g f1: remote is newer -> g
getting f1 getting f1
f2: remote unchanged -> k f2: remote unchanged -> k
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
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: multiple bids for merge action: x: multiple bids for merge action:
versions differ -> m versions differ -> m
versions differ -> m versions differ -> m
x: ambiguous merge - picked m action x: ambiguous merge - picked m action
end of auction end of auction
merging x merging x
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
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: consensus for r d1/a: consensus for r
d1/b: consensus for r d1/b: consensus for r
d2/b: consensus for g d2/b: consensus for g
end of auction end of auction
d1/a: other deleted -> r d1/a: other deleted -> r
removing d1/a removing d1/a
d1/b: other deleted -> r d1/b: other deleted -> r
removing d1/b removing d1/b
d2/b: remote created -> g d2/b: remote created -> g
getting d2/b getting d2/b
1 files updated, 0 files merged, 2 files removed, 0 files unresolved 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)