This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1223

merge: disable path conflict checking by default (issue5716)
ClosedPublic

Authored by sid0 on Oct 23 2017, 7:45 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG2a774cae3a03: merge: disable path conflict checking by default (issue5716)
Summary

We shouldn't ship a severe perf regression in hg update for 4.4.

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

sid0 created this revision.Oct 23 2017, 7:45 PM
sid0 updated this revision to Diff 3075.Oct 23 2017, 10:17 PM
sid0 updated this revision to Diff 3076.Oct 24 2017, 12:25 AM
sid0 updated this revision to Diff 3082.Oct 24 2017, 3:08 PM
durin42 accepted this revision.Oct 30 2017, 5:09 PM
This revision is now accepted and ready to land.Oct 30 2017, 5:09 PM
Closed by commit rHG2a774cae3a03: merge: disable path conflict checking by default (issue5716) (authored by sid0). · Explain WhyOct 30 2017, 5:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 3161

mercurial/configitems.py

) )
coreconfigitem('merge', 'checkunknown', coreconfigitem('merge', 'checkunknown',
default='abort', default='abort',
) )
coreconfigitem('merge', 'checkignored', coreconfigitem('merge', 'checkignored',
default='abort', default='abort',
) )
coreconfigitem('experimental', 'merge.checkpathconflicts', coreconfigitem('experimental', 'merge.checkpathconflicts',
default=True, default=False,
) )
coreconfigitem('merge', 'followcopies', coreconfigitem('merge', 'followcopies',
default=True, default=True,
) )
coreconfigitem('merge', 'on-failure', coreconfigitem('merge', 'on-failure',
default='continue', default='continue',
) )
coreconfigitem('merge', 'preferancestor', coreconfigitem('merge', 'preferancestor',

tests/test-audit-path.t

attack back/test where back symlinks to .. attack back/test where back symlinks to ..
$ hg manifest -r2 $ hg manifest -r2
back back
back/test back/test
#if symlink #if symlink
$ hg update -Cr2 $ hg update -Cr2
back: is both a file and a directory abort: path 'back/test' traverses symbolic link 'back'
abort: destination manifest contains path conflicts
[255] [255]
#else #else
('back' will be a file and cause some other system specific error) ('back' will be a file and cause some other system specific error)
$ hg update -Cr2 $ hg update -Cr2
back: is both a file and a directory back: is both a file and a directory
abort: * (glob) abort: * (glob)
[255] [255]
#endif #endif
|/ |/
o 0: base o 0: base
try trivial merge try trivial merge
$ hg up -qC 1 $ hg up -qC 1
$ hg merge 2 $ hg merge 2
a: path conflict - a file or link has the same name as a directory abort: path 'a/poisoned' traverses symbolic link 'a'
the local file has been renamed to a~aa04623eb0c3 [255]
resolve manually then use 'hg resolve --mark a'
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1]
try rebase onto other revision: cache of audited paths should be discarded, try rebase onto other revision: cache of audited paths should be discarded,
and the rebase should fail (issue5628) and the rebase should fail (issue5628)
$ hg up -qC 2 $ hg up -qC 2
$ hg rebase -s 2 -d 1 --config extensions.rebase= $ hg rebase -s 2 -d 1 --config extensions.rebase=
rebasing 2:e73c21d6b244 "file a/poisoned" (tip) rebasing 2:e73c21d6b244 "file a/poisoned" (tip)
a: path conflict - a file or link has the same name as a directory abort: path 'a/poisoned' traverses symbolic link 'a'
the local file has been renamed to a~aa04623eb0c3 [255]
resolve manually then use 'hg resolve --mark a'
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ ls ../merge-symlink-out $ ls ../merge-symlink-out
$ cd .. $ cd ..
Test symlink traversal on update: Test symlink traversal on update:
--------------------------------- ---------------------------------
$ mkdir update-symlink-out $ mkdir update-symlink-out
|/ |/
o 0: symlink a -> ../update-symlink-out o 0: symlink a -> ../update-symlink-out
try linear update where symlink already exists: try linear update where symlink already exists:
$ hg up -qC 0 $ hg up -qC 0
$ hg up 1 $ hg up 1
a: is both a file and a directory abort: path 'a/b' traverses symbolic link 'a'
abort: destination manifest contains path conflicts
[255] [255]
try linear update including symlinked directory and its content: paths are try linear update including symlinked directory and its content: paths are
audited first by calculateupdates(), where no symlink is created so both audited first by calculateupdates(), where no symlink is created so both
'a' and 'a/b' are taken as good paths. still applyupdates() should fail. 'a' and 'a/b' are taken as good paths. still applyupdates() should fail.
$ hg up -qC null $ hg up -qC null
$ hg up 1 $ hg up 1
a: is both a file and a directory abort: path 'a/b' traverses symbolic link 'a'
abort: destination manifest contains path conflicts
[255] [255]
$ ls ../update-symlink-out $ ls ../update-symlink-out
try branch update replacing directory with symlink, and its content: the try branch update replacing directory with symlink, and its content: the
path 'a' is audited as a directory first, which should be audited again as path 'a' is audited as a directory first, which should be audited again as
a symlink. a symlink.
$ rm -f a $ rm -f a
$ hg up -qC 2 $ hg up -qC 2
$ hg up 1 $ hg up 1
a: is both a file and a directory abort: path 'a/b' traverses symbolic link 'a'
abort: destination manifest contains path conflicts
[255] [255]
$ ls ../update-symlink-out $ ls ../update-symlink-out
$ cd .. $ cd ..
#endif #endif

tests/test-commandserver.t

... # audit a/poisoned as a good path ... # audit a/poisoned as a good path
... runcommand(server, ['up', '-qC', '2']) ... runcommand(server, ['up', '-qC', '2'])
... runcommand(server, ['up', '-qC', '1']) ... runcommand(server, ['up', '-qC', '1'])
... # here a is a symlink, so a/poisoned is bad ... # here a is a symlink, so a/poisoned is bad
... runcommand(server, ['merge', '2']) ... runcommand(server, ['merge', '2'])
*** runcommand up -qC 2 *** runcommand up -qC 2
*** runcommand up -qC 1 *** runcommand up -qC 1
*** runcommand merge 2 *** runcommand merge 2
a: path conflict - a file or link has the same name as a directory abort: path 'a/poisoned' traverses symbolic link 'a'
the local file has been renamed to a~aa04623eb0c3 [255]
resolve manually then use 'hg resolve --mark a'
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1]
$ ls ../merge-symlink-out $ ls ../merge-symlink-out
cache of repo.auditor should be discarded, so matcher would never traverse cache of repo.auditor should be discarded, so matcher would never traverse
symlinks: symlinks:
$ hg up -qC 0 $ hg up -qC 0
$ touch ../merge-symlink-out/poisoned $ touch ../merge-symlink-out/poisoned
>>> from hgclient import check, readchannel, runcommand >>> from hgclient import check, readchannel, runcommand

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 directory conflicts with file 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
abort: untracked files in working directory differ from files in requested revision
[255]
$ hg ci $ hg ci
nothing changed nothing changed
[1] [1]
$ hg sum $ hg sum
parent: 0:538afb845929 parent: 1:b8bb4a988f25 tip
commit #0 commit #1
branch: default branch: default
commit: 1 unknown (clean) commit: (clean)
update: 1 new changesets (update) update: (current)
phases: 2 draft phases: 2 draft
The following line is commented out because the file doesn't exist at the moment, and some OSes error out even with `rm -f`.
$ rm b/nonempty $ rm b/nonempty
$ hg up $ hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg sum $ hg sum
parent: 1:b8bb4a988f25 tip parent: 1:b8bb4a988f25 tip
commit #1 commit #1
branch: default branch: default
commit: (clean) commit: (clean)
update: (current) update: (current)
phases: 2 draft phases: 2 draft

