Mercurial > hg
annotate tests/test-archive-symlinks.t @ 18134:6c35b53cd28b
copies: separate moves via directory renames from explicit copies
Currently the "copy" dict contains both explicit copies/moves made by a
context and pending moves that need to happen because the other context moved
the directory the file was in. For explicit copies, the dict stores a
destination to source map, while for pending moves via directory renames, it
stores a source to destination map. The merge code uses this fact in a non-
obvious way to differentiate between these two cases.
We make this explicit by storing these pending moves in a separate dict. The
dict still has a source to destination map, but that is called out in the
docstring.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 26 Dec 2012 14:50:17 -0800 |
parents | f2719b387380 |
children | 6d632cf8a811 |
rev | line source |
---|---|
11854
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
1 $ "$TESTDIR/hghave" symlink || exit 80 |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
2 |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
3 $ origdir=`pwd` |
4831
6f08bc1bd00b
archive: add symlink support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
4 |
11854
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
5 $ hg init repo |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
6 $ cd repo |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
7 $ ln -s nothing dangling |
4831
6f08bc1bd00b
archive: add symlink support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
8 |
11854
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
9 avoid tar warnings about old timestamp |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
10 |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
11 $ hg ci -d '2000-01-01 00:00:00 +0000' -qAm 'add symlink' |
4831
6f08bc1bd00b
archive: add symlink support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
12 |
11854
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
13 $ hg archive -t files ../archive |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
14 $ hg archive -t tar -p tar ../archive.tar |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
15 $ hg archive -t zip -p zip ../archive.zip |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
16 |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
17 files |
4831
6f08bc1bd00b
archive: add symlink support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
18 |
11854
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
19 $ cd "$origdir" |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
20 $ cd archive |
16350
4f795f5fbb0b
tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents:
11854
diff
changeset
|
21 $ "$TESTDIR/readlink.py" dangling |
11854
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
22 dangling -> nothing |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
23 |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
24 tar |
4831
6f08bc1bd00b
archive: add symlink support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
25 |
11854
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
26 $ cd "$origdir" |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
27 $ tar xf archive.tar |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
28 $ cd tar |
16350
4f795f5fbb0b
tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents:
11854
diff
changeset
|
29 $ "$TESTDIR/readlink.py" dangling |
11854
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
30 dangling -> nothing |
4831
6f08bc1bd00b
archive: add symlink support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
31 |
11854
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
32 zip |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
33 |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
34 $ cd "$origdir" |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
35 $ unzip archive.zip > /dev/null |
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
36 $ cd zip |
16350
4f795f5fbb0b
tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents:
11854
diff
changeset
|
37 $ "$TESTDIR/readlink.py" dangling |
11854
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
38 dangling -> nothing |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16350
diff
changeset
|
39 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16350
diff
changeset
|
40 $ cd .. |