This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9003

merge: store cases when a file is absent post merge in commitinfo
ClosedPublic

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

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG768412472663: merge: store cases when a file is absent post merge in commitinfo
Summary

Some merges can result in file being absent form working directory. This can be
one of file was kept deleted or file was removed by merge code.

User might revert the file back before committing. In such cases we will like to
have better handling and create new filenodes.

We store this info in mergestate as commitinfo so that we can use it while
committing to create new filenode if required.

This also adds some hg debugmergestate calls to show that extras are stored in
mergestate.

Diff Detail

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

Event Timeline

pulkit created this revision.Sep 9 2020, 9:45 AM
marmoute requested changes to this revision.Sep 11 2020, 5:15 AM
marmoute added a subscriber: marmoute.
marmoute added inline comments.
mercurial/merge.py
957

Samfe feedback about the semantic of the data. Transmit something meaningful to the commit code and let the commit code behave has it wish.

tests/test-merge-criss-cross.t
664

We should introduce these in a previous changeset, should we not?

This revision now requires changes to proceed.Sep 11 2020, 5:15 AM
pulkit added a commit: rHG768412472663: merge: store cases when a file is absent post merge in commitinfo.Sep 28 2020, 7:21 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG768412472663: merge: store cases when a file is absent post merge in commitinfo (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (13 lines)
Mtests/test-merge-criss-cross.t (32 lines)

Diff 22589

mercurial/merge.py

# deleting it. # deleting it.
mresult.addfile( mresult.addfile(
f, mergestatemod.ACTION_FORGET, None, b'remote deleted', f, mergestatemod.ACTION_FORGET, None, b'remote deleted',
) )
else: else:
mresult.addfile( mresult.addfile(
f, mergestatemod.ACTION_REMOVE, None, b'other deleted', f, mergestatemod.ACTION_REMOVE, None, b'other deleted',
) )
if branchmerge:
# the file must be absent after merging,
# howeber the user might make
# the file reappear using revert and if they does,
# we force create a new node
mresult.addcommitinfo(f, b'FORCE_NEW_FILENODE', b'yes')
marmouteUnsubmitted
Not Done

Samfe feedback about the semantic of the data. Transmit something meaningful to the commit code and let the commit code behave has it wish.

marmoute: Samfe feedback about the semantic of the data. Transmit something meaningful to the commit code…
else: # file not in ancestor, not in remote else: # file not in ancestor, not in remote
rename_found = False rename_found = False
for source, dest in branch_copies1.dirmove.items(): for source, dest in branch_copies1.dirmove.items():
if f.startswith(dest): if f.startswith(dest):
# this directory in which this file is created # this directory in which this file is created
# is moved from somewhere else # is moved from somewhere else
# we should check if the source file exists on # we should check if the source file exists on
# remote side # remote side
) )
else: else:
mresult.addfile( mresult.addfile(
f, f,
mergestatemod.ACTION_KEEP_ABSENT, mergestatemod.ACTION_KEEP_ABSENT,
None, None,
b'local not present, remote unchanged', b'local not present, remote unchanged',
) )
if branchmerge:
# the file must be absent after merging
# however the user might make
# the file reappear using revert and if they does,
# we force create a new node
mresult.addcommitinfo(f, b'FORCE_NEW_FILENODE', b'yes')
if repo.ui.configbool(b'experimental', b'merge.checkpathconflicts'): if repo.ui.configbool(b'experimental', b'merge.checkpathconflicts'):
# If we are merging, look for path conflicts. # If we are merging, look for path conflicts.
checkpathconflicts(repo, wctx, p2, mresult) checkpathconflicts(repo, wctx, p2, mresult)
narrowmatch = repo.narrowmatch() narrowmatch = repo.narrowmatch()
if not narrowmatch.always(): if not narrowmatch.always():
# Updates "actions" in place # Updates "actions" in place

tests/test-merge-criss-cross.t

$ hg update --clean 'desc("merge-deleting-the-file-from-deleted")' $ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("merge-deleting-the-file-from-updated")' $ hg merge 'desc("merge-deleting-the-file-from-updated")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 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)
$ ls -1 $ ls -1
other-file other-file
$ hg debugmergestate
marmouteUnsubmitted
Not Done

We should introduce these in a previous changeset, should we not?

