This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9002

mergestate: introduce a new ACTION_KEEP_NEW
ClosedPublic

Authored by pulkit on Sep 9 2020, 9:43 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG6877b0ee5f9d: mergestate: introduce a new ACTION_KEEP_NEW
Summary

ACTION_KEEP is overloaded and it's hard to figure out how we end up with this
KEEP, what was the state of things.

In a previous patch, we introduced ACTION_KEEP_ABSENT which represents files
which are kept absent in the working directory.

There is another special case where we keep the file when it's not present on
both ancestor and remote side. We introduce a dedicated action for that.

The goal is to use these information to make bid merge smarter.

Diff Detail

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

Revision Contents
Changeset List

Diff 22664

mercurial/merge.py

''''An object representing result of merging manifests. ''''An object representing result of merging manifests.
It has information about what actions need to be performed on dirstate It has information about what actions need to be performed on dirstate
mapping of divergent renames and other such cases. ''' mapping of divergent renames and other such cases. '''
NO_OP_ACTIONS = ( NO_OP_ACTIONS = (
mergestatemod.ACTION_KEEP, mergestatemod.ACTION_KEEP,
mergestatemod.ACTION_KEEP_ABSENT, mergestatemod.ACTION_KEEP_ABSENT,
mergestatemod.ACTION_KEEP_NEW,
) )
def __init__(self): def __init__(self):
""" """
filemapping: dict of filename as keys and action related info as values filemapping: dict of filename as keys and action related info as values
diverge: mapping of source name -> list of dest name for diverge: mapping of source name -> list of dest name for
divergent renames divergent renames
renamedelete: mapping of source name -> list of destinations for files renamedelete: mapping of source name -> list of destinations for files
b'local directory rename - respect move ' b'local directory rename - respect move '
b'from %s' % sf, b'from %s' % sf,
) )
break break
if not rename_found: if not rename_found:
mresult.addfile( mresult.addfile(
f, f,
mergestatemod.ACTION_KEEP, mergestatemod.ACTION_KEEP_NEW,
None, None,
b'ancestor missing, remote missing', b'ancestor missing, remote missing',
) )
elif n2: # file exists only on remote side elif n2: # file exists only on remote side
if f in copied1: if f in copied1:
pass # we'll deal with it on m1 side pass # we'll deal with it on m1 side
elif f in branch_copies2.movewithdir: elif f in branch_copies2.movewithdir:
repo.ui.note(_(b" %s: picking 'keep' action\n") % f) repo.ui.note(_(b" %s: picking 'keep' action\n") % f)
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 keep new is an option, let's just do that
if mergestatemod.ACTION_KEEP_NEW in bids:
repo.ui.note(_(b" %s: picking 'keep new' action\n") % f)
mresult.addfile(f, *bids[mergestatemod.ACTION_KEEP_NEW][0])
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" %s: picking 'get' action\n") % f)
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
# re-add/mark as modified (manifest only, just log it) # re-add/mark as modified (manifest only, just log it)
for f, args, msg in mresult.getactions( for f, args, msg in mresult.getactions(
(mergestatemod.ACTION_ADD_MODIFIED,), sort=True (mergestatemod.ACTION_ADD_MODIFIED,), sort=True
): ):
repo.ui.debug(b" %s: %s -> am\n" % (f, msg)) repo.ui.debug(b" %s: %s -> am\n" % (f, msg))
progress.increment(item=f) progress.increment(item=f)
# keep (noop, just log it) # keep (noop, just log it)
for f, args, msg in mresult.getactions( for a in mergeresult.NO_OP_ACTIONS:
(mergestatemod.ACTION_KEEP,), sort=True for f, args, msg in mresult.getactions((a,), sort=True):
): repo.ui.debug(b" %s: %s -> %s\n" % (f, msg, a))
repo.ui.debug(b" %s: %s -> k\n" % (f, msg))
# no progress
for f, args, msg in mresult.getactions(
(mergestatemod.ACTION_KEEP_ABSENT,), sort=True
):
repo.ui.debug(b" %s: %s -> ka\n" % (f, msg))
# no progress # no progress
# directory rename, move local # directory rename, move local
for f, args, msg in mresult.getactions( for f, args, msg in mresult.getactions(
(mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,), sort=True (mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,), sort=True
): ):
repo.ui.debug(b" %s: %s -> dm\n" % (f, msg)) repo.ui.debug(b" %s: %s -> dm\n" % (f, msg))
progress.increment(item=f) progress.increment(item=f)

