This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8966

merge: show list of bids for each file in bid-merge in ui.note()
ClosedPublic

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

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGccd3bf4490c1: merge: show list of bids for each file in bid-merge in ui.debug()
Summary

Earlier, we were showing the list of bids only when we were ambiguously picking.
However, the cases where we unambiguously picked a side may not always be
correct and need to be fixed.

Having list of bids for all files will be helpful in debugging.

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 22501.Sep 1 2020, 8:14 AM
pulkit updated this revision to Diff 22512.Sep 2 2020, 7:54 AM
marmoute accepted this revision.Sep 11 2020, 8:48 AM
marmoute added a subscriber: marmoute.

♥

pulkit added a commit: rHGccd3bf4490c1: merge: show list of bids for each file in bid-merge in ui.debug().Sep 15 2020, 7:03 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGccd3bf4490c1: merge: show list of bids for each file in bid-merge in ui.debug() (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (18 lines)
Mtests/test-merge-criss-cross.t (75 lines)

Diff 22512

mercurial/merge.py

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\n'))
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)
for m, l in sorted(bids.items()):
for _f, args, msg in l:
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
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" consensus for %s\n") % (m))
mresult.addfile(f, *l[0]) mresult.addfile(f, *l[0])
continue continue
# If keep is an option, just do it. # If keep is an option, just do it.
if mergestatemod.ACTION_KEEP in bids: if mergestatemod.ACTION_KEEP in bids:
repo.ui.note(_(b" %s: picking 'keep' action\n") % f) repo.ui.note(_(b" picking 'keep' action\n"))
mresult.addfile(f, *bids[mergestatemod.ACTION_KEEP][0]) mresult.addfile(f, *bids[mergestatemod.ACTION_KEEP][0])
continue continue
# If keep absent is an option, just do that # If keep absent is an option, just do that
if mergestatemod.ACTION_KEEP_ABSENT in bids: if mergestatemod.ACTION_KEEP_ABSENT in bids:
repo.ui.note(_(b" %s: picking 'keep absent' action\n") % f) repo.ui.note(_(b" %s: picking 'keep absent' action\n") % f)
mresult.addfile(f, *bids[mergestatemod.ACTION_KEEP_ABSENT][0]) mresult.addfile(f, *bids[mergestatemod.ACTION_KEEP_ABSENT][0])
continue continue
# If there are gets and they all agree [how could they not?], do it. # If there are gets and they all agree [how could they not?], do it.
if mergestatemod.ACTION_GET in bids: if mergestatemod.ACTION_GET in bids:
ga0 = bids[mergestatemod.ACTION_GET][0] ga0 = bids[mergestatemod.ACTION_GET][0]
if all(a == ga0 for a in bids[mergestatemod.ACTION_GET][1:]): if all(a == ga0 for a in bids[mergestatemod.ACTION_GET][1:]):
repo.ui.note(_(b" %s: picking 'get' action\n") % f) repo.ui.note(_(b" picking 'get' action\n"))
mresult.addfile(f, *ga0) mresult.addfile(f, *ga0)
continue continue
# TODO: Consider other simple actions such as mode changes # TODO: Consider other simple actions such as mode changes
# Handle inefficient democrazy. # Handle inefficient democrazy.
repo.ui.note(_(b' %s: multiple bids for merge action:\n') % f)
for m, l in sorted(bids.items()):
for _f, args, msg in l:
repo.ui.note(b' %s -> %s\n' % (msg, m))
# Pick random action. TODO: Instead, prompt user when resolving # Pick random action. TODO: Instead, prompt user when resolving
m, l = list(bids.items())[0] m, l = list(bids.items())[0]
repo.ui.warn( repo.ui.warn(_(b' ambiguous merge - picked %s action\n') % (m))
_(b' %s: ambiguous merge - picked %s action\n') % (f, m)
)
mresult.addfile(f, *l[0]) mresult.addfile(f, *l[0])
continue continue
repo.ui.note(_(b'end of auction\n\n')) repo.ui.note(_(b'end of auction\n\n'))
mresult.updatevalues(diverge, renamedelete) mresult.updatevalues(diverge, renamedelete)
if wctx.rev() is None: if wctx.rev() is None:
_forgetremoved(wctx, mctx, branchmerge, mresult) _forgetremoved(wctx, mctx, branchmerge, mresult)

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
f1: picking 'get' action f1:
f2: picking 'keep' action list of bids:
remote is newer -> g
versions differ -> m
picking 'get' action
f2:
list of bids:
remote unchanged -> k
versions differ -> m
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
(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: 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
f1: picking 'keep' action f1:
f2: picking 'get' action list of bids:
remote unchanged -> k
versions differ -> m
picking 'keep' action
f2:
list of bids:
remote is newer -> g
versions differ -> m
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
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
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
f1: picking 'get' action f1:
f2: picking 'keep' action list of bids:
remote is newer -> g
versions differ -> m
picking 'get' action
f2:
list of bids:
remote unchanged -> k
versions differ -> m
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)
$ hg up -qC $ hg up -qC
$ hg merge -v --debug --config merge.preferancestor="*" $ hg merge -v --debug --config merge.preferancestor="*"
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
f1: picking 'get' action f1:
f2: picking 'keep' action list of bids:
remote is newer -> g
versions differ -> m
picking 'get' action
f2:
list of bids:
remote unchanged -> k
versions differ -> m
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
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
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
x: multiple bids for merge action: x:
list of bids:
versions differ -> m versions differ -> m
versions differ -> m versions differ -> m
x: ambiguous merge - picked m action 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
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ cat x $ cat x
a a
c c
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
d1/a: picking 'keep' action d1/a:
d1/b: picking 'keep' action list of bids:
d2/b: consensus for g ancestor missing, remote missing -> k
other deleted -> r
picking 'keep' action
d1/b:
list of bids:
ancestor missing, remote missing -> k
other deleted -> r
picking 'keep' action
d2/b:
list of bids:
remote created -> g
remote created -> g
consensus for g
end of auction end of auction
d2/b: remote created -> g d2/b: remote created -> g
getting d2/b getting d2/b
d1/a: ancestor missing, remote missing -> k d1/a: ancestor missing, remote missing -> k
d1/b: ancestor missing, remote missing -> k d1/b: ancestor missing, remote missing -> 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
(branch merge, don't forget to commit) (branch merge, don't forget to commit)