Mercurial > hg
annotate tests/test-symlinks.t @ 30764:e75463e3179f
protocol: send application/mercurial-0.2 responses to capable clients
With this commit, the HTTP transport now parses the X-HgProto-<N>
header to determine what media type and compression engine to use for
responses. So far, we only compress responses that are already being
compressed with zlib today (stream response types to specific
commands). We can expand things to cover additional response types
later.
The practical side-effect of this commit is that non-zlib compression
engines will be used if both ends support them. This means if both
ends have zstd support, zstd - not zlib - will be used to compress
data!
When cloning the mozilla-unified repository between a local HTTP
server and client, the benefits of non-zlib compression are quite
noticeable:
engine server CPU (s) client CPU (s) bundle size
zlib (l=6) 174.1 283.2 1,148,547,026
zstd (l=1) 99.2 267.3 1,127,513,841
zstd (l=3) 103.1 266.9 1,018,861,363
zstd (l=7) 128.3 269.7 919,190,278
zstd (l=10) 162.0 - 894,547,179
none 95.3 277.2 4,097,566,064
The default zstd compression level is 3. So if you deploy zstd
capable Mercurial to your clients and servers and CPU time on
your server is dominated by "getbundle" requests (clients cloning
and pulling) - and my experience at Mozilla tells me this is often
the case - this commit could drastically reduce your server-side
CPU usage *and* save on bandwidth costs!
Another benefit of this change is that server operators can install
*any* compression engine. While it isn't enabled by default, the
"none" compression engine can now be used to disable wire protocol
compression completely. Previously, commands like "getbundle" always
zlib compressed output, adding considerable overhead to generating
responses. If you are on a high speed network and your server is under
high load, it might be advantageous to trade bandwidth for CPU.
Although, zstd at level 1 doesn't use that much CPU, so I'm not
convinced that disabling compression wholesale is worthwhile. And, my
data seems to indicate a slow down on the client without compression.
I suspect this is due to a lack of buffering resulting in an increase
in socket read() calls and/or the fact we're transferring an extra 3 GB
of data (parsing HTTP chunked transfer and processing extra TCP packets
can add up). This is definitely worth investigating and optimizing. But
since the "none" compressor isn't enabled by default, I'm inclined to
punt on this issue.
This commit introduces tons of tests. Some of these should arguably
have been implemented on previous commits. But it was difficult to
test without the server functionality in place.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sat, 24 Dec 2016 15:29:32 -0700 |
parents | 4d2b9b304ad0 |
children | 96ca817ec192 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
19157
diff
changeset
|
1 #require symlink |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
2 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
3 == tests added in 0.7 == |
1408 | 4 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
5 $ hg init test-symlinks-0.7; cd test-symlinks-0.7; |
23462
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
6 $ touch foo; ln -s foo bar; ln -s nonexistent baz |
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
7 |
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
8 import with add and addremove -- symlink walking should _not_ screwup. |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
9 |
23462
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
10 $ hg add |
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
11 adding bar |
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
12 adding baz |
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
13 adding foo |
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
14 $ hg forget bar baz foo |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
15 $ hg addremove |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
16 adding bar |
23462
afa3fbbcabd3
add: use lexists so that broken symbolic links are added
John Coomes <john.coomes@oracle.com>
parents:
22046
diff
changeset
|
17 adding baz |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
18 adding foo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
19 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
20 commit -- the symlink should _not_ appear added to dir state |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
21 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
22 $ hg commit -m 'initial' |
1408 | 23 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
24 $ touch bomb |
1408 | 25 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
26 again, symlink should _not_ show up on dir state |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
27 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
28 $ hg addremove |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
29 adding bomb |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
30 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
31 Assert screamed here before, should go by without consequence |
1408 | 32 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
33 $ hg commit -m 'is there a bug?' |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
34 $ cd .. |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
35 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
36 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
37 == fifo & ignore == |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
38 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
39 $ hg init test; cd test; |
1408 | 40 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
41 $ mkdir dir |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
42 $ touch a.c dir/a.o dir/b.o |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
43 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
44 test what happens if we want to trick hg |
1408 | 45 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
46 $ hg commit -A -m 0 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
47 adding a.c |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
48 adding dir/a.o |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
49 adding dir/b.o |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
50 $ echo "relglob:*.o" > .hgignore |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
51 $ rm a.c |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
52 $ rm dir/a.o |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
53 $ rm dir/b.o |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
54 $ mkdir dir/a.o |
17492 | 55 $ ln -s nonexistent dir/b.o |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
56 $ mkfifo a.c |
1408 | 57 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
58 it should show a.c, dir/a.o and dir/b.o deleted |
1487
2bc6cd62a29c
fix handling of files of unsupported type in the walk code
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1408
diff
changeset
|
59 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
60 $ hg status |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
61 M dir/b.o |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
62 ! a.c |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
63 ! dir/a.o |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
64 ? .hgignore |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
65 $ hg status a.c |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
66 a.c: unsupported file type (type is fifo) |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
67 ! a.c |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
68 $ cd .. |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
69 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
70 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
71 == symlinks from outside the tree == |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
72 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
73 test absolute path through symlink outside repo |
1487
2bc6cd62a29c
fix handling of files of unsupported type in the walk code
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1408
diff
changeset
|
74 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
75 $ p=`pwd` |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
76 $ hg init x |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
77 $ ln -s x y |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
78 $ cd x |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
79 $ touch f |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
80 $ hg add f |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
81 $ hg status "$p"/y/f |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
82 A f |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
83 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
84 try symlink outside repo to file inside |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
85 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
86 $ ln -s x/f ../z |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
87 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
88 this should fail |
2115
fd77b7ee4aac
Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails
Jim Meyering <list+hg@meyering.net>
parents:
1620
diff
changeset
|
89 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
90 $ hg status ../z && { echo hg mistakenly exited with status 0; exit 1; } || : |
18450
4f9a52858512
scmutil: localize and improve 'not under root' message
Mads Kiilerich <madski@unity3d.com>
parents:
17492
diff
changeset
|
91 abort: ../z not under root '$TESTTMP/x' |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
92 $ cd .. |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
93 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
94 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
95 == cloning symlinks == |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
96 $ hg init clone; cd clone; |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
97 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
98 try cloning symlink in a subdir |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
99 1. commit a symlink |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
100 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
101 $ mkdir -p a/b/c |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
102 $ cd a/b/c |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
103 $ ln -s /path/to/symlink/source demo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
104 $ cd ../../.. |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
105 $ hg stat |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
106 ? a/b/c/demo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
107 $ hg commit -A -m 'add symlink in a/b/c subdir' |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
108 adding a/b/c/demo |
2115
fd77b7ee4aac
Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails
Jim Meyering <list+hg@meyering.net>
parents:
1620
diff
changeset
|
109 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
110 2. clone it |
4137
26596a6b6518
Create the parent directory when checking out symlinks.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3988
diff
changeset
|
111 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
112 $ cd .. |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
113 $ hg clone clone clonedest |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
114 updating to branch default |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
115 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
116 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
117 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
118 == symlink and git diffs == |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
119 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
120 git symlink diff |
4137
26596a6b6518
Create the parent directory when checking out symlinks.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
3988
diff
changeset
|
121 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
122 $ cd clonedest |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
123 $ hg diff --git -r null:tip |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
124 diff --git a/a/b/c/demo b/a/b/c/demo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
125 new file mode 120000 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
126 --- /dev/null |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
127 +++ b/a/b/c/demo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
128 @@ -0,0 +1,1 @@ |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
129 +/path/to/symlink/source |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
130 \ No newline at end of file |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
131 $ hg export --git tip > ../sl.diff |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
132 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
133 import git symlink diff |
5116
35d47b06d4e3
patch: add git symlink support
Brendan Cully <brendan@kublai.com>
parents:
4882
diff
changeset
|
134 |
11798
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
135 $ hg rm a/b/c/demo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
136 $ hg commit -m'remove link' |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
137 $ hg import ../sl.diff |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
138 applying ../sl.diff |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
139 $ hg diff --git -r 1:tip |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
140 diff --git a/a/b/c/demo b/a/b/c/demo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
141 new file mode 120000 |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
142 --- /dev/null |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
143 +++ b/a/b/c/demo |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
144 @@ -0,0 +1,1 @@ |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
145 +/path/to/symlink/source |
1ab3d8977bdf
tests: unify test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
146 \ No newline at end of file |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
147 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
148 == symlinks and addremove == |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
149 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
150 directory moved and symlinked |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
151 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
152 $ mkdir foo |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
153 $ touch foo/a |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
154 $ hg ci -Ama |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
155 adding foo/a |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
156 $ mv foo bar |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
157 $ ln -s bar foo |
18625
2cbd27f4f3c4
dirstate: walk returns None for files that have a symlink in their path
Durham Goode <durham@fb.com>
parents:
18450
diff
changeset
|
158 $ hg status |
2cbd27f4f3c4
dirstate: walk returns None for files that have a symlink in their path
Durham Goode <durham@fb.com>
parents:
18450
diff
changeset
|
159 ! foo/a |
2cbd27f4f3c4
dirstate: walk returns None for files that have a symlink in their path
Durham Goode <durham@fb.com>
parents:
18450
diff
changeset
|
160 ? bar/a |
2cbd27f4f3c4
dirstate: walk returns None for files that have a symlink in their path
Durham Goode <durham@fb.com>
parents:
18450
diff
changeset
|
161 ? foo |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
162 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
163 now addremove should remove old files |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
164 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
165 $ hg addremove |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
166 adding bar/a |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
167 adding foo |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
168 removing foo/a |
19157
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
169 |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
170 commit and update back |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
171 |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
172 $ hg ci -mb |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
173 $ hg up '.^' |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
174 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
175 $ hg up tip |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
176 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
Siddharth Agarwal <sid0@fb.com>
parents:
18625
diff
changeset
|
177 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
178 $ cd .. |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
179 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
180 == root of repository is symlinked == |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
181 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
182 $ hg init root |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
183 $ ln -s root link |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
184 $ cd root |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
185 $ echo foo > foo |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
186 $ hg status |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
187 ? foo |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
188 $ hg status ../link |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
189 ? foo |
15797
c7a8164c61ab
canonpath: allow canonicalization of non-existant paths
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12399
diff
changeset
|
190 $ hg add foo |
c7a8164c61ab
canonpath: allow canonicalization of non-existant paths
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12399
diff
changeset
|
191 $ hg cp foo "$TESTTMP/link/bar" |
c7a8164c61ab
canonpath: allow canonicalization of non-existant paths
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12399
diff
changeset
|
192 foo has not been committed yet, so no copy data will be stored for bar. |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
193 $ cd .. |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
194 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
195 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
196 $ hg init b |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
197 $ cd b |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
198 $ ln -s nothing dangling |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
199 $ hg commit -m 'commit symlink without adding' dangling |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
200 abort: dangling: file not tracked! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11812
diff
changeset
|
201 [255] |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
202 $ hg add dangling |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
203 $ hg commit -m 'add symlink' |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
204 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
205 $ hg tip -v |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
206 changeset: 0:cabd88b706fc |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
207 tag: tip |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
208 user: test |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
209 date: Thu Jan 01 00:00:00 1970 +0000 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
210 files: dangling |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
211 description: |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
212 add symlink |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
213 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
214 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
215 $ hg manifest --debug |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
216 2564acbe54bbbedfbf608479340b359f04597f80 644 @ dangling |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23462
diff
changeset
|
217 $ readlink.py dangling |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
218 dangling -> nothing |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
219 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
220 $ rm dangling |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
221 $ ln -s void dangling |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
222 $ hg commit -m 'change symlink' |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23462
diff
changeset
|
223 $ readlink.py dangling |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
224 dangling -> void |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
225 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
226 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
227 modifying link |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
228 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
229 $ rm dangling |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
230 $ ln -s empty dangling |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23462
diff
changeset
|
231 $ readlink.py dangling |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
232 dangling -> empty |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
233 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
234 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
235 reverting to rev 0: |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
236 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
237 $ hg revert -r 0 -a |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
238 reverting dangling |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23462
diff
changeset
|
239 $ readlink.py dangling |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
240 dangling -> nothing |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
241 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
242 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
243 backups: |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
244 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23462
diff
changeset
|
245 $ readlink.py *.orig |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
246 dangling.orig -> empty |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
247 $ rm *.orig |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
248 $ hg up -C |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
249 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
250 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
251 copies |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
252 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
253 $ hg cp -v dangling dangling2 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
254 copying dangling to dangling2 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
255 $ hg st -Cmard |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
256 A dangling2 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
257 dangling |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23462
diff
changeset
|
258 $ readlink.py dangling dangling2 |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
259 dangling -> void |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
260 dangling2 -> void |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
261 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
262 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12316
diff
changeset
|
263 Issue995: hg copy -A incorrectly handles symbolic links |
11812
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
264 |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
265 $ hg up -C |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
266 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
267 $ mkdir dir |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
268 $ ln -s dir dirlink |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
269 $ hg ci -qAm 'add dirlink' |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
270 $ mkdir newdir |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
271 $ mv dir newdir/dir |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
272 $ mv dirlink newdir/dirlink |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
273 $ hg mv -A dirlink newdir/dirlink |
6f12f53ae795
tests: merge all 4 test-symlink* into test-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11798
diff
changeset
|
274 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16350
diff
changeset
|
275 $ cd .. |