mercurial/mergestate.py

ACTION_MERGE = b'm' ACTION_MERGE = b'm'
ACTION_LOCAL_DIR_RENAME_GET = b'dg' ACTION_LOCAL_DIR_RENAME_GET = b'dg'
ACTION_DIR_RENAME_MOVE_LOCAL = b'dm' ACTION_DIR_RENAME_MOVE_LOCAL = b'dm'
ACTION_KEEP = b'k' ACTION_KEEP = b'k'
# the file was absent on local side before merge and we should # the file was absent on local side before merge and we should
# keep it absent (absent means file not present, it can be a result # keep it absent (absent means file not present, it can be a result
# of file deletion, rename etc.) # of file deletion, rename etc.)
ACTION_KEEP_ABSENT = b'ka' ACTION_KEEP_ABSENT = b'ka'
# the file is absent on the ancestor and remote side of the merge
# hence this file is new and we should keep it
ACTION_KEEP_NEW = b'kn'
ACTION_EXEC = b'e' ACTION_EXEC = b'e'
ACTION_CREATED_MERGE = b'cm' ACTION_CREATED_MERGE = b'cm'
class mergestate(object): class mergestate(object):
'''track 3-way merge state of individual files '''track 3-way merge state of individual files
The merge state is stored on disk when needed. Two files are used: one with The merge state is stored on disk when needed. Two files are used: one with
# keep # keep
for f, args, msg in actions.get(ACTION_KEEP, []): for f, args, msg in actions.get(ACTION_KEEP, []):
pass pass
# keep deleted # keep deleted
for f, args, msg in actions.get(ACTION_KEEP_ABSENT, []): for f, args, msg in actions.get(ACTION_KEEP_ABSENT, []):
pass pass
# keep new
for f, args, msg in actions.get(ACTION_KEEP_NEW, []):
pass
# get # get
for f, args, msg in actions.get(ACTION_GET, []): for f, args, msg in actions.get(ACTION_GET, []):
if branchmerge: if branchmerge:
repo.dirstate.otherparent(f) repo.dirstate.otherparent(f)
else: else:
parentfiledata = getfiledata[f] if getfiledata else None parentfiledata = getfiledata[f] if getfiledata else None
repo.dirstate.normal(f, parentfiledata=parentfiledata) repo.dirstate.normal(f, parentfiledata=parentfiledata)

tests/test-merge-criss-cross.t

$ hg merge 3 --debug $ hg merge 3 --debug
note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e
calculating bids for ancestor 11b5b303e36c calculating bids for ancestor 11b5b303e36c
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9 ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9
d1/a: ancestor missing, remote missing -> k d1/a: ancestor missing, remote missing -> kn
d1/b: ancestor missing, remote missing -> k d1/b: ancestor missing, remote missing -> kn
d2/b: remote created -> g d2/b: remote created -> g
calculating bids for ancestor 154e6000f54e calculating bids for ancestor 154e6000f54e
unmatched files in other: unmatched files in other:
d2/b d2/b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on remote side: on remote side:
src: 'd1/b' -> dst: 'd2/b' src: 'd1/b' -> dst: 'd2/b'
checking for directory renames checking for directory renames
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 (2 ancestors) auction for merging merge bids (2 ancestors)
list of bids for d1/a: list of bids for d1/a:
ancestor missing, remote missing -> k ancestor missing, remote missing -> kn
other deleted -> r other deleted -> r
d1/a: picking 'keep' action d1/a: picking 'keep new' action
list of bids for d1/b: list of bids for d1/b:
ancestor missing, remote missing -> k ancestor missing, remote missing -> kn
other deleted -> r other deleted -> r
d1/b: picking 'keep' action d1/b: picking 'keep new' action
list of bids for d2/b: list of bids for d2/b:
remote created -> g remote created -> g
remote created -> g remote created -> g
d2/b: consensus for g d2/b: 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 -> kn
d1/b: ancestor missing, remote missing -> k d1/b: ancestor missing, remote missing -> kn
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)
Check that removal reversion does not go unotified Check that removal reversion does not go unotified
================================================== ==================================================
On a merge, a file can be removed and user can revert that removal. This means On a merge, a file can be removed and user can revert that removal. This means