Mercurial > hg
annotate tests/test-archive-symlinks.t @ 26730:a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Very often in my life I'm finding that the only configured merge tool
present on the system is vimdiff[0], and it's currently impossible (as
far as I can tell) short of specifying `ui.merge = `[1] to actually
*disable* a merge tool. This allows vimdiff-haters to put:
[merge-tools]
vimdiff.disable = yes
in their ~/.hgrc and never see vimdiff again. I'm stopping short of
putting this as a commented out entry in the sample new user hgrc
(seen when a user runs `hg config --edit` with no ~/.hgrc) for now,
but I might come back and do that later.
0: vimdiff is at an awkward intersection: it's usually installed by
the vim package which is often installed as a vi substitute, so it's
mere presence doesn't imply me wanting it, unlike (say) kdiff3.
1: There's a related problem I ran into today where specifying
`ui.merge = :merge` failed because :merge isn't a command, which I
think is a regression. I'll try and figure that out and at least file
a bug.
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 14 Oct 2015 12:57:33 -0400 |
parents | 4d2b9b304ad0 |
children | c4d03b6d9576 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
21216
diff
changeset
|
1 #require symlink |
11854
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 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
22046
diff
changeset
|
21 $ 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 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
22046
diff
changeset
|
29 $ 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" |
21216
6d632cf8a811
tests: suppress spurious lchmod error from unzip (issue4088)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
35 $ unzip archive.zip > /dev/null 2>&1 |
11854
aa2abde72da1
tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents:
5683
diff
changeset
|
36 $ cd zip |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
22046
diff
changeset
|
37 $ 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 .. |