This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5243

resolve: fix mark-check when a file was deleted on one side (issue6020)
ClosedPublic

Authored by spectral on Nov 7 2018, 6:45 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG183df3df6031: resolve: fix mark-check when a file was deleted on one side (issue6020)
Summary

wvfs.open raises an error if one of the files does not exist. Ignoring the error
if it's ENOENT is done in several other places in this code, so I'm in good
company :)

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

spectral created this revision.Nov 7 2018, 6:45 PM
yuja added a subscriber: yuja.Nov 8 2018, 6:45 AM
  • with repo.wvfs(f) as fobj:
  • fdata = fobj.read()

+ try:
+ with repo.wvfs(f) as fobj:
+ fdata = fobj.read()
+ except (IOError, OSError) as inst:
+ if inst.errno != errno.ENOENT:
+ raise

'fdata' can be undefined here. Appears that the test doesn't go through this
case.

Perhaps, wvfs.tryread() can be used instead.

if filemerge.hasconflictmarkers(fdata) and \
    ms[f] != mergemod.MERGE_RECORD_RESOLVED:
    hasconflictmarkers.append(f)
spectral planned changes to this revision.Nov 13 2018, 9:23 PM

(not sure when I'll get to the changes, but removing from Needs Review, sorry I delayed so long doing that)

spectral updated this revision to Diff 13298.Jan 16 2019, 3:49 PM
spectral added a comment.Jan 16 2019, 3:50 PM

Alright that test seems a bit ridiculous now that I'm looking at it in the diff, but it's at least thorough? :)

yuja added a comment.Jan 17 2019, 8:17 AM

Queued, thanks.

Replaced all [[ -f ]] with [ -f ]. `[[]]` requires Bash.

Closed by commit rHG183df3df6031: resolve: fix mark-check when a file was deleted on one side (issue6020) (authored by spectral). · Explain WhyJan 17 2019, 8:42 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (3 lines)
Mtests/test-resolve.t (166 lines)

Diff 13315

mercurial/commands.py

ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH) ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH: elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
ui.warn(_('%s: path conflict must be resolved manually\n') ui.warn(_('%s: path conflict must be resolved manually\n')
% f) % f)
continue continue
if mark: if mark:
if markcheck: if markcheck:
with repo.wvfs(f) as fobj: fdata = repo.wvfs.tryread(f)
fdata = fobj.read()
if filemerge.hasconflictmarkers(fdata) and \ if filemerge.hasconflictmarkers(fdata) and \
ms[f] != mergemod.MERGE_RECORD_RESOLVED: ms[f] != mergemod.MERGE_RECORD_RESOLVED:
hasconflictmarkers.append(f) hasconflictmarkers.append(f)
ms.mark(f, mergemod.MERGE_RECORD_RESOLVED) ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
elif unmark: elif unmark:
ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED) ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
else: else:
# backup pre-resolve (merge uses .orig for its own purposes) # backup pre-resolve (merge uses .orig for its own purposes)

tests/test-resolve.t