tests/test-pathconflicts-basic.t

Path conflict checking is currently disabled by default because of issue5716.
Turn it on for this test.
$ cat >> $HGRCPATH << EOF
> [experimental]
> merge.checkpathconflicts=True
> EOF
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo base > base $ echo base > base
$ hg add base $ hg add base
$ hg commit -m "base" $ hg commit -m "base"
$ hg bookmark -i base $ hg bookmark -i base
$ echo 1 > a $ echo 1 > a
$ hg add a $ hg add a
$ hg sum $ hg sum
parent: 2:f64e09fac717 parent: 2:f64e09fac717
file2 file2
branch: default branch: default
bookmarks: *file2 bookmarks: *file2
commit: (clean) commit: (clean)
update: 1 new changesets, 2 branch heads (merge) update: 1 new changesets, 2 branch heads (merge)
phases: 4 draft phases: 4 draft

tests/test-pathconflicts-merge.t

Path conflict checking is currently disabled by default because of issue5716.
Turn it on for this test.
$ cat >> $HGRCPATH << EOF
> [experimental]
> merge.checkpathconflicts=True
> EOF
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo base > base $ echo base > base
$ hg add base $ hg add base
$ hg commit -m "base" $ hg commit -m "base"
$ hg bookmark -i base $ hg bookmark -i base
$ mkdir a $ mkdir a
$ echo 1 > a/b $ echo 1 > a/b

tests/test-pathconflicts-update.t

Path conflict checking is currently disabled by default because of issue5716.
Turn it on for this test.
$ cat >> $HGRCPATH << EOF
> [experimental]
> merge.checkpathconflicts=True
> EOF
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo base > base $ echo base > base
$ hg add base $ hg add base
$ hg commit -m "base" $ hg commit -m "base"
$ hg bookmark -i base $ hg bookmark -i base
$ mkdir a $ mkdir a
$ echo 1 > a/b $ echo 1 > a/b
$ mkdir a/b $ mkdir a/b
$ echo 9 > a/b/c $ echo 9 > a/b/c
$ hg up file2 --check --config merge.checkunknown=warn $ hg up file2 --check --config merge.checkunknown=warn
abort: uncommitted changes abort: uncommitted changes
[255] [255]
$ hg up file2 --clean $ hg up file2 --clean
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark file2) (activating bookmark file2)

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 directory conflicts with file 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
abort: untracked files in working directory differ from files in requested revision
[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
$ echo root > root && hg ci -Am root $ echo root > root && hg ci -Am root
adding root adding root