This is an archive of the discontinued Mercurial Phabricator instance.

Differential D782

merge: improve error messages for path conflicts during update
ClosedPublic

Authored by mbthomas on Sep 22 2017, 5:28 AM.

Details

Reviewers
ryanmce
Group Reviewers
hg-reviewers
Commits
rHG0217d66846f7: merge: improve error messages for path conflicts during update
rHG67c075d6cec1: merge: improve error messages for path conflicts during update
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mbthomas created this revision.Sep 22 2017, 5:28 AM
ryanmce accepted this revision.Sep 25 2017, 4:06 PM
ryanmce added a subscriber: ryanmce.

nice improvement

mercurial/merge.py
741–747

Consider saving a line with warn = repo.ui.warn

mbthomas updated this revision to Diff 2218.Oct 1 2017, 5:33 AM
mbthomas marked an inline comment as done.Oct 1 2017, 6:43 AM
mbthomas updated this revision to Diff 2359.Oct 2 2017, 5:15 PM
ryanmce accepted this revision.Oct 5 2017, 12:32 PM

still looks good after updates

Closed by commit rHG67c075d6cec1: merge: improve error messages for path conflicts during update (authored by mbthomas). · Explain WhyOct 9 2017, 9:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2000

mercurial/merge.py

elif config == 'abort': elif config == 'abort':
abortconflicts.add(f) abortconflicts.add(f)
else: else:
if config == 'warn': if config == 'warn':
warnconflicts.add(f) warnconflicts.add(f)
actions[f] = ('g', (fl2, True), "remote created") actions[f] = ('g', (fl2, True), "remote created")
for f in sorted(abortconflicts): for f in sorted(abortconflicts):
if f in pathconflicts:
if repo.wvfs.isfileorlink(f):
repo.ui.warn(_("%s: untracked file conflicts with directory\n")
% f)
else:
repo.ui.warn(_("%s: untracked directory conflicts with file\n")
% f)
ryanmceUnsubmitted
Done

Consider saving a line with warn = repo.ui.warn

ryanmce: Consider saving a line with `warn = repo.ui.warn`
else:
repo.ui.warn(_("%s: untracked file differs\n") % f) repo.ui.warn(_("%s: untracked file differs\n") % f)
if abortconflicts: if abortconflicts:
raise error.Abort(_("untracked files in working directory " raise error.Abort(_("untracked files in working directory "
"differ from files in requested revision")) "differ from files in requested revision"))
for f in sorted(warnconflicts): for f in sorted(warnconflicts):
if repo.wvfs.isfileorlink(f):
repo.ui.warn(_("%s: replacing untracked file\n") % f) repo.ui.warn(_("%s: replacing untracked file\n") % f)
else:
repo.ui.warn(_("%s: replacing untracked files in directory\n") % f)
for f, (m, args, msg) in actions.iteritems(): for f, (m, args, msg) in actions.iteritems():
if m == 'c': if m == 'c':
backup = (f in fileconflicts or f in pathconflicts or backup = (f in fileconflicts or f in pathconflicts or
any(p in pathconflicts for p in util.finddirs(f))) any(p in pathconflicts for p in util.finddirs(f)))
flags, = args flags, = args
actions[f] = ('g', (flags, backup), msg) actions[f] = ('g', (flags, backup), msg)

tests/test-merge1.t

$ hg update 0 $ hg update 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Test interrupted updates by having a non-empty dir with the same name as one Test interrupted updates by having a non-empty dir with the same name as one
of the files in a commit we're updating to of the files in a commit we're updating to
$ mkdir b && touch b/nonempty $ mkdir b && touch b/nonempty
$ hg up $ hg up
b: untracked file differs b: untracked directory conflicts with file
abort: untracked files in working directory differ from files in requested revision abort: untracked files in working directory differ from files in requested revision
[255] [255]
$ hg ci $ hg ci
nothing changed nothing changed
[1] [1]
$ hg sum $ hg sum
parent: 0:538afb845929 parent: 0:538afb845929
commit #0 commit #0

tests/test-pathconflicts-basic.t

0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Basic update - local directory conflicts with remote file Basic update - local directory conflicts with remote file
$ hg up -q 0 $ hg up -q 0
$ mkdir a $ mkdir a
$ echo 3 > a/b $ echo 3 > a/b
$ hg up file $ hg up file
a: untracked file differs a: untracked directory conflicts with file
abort: untracked files in working directory differ from files in requested revision abort: untracked files in working directory differ from files in requested revision
[255] [255]
$ hg up --clean file $ hg up --clean file
abort: *: '$TESTTMP/repo/a' (glob) abort: *: '$TESTTMP/repo/a' (glob)
[255] [255]
Repo is in a very bad state now - recover manually Repo is in a very bad state now - recover manually

tests/test-update-names.t

make sure that this does not erase untracked data make sure that this does not erase untracked data
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkdir name $ mkdir name
$ echo text > name/file $ echo text > name/file
$ hg st $ hg st
? name/file ? name/file
$ hg up 1 $ hg up 1
name: untracked file differs name: untracked directory conflicts with file
abort: untracked files in working directory differ from files in requested revision abort: untracked files in working directory differ from files in requested revision
[255] [255]
$ cd .. $ cd ..
#if symlink #if symlink
Test update when two commits have symlinks that point to different folders Test update when two commits have symlinks that point to different folders
$ hg init r3 && cd r3 $ hg init r3 && cd r3