R emp2 R emp2
R emp3 R emp3
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
Done with commands.resolve.confirm tests: Done with commands.resolve.confirm tests:
$ cd .. $ cd ..
Test that commands.resolve.mark-check works even if there are deleted files:
$ hg init resolve-deleted
$ cd resolve-deleted
$ echo r0 > file1
$ hg ci -qAm r0
$ echo r1 > file1
$ hg ci -qm r1
$ hg co -qr 0
$ hg rm file1
$ hg ci -qm "r2 (delete file1)"
(At this point we have r0 creating file1, and sibling commits r1 and r2, which
modify and delete file1, respectively)
$ hg merge -r 1
file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ hg resolve --list
U file1
Because we left it as 'unresolved' the file should still exist.
$ [ -f file1 ] || echo "File does not exist?"
BC behavior: `hg resolve --mark` accepts that the file is still there, and
doesn't have a problem with this situation.
$ hg resolve --mark --config commands.resolve.mark-check=abort
(no more unresolved files)
$ hg resolve --list
R file1
The file is still there:
$ [ -f file1 ] || echo "File does not exist?"
Let's check mark-check=warn:
$ hg resolve --unmark file1
$ hg resolve --mark --config commands.resolve.mark-check=warn
(no more unresolved files)
$ hg resolve --list
R file1
The file is still there:
$ [ -f file1 ] || echo "File does not exist?"
Let's resolve the issue by deleting the file via `hg resolve`
$ hg resolve --unmark file1
$ echo 'd' | hg resolve file1 --config ui.interactive=1
file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d
(no more unresolved files)
$ hg resolve --list
R file1
The file is deleted:
$ [ -f file1 ] && echo "File still exists?" || true
Doing `hg resolve --mark` doesn't break now that the file is missing:
$ hg resolve --mark --config commands.resolve.mark-check=abort
(no more unresolved files)
$ hg resolve --mark --config commands.resolve.mark-check=warn
(no more unresolved files)
Resurrect the file, and delete it outside of hg:
$ hg resolve --unmark file1
$ hg resolve file1
file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
[1]
$ [ -f file1 ] || echo "File does not exist?"
$ hg resolve --list
U file1
$ rm file1
$ hg resolve --mark --config commands.resolve.mark-check=abort
(no more unresolved files)
$ hg resolve --list
R file1
$ hg resolve --unmark file1
$ hg resolve file1
file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
[1]
$ [ -f file1 ] || echo "File does not exist?"
$ hg resolve --list
U file1
$ rm file1
$ hg resolve --mark --config commands.resolve.mark-check=warn
(no more unresolved files)
$ hg resolve --list
R file1
For completeness, let's try that in the opposite direction (merging r2 into r1,
instead of r1 into r2):
$ hg update -qCr 1
$ hg merge -r 2
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ hg resolve --list
U file1
Because we left it as 'unresolved' the file should still exist.
$ [ -f file1 ] || echo "File does not exist?"
BC behavior: `hg resolve --mark` accepts that the file is still there, and
doesn't have a problem with this situation.
$ hg resolve --mark --config commands.resolve.mark-check=abort
(no more unresolved files)
$ hg resolve --list
R file1
The file is still there:
$ [ -f file1 ] || echo "File does not exist?"
Let's check mark-check=warn:
$ hg resolve --unmark file1
$ hg resolve --mark --config commands.resolve.mark-check=warn
(no more unresolved files)
$ hg resolve --list
R file1
The file is still there:
$ [ -f file1 ] || echo "File does not exist?"
Let's resolve the issue by deleting the file via `hg resolve`
$ hg resolve --unmark file1
$ echo 'd' | hg resolve file1 --config ui.interactive=1
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? d
(no more unresolved files)
$ hg resolve --list
R file1
The file is deleted:
$ [ -f file1 ] && echo "File still exists?" || true
Doing `hg resolve --mark` doesn't break now that the file is missing:
$ hg resolve --mark --config commands.resolve.mark-check=abort
(no more unresolved files)
$ hg resolve --mark --config commands.resolve.mark-check=warn
(no more unresolved files)
Resurrect the file, and delete it outside of hg:
$ hg resolve --unmark file1
$ hg resolve file1
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
[1]
$ [ -f file1 ] || echo "File does not exist?"
$ hg resolve --list
U file1
$ rm file1
$ hg resolve --mark --config commands.resolve.mark-check=abort
(no more unresolved files)
$ hg resolve --list
R file1
$ hg resolve --unmark file1
$ hg resolve file1
file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
[1]
$ [ -f file1 ] || echo "File does not exist?"
$ hg resolve --list
U file1
$ rm file1
$ hg resolve --mark --config commands.resolve.mark-check=warn
(no more unresolved files)
$ hg resolve --list
R file1
$ cd ..