Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-git-export @ 2901:05f357b70cb0
Tune a bit the extdiff toplevel comments/samples.
* Capitalize the first letter of all sentences
* Add an example for GNU diff(1) 'context diff' mode.
* Explain the requirement for separate cmd.xxx and opts.xxx
options in .hgrc, which hopefully will guard against users
trying to add:
[extdiff]
# Add a new Mercurial command called `cdiff', which calls
# GNU diff(1) in 'context diff' mode.
cmd.cdiff = diff -Nprc5
which fails for recent crew builds with:
$ hg cdiff .
making snapshot of 1 files from rev 07dc4a569f4e
making snapshot of 1 files from working dir
diff -Nprc5: not found
The correct way to do this is by separating the cmd.cdiff and
opts.cdiff parts like this:
[extdiff]
# Add a new Mercurial command called `cdiff', which calls
# GNU diff(1) in 'context diff' mode.
cmd.cdiff = diff
opts.cdiff = -Nprc5
so add it as a new example and explicitly describe it in the
extdiff comments.
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Tue, 15 Aug 2006 18:14:58 +0300 |
parents | 8b02af865990 |
children | 1c66aad252f9 |
rev | line source |
---|---|
2892 | 1 #!/bin/sh |
2 | |
3 hg init a | |
4 cd a | |
5 | |
6 echo start > start | |
7 hg ci -Amstart -d '0 0' | |
8 echo new > new | |
9 hg ci -Amnew -d '0 0' | |
10 echo '% new file' | |
11 hg diff --git -r 0 | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" | |
12 | |
13 hg cp new copy | |
14 hg ci -mcopy -d '0 0' | |
15 echo '% copy' | |
16 hg diff --git -r 1:tip | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" | |
17 | |
18 hg mv copy rename | |
19 hg ci -mrename -d '0 0' | |
20 echo '% rename' | |
21 hg diff --git -r 2:tip | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" | |
22 | |
23 hg rm rename | |
24 hg ci -mdelete -d '0 0' | |
25 echo '% delete' | |
26 hg diff --git -r 3:tip | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" | |
27 | |
28 cat > src <<EOF | |
29 1 | |
30 2 | |
31 3 | |
32 4 | |
33 5 | |
34 EOF | |
35 hg ci -Amsrc -d '0 0' | |
36 chmod +x src | |
37 hg ci -munexec -d '0 0' | |
38 echo '% chmod 644' | |
39 hg diff --git -r 5:tip | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" | |
40 | |
41 hg mv src dst | |
42 chmod -x dst | |
43 echo a >> dst | |
44 hg ci -mrenamemod -d '0 0' | |
45 echo '% rename+mod+chmod' | |
46 hg diff --git -r 6:tip | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" |