marmoute: We should introduce these in a previous changeset, should we not?
no merge state found
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in conflict
$ hg update --clean 'desc("merge-deleting-the-file-from-deleted")' $ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("merge-keeping-the-file-from-deleted")' $ hg merge 'desc("merge-keeping-the-file-from-deleted")'
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)
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
no merge state found
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in conflict
$ hg update --clean 'desc("merge-deleting-the-file-from-deleted")' $ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("merge-keeping-the-file-from-updated")' $ hg merge 'desc("merge-keeping-the-file-from-updated")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 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)
$ ls -1 $ ls -1
other-file other-file
$ hg debugmergestate
local (working copy): adfd88e5d7d3d3e22bdd26512991ee64d59c1d8f
other (merge rev): 5e3eccec60d88f94a7ba57c351f32cb24c15fe0c
extra: the-file (FORCE_NEW_FILENODE = yes)
(merging two deletion together → no conflict) (merging two deletion together → no conflict)
$ hg update --clean 'desc("merge-deleting-the-file-from-updated")' $ hg update --clean 'desc("merge-deleting-the-file-from-updated")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("merge-deleting-the-file-from-deleted")' $ hg merge 'desc("merge-deleting-the-file-from-deleted")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 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)
$ ls -1 $ ls -1
other-file other-file
$ hg debugmergestate
no merge state found
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in conflict
$ hg update --clean 'desc("merge-deleting-the-file-from-updated")' $ hg update --clean 'desc("merge-deleting-the-file-from-updated")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("merge-keeping-the-file-from-deleted")' $ hg merge 'desc("merge-keeping-the-file-from-deleted")'
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)
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
no merge state found
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in conflict
$ hg update --clean 'desc("merge-deleting-the-file-from-updated")' $ hg update --clean 'desc("merge-deleting-the-file-from-updated")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("merge-keeping-the-file-from-updated")' $ hg merge 'desc("merge-keeping-the-file-from-updated")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 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)
$ ls -1 $ ls -1
other-file other-file
$ hg debugmergestate
local (working copy): a4e0e44229dc130be2915b92c957c093f8c7ee3e
other (merge rev): 5e3eccec60d88f94a7ba57c351f32cb24c15fe0c
extra: the-file (FORCE_NEW_FILENODE = yes)
(merging two "keeping" together → no conflict) (merging two "keeping" together → no conflict)
$ hg update --clean 'desc("merge-keeping-the-file-from-updated")' $ hg update --clean 'desc("merge-keeping-the-file-from-updated")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("merge-keeping-the-file-from-deleted")' $ hg merge 'desc("merge-keeping-the-file-from-deleted")'
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)
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
local (working copy): 5e3eccec60d88f94a7ba57c351f32cb24c15fe0c
other (merge rev): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78
extra: the-file (filenode-source = other)
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in conflict
$ hg update --clean 'desc("merge-keeping-the-file-from-updated")' $ hg update --clean 'desc("merge-keeping-the-file-from-updated")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("merge-deleted-the-file-from-deleted")' $ hg merge 'desc("merge-deleted-the-file-from-deleted")'
abort: empty revision set abort: empty revision set
[255] [255]
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
no merge state found
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in conflict
$ hg update --clean 'desc("merge-keeping-the-file-from-updated")' $ hg update --clean 'desc("merge-keeping-the-file-from-updated")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("merge-deleting-the-file-from-updated")' $ hg merge 'desc("merge-deleting-the-file-from-updated")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 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)
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
local (working copy): 5e3eccec60d88f94a7ba57c351f32cb24c15fe0c
other (merge rev): a4e0e44229dc130be2915b92c957c093f8c7ee3e
extra: the-file (FORCE_NEW_FILENODE = yes)
(merging two "keeping" together → no conflict) (merging two "keeping" together → no conflict)
$ hg update --clean 'desc("merge-keeping-the-file-from-deleted")' $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("merge-keeping-the-file-from-updated")' $ hg merge 'desc("merge-keeping-the-file-from-updated")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 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)
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
no merge state found
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in conflict
$ hg update --clean 'desc("merge-keeping-the-file-from-deleted")' $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("merge-deleted-the-file-from-deleted")' $ hg merge 'desc("merge-deleted-the-file-from-deleted")'
abort: empty revision set abort: empty revision set
[255] [255]
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
no merge state found
(merging a deletion with keeping → conflict) (merging a deletion with keeping → conflict)
BROKEN: this should result in conflict BROKEN: this should result in conflict
$ hg update --clean 'desc("merge-keeping-the-file-from-deleted")' $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("merge-deleting-the-file-from-updated")' $ hg merge 'desc("merge-deleting-the-file-from-updated")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 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)
$ ls -1 $ ls -1
other-file other-file
the-file the-file
$ hg debugmergestate
no merge state found