2020-01-31 05:40:49 +03:00
|
|
|
#require py2
|
2019-12-10 02:24:31 +03:00
|
|
|
#chg-compatible
|
|
|
|
|
2020-01-20 13:42:49 +03:00
|
|
|
$ disable treemanifest
|
2020-01-20 13:42:49 +03:00
|
|
|
$ newrepo
|
2010-08-14 04:26:58 +04:00
|
|
|
|
2012-06-10 20:50:42 +04:00
|
|
|
audit of .hg
|
2010-08-14 04:26:58 +04:00
|
|
|
|
|
|
|
$ hg add .hg/00changelog.i
|
2017-12-11 06:50:57 +03:00
|
|
|
abort: path contains illegal component: .hg/00changelog.i
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:26:58 +04:00
|
|
|
|
2012-06-10 20:50:42 +04:00
|
|
|
#if symlink
|
|
|
|
|
|
|
|
Symlinks
|
|
|
|
|
2010-08-14 04:26:58 +04:00
|
|
|
$ mkdir a
|
|
|
|
$ echo a > a/a
|
|
|
|
$ hg ci -Ama
|
|
|
|
adding a/a
|
|
|
|
$ ln -s a b
|
|
|
|
$ echo b > a/b
|
|
|
|
$ hg add b/b
|
2017-12-11 06:50:57 +03:00
|
|
|
abort: path 'b/b' traverses symbolic link 'b'
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:26:58 +04:00
|
|
|
$ hg add b
|
|
|
|
|
|
|
|
should still fail - maybe
|
|
|
|
|
|
|
|
$ hg add b/b
|
2017-12-11 06:50:57 +03:00
|
|
|
abort: path 'b/b' traverses symbolic link 'b'
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:26:58 +04:00
|
|
|
|
2015-12-04 00:23:46 +03:00
|
|
|
$ hg commit -m 'add symlink b'
|
|
|
|
|
|
|
|
|
|
|
|
Test symlink traversing when accessing history:
|
|
|
|
-----------------------------------------------
|
|
|
|
|
|
|
|
(build a changeset where the path exists as a directory)
|
|
|
|
|
|
|
|
$ hg up 0
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ mkdir b
|
|
|
|
$ echo c > b/a
|
|
|
|
$ hg add b/a
|
|
|
|
$ hg ci -m 'add directory b'
|
|
|
|
|
|
|
|
Test that hg cat does not do anything wrong the working copy has 'b' as directory
|
|
|
|
|
|
|
|
$ hg cat b/a
|
|
|
|
c
|
|
|
|
$ hg cat -r "desc(directory)" b/a
|
|
|
|
c
|
|
|
|
$ hg cat -r "desc(symlink)" b/a
|
|
|
|
b/a: no such file in rev bc151a1f53bd
|
|
|
|
[1]
|
|
|
|
|
|
|
|
Test that hg cat does not do anything wrong the working copy has 'b' as a symlink (issue4749)
|
|
|
|
|
|
|
|
$ hg up 'desc(symlink)'
|
|
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ hg cat b/a
|
|
|
|
b/a: no such file in rev bc151a1f53bd
|
|
|
|
[1]
|
|
|
|
$ hg cat -r "desc(directory)" b/a
|
|
|
|
c
|
|
|
|
$ hg cat -r "desc(symlink)" b/a
|
|
|
|
b/a: no such file in rev bc151a1f53bd
|
|
|
|
[1]
|
|
|
|
|
2012-06-10 20:50:42 +04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2010-08-14 04:26:58 +04:00
|
|
|
unbundle tampered bundle
|
|
|
|
|
2020-01-20 13:42:49 +03:00
|
|
|
$ newrepo target
|
2012-04-03 21:06:35 +04:00
|
|
|
$ hg unbundle "$TESTDIR/bundles/tampered.hg"
|
2010-08-14 04:26:58 +04:00
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
2019-11-07 21:50:10 +03:00
|
|
|
added 5 changesets with 6 changes to 6 files
|
2010-08-14 04:26:58 +04:00
|
|
|
|
|
|
|
attack .hg/test
|
|
|
|
|
|
|
|
$ hg manifest -r0
|
|
|
|
.hg/test
|
|
|
|
$ hg update -Cr0
|
2017-12-11 06:50:57 +03:00
|
|
|
abort: path contains illegal component: .hg/test
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:26:58 +04:00
|
|
|
|
|
|
|
attack foo/.hg/test
|
|
|
|
|
|
|
|
$ hg manifest -r1
|
|
|
|
foo/.hg/test
|
|
|
|
$ hg update -Cr1
|
2017-12-11 06:50:57 +03:00
|
|
|
abort: path 'foo/.hg/test' is inside nested repo 'foo'
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:26:58 +04:00
|
|
|
|
|
|
|
attack back/test where back symlinks to ..
|
|
|
|
|
|
|
|
$ hg manifest -r2
|
|
|
|
back
|
|
|
|
back/test
|
2012-06-10 20:50:42 +04:00
|
|
|
#if symlink
|
2010-08-14 04:26:58 +04:00
|
|
|
$ hg update -Cr2
|
2017-10-24 21:15:30 +03:00
|
|
|
abort: path 'back/test' traverses symbolic link 'back'
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2012-06-10 20:50:42 +04:00
|
|
|
#else
|
|
|
|
('back' will be a file and cause some other system specific error)
|
|
|
|
$ hg update -Cr2
|
2017-10-14 07:07:26 +03:00
|
|
|
back: is both a file and a directory
|
2012-06-10 20:50:42 +04:00
|
|
|
abort: * (glob)
|
|
|
|
[255]
|
|
|
|
#endif
|
2010-08-14 04:26:58 +04:00
|
|
|
|
|
|
|
attack ../test
|
|
|
|
|
|
|
|
$ hg manifest -r3
|
|
|
|
../test
|
2017-10-17 18:07:43 +03:00
|
|
|
$ mkdir ../test
|
|
|
|
$ echo data > ../test/file
|
2010-08-14 04:26:58 +04:00
|
|
|
$ hg update -Cr3
|
2017-12-11 06:50:57 +03:00
|
|
|
abort: path contains illegal component: ../test
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2017-10-17 18:07:43 +03:00
|
|
|
$ cat ../test/file
|
2017-10-17 18:11:13 +03:00
|
|
|
data
|
2010-08-14 04:26:58 +04:00
|
|
|
|
|
|
|
attack /tmp/test
|
|
|
|
|
|
|
|
$ hg manifest -r4
|
|
|
|
/tmp/test
|
|
|
|
$ hg update -Cr4
|
2017-12-11 06:50:57 +03:00
|
|
|
abort: path contains illegal component: /tmp/test
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2012-06-11 03:40:51 +04:00
|
|
|
|
2017-08-01 15:03:25 +03:00
|
|
|
Test symlink traversal on merge:
|
|
|
|
--------------------------------
|
|
|
|
|
|
|
|
#if symlink
|
|
|
|
|
|
|
|
set up symlink hell
|
|
|
|
|
2020-01-20 13:42:49 +03:00
|
|
|
$ cd "$TESTTMP"
|
2017-08-01 15:03:25 +03:00
|
|
|
$ mkdir merge-symlink-out
|
|
|
|
$ hg init merge-symlink
|
|
|
|
$ cd merge-symlink
|
|
|
|
$ touch base
|
|
|
|
$ hg commit -qAm base
|
|
|
|
$ ln -s ../merge-symlink-out a
|
|
|
|
$ hg commit -qAm 'symlink a -> ../merge-symlink-out'
|
|
|
|
$ hg up -q 0
|
|
|
|
$ mkdir a
|
|
|
|
$ touch a/poisoned
|
|
|
|
$ hg commit -qAm 'file a/poisoned'
|
|
|
|
$ hg log -G -T '{rev}: {desc}\n'
|
|
|
|
@ 2: file a/poisoned
|
|
|
|
|
|
|
|
|
| o 1: symlink a -> ../merge-symlink-out
|
|
|
|
|/
|
|
|
|
o 0: base
|
|
|
|
|
|
|
|
|
|
|
|
try trivial merge
|
|
|
|
|
|
|
|
$ hg up -qC 1
|
|
|
|
$ hg merge 2
|
2017-10-24 21:15:30 +03:00
|
|
|
abort: path 'a/poisoned' traverses symbolic link 'a'
|
|
|
|
[255]
|
2017-08-01 15:03:25 +03:00
|
|
|
|
|
|
|
try rebase onto other revision: cache of audited paths should be discarded,
|
|
|
|
and the rebase should fail (issue5628)
|
|
|
|
|
|
|
|
$ hg up -qC 2
|
|
|
|
$ hg rebase -s 2 -d 1 --config extensions.rebase=
|
2019-12-18 00:45:17 +03:00
|
|
|
rebasing e73c21d6b244 "file a/poisoned"
|
2017-10-24 21:15:30 +03:00
|
|
|
abort: path 'a/poisoned' traverses symbolic link 'a'
|
|
|
|
[255]
|
2017-08-01 15:03:25 +03:00
|
|
|
$ ls ../merge-symlink-out
|
|
|
|
|
|
|
|
Test symlink traversal on update:
|
|
|
|
---------------------------------
|
|
|
|
|
2020-01-20 13:42:49 +03:00
|
|
|
$ cd "$TESTTMP"
|
2017-08-01 15:03:25 +03:00
|
|
|
$ mkdir update-symlink-out
|
|
|
|
$ hg init update-symlink
|
|
|
|
$ cd update-symlink
|
|
|
|
$ ln -s ../update-symlink-out a
|
|
|
|
$ hg commit -qAm 'symlink a -> ../update-symlink-out'
|
|
|
|
$ hg rm a
|
|
|
|
$ mkdir a && touch a/b
|
|
|
|
$ hg ci -qAm 'file a/b' a/b
|
|
|
|
$ hg up -qC 0
|
|
|
|
$ hg rm a
|
|
|
|
$ mkdir a && touch a/c
|
|
|
|
$ hg ci -qAm 'rm a, file a/c'
|
|
|
|
$ hg log -G -T '{rev}: {desc}\n'
|
|
|
|
@ 2: rm a, file a/c
|
|
|
|
|
|
|
|
|
| o 1: file a/b
|
|
|
|
|/
|
|
|
|
o 0: symlink a -> ../update-symlink-out
|
|
|
|
|
|
|
|
|
|
|
|
try linear update where symlink already exists:
|
|
|
|
|
|
|
|
$ hg up -qC 0
|
|
|
|
$ hg up 1
|
2017-10-24 21:15:30 +03:00
|
|
|
abort: path 'a/b' traverses symbolic link 'a'
|
2017-08-01 15:03:25 +03:00
|
|
|
[255]
|
|
|
|
|
|
|
|
try linear update including symlinked directory and its content: paths are
|
|
|
|
audited first by calculateupdates(), where no symlink is created so both
|
|
|
|
'a' and 'a/b' are taken as good paths. still applyupdates() should fail.
|
|
|
|
|
|
|
|
$ hg up -qC null
|
|
|
|
$ hg up 1
|
2017-10-24 21:15:30 +03:00
|
|
|
abort: path 'a/b' traverses symbolic link 'a'
|
2017-07-26 16:10:15 +03:00
|
|
|
[255]
|
2017-08-01 15:03:25 +03:00
|
|
|
$ ls ../update-symlink-out
|
|
|
|
|
|
|
|
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
|
|
|
|
a symlink.
|
|
|
|
|
|
|
|
$ rm -f a
|
|
|
|
$ hg up -qC 2
|
|
|
|
$ hg up 1
|
2017-10-24 21:15:30 +03:00
|
|
|
abort: path 'a/b' traverses symbolic link 'a'
|
2017-07-26 16:10:15 +03:00
|
|
|
[255]
|
2017-08-01 15:03:25 +03:00
|
|
|
$ ls ../update-symlink-out
|
|
|
|
|
|
|
|
#endif
|