author | Matt Mackall <mpm@selenic.com> |
Sun, 26 Apr 2009 16:50:43 -0500 | |
changeset 8181 | 03d93882fc93 |
parent 7680 | 89c2b78faec4 |
permissions | -rwxr-xr-x |
7628
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
1 |
#!/bin/sh -e |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
2 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
3 |
# test of hg diff --change |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
4 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
5 |
set -e |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
6 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
7 |
ec() { |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
8 |
echo "invoking $@:" |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
9 |
"$@" |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
10 |
} |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
11 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
12 |
hg init a |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
13 |
cd a |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
14 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
15 |
echo "first" > file.txt |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
16 |
hg add file.txt |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
17 |
hg commit -m 'first commit' # 0 |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
18 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
19 |
echo "second" > file.txt |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
20 |
hg commit -m 'second commit' # 1 |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
21 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
22 |
echo "third" > file.txt |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
23 |
hg commit -m 'third commit' # 2 |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
24 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
25 |
ec hg diff --nodates --change 1 |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
26 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
27 |
echo |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
28 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
29 |
#rev=$(hg log -r 1 --template '{node|short}') |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
30 |
rev=e9b286083166 |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
31 |
ec hg diff --nodates --change "$rev" |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
32 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
33 |
## |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
34 |
# Testing diff -c when merge |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
35 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
36 |
for i in 1 2 3 4 5 6 7 8 9 10; do |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
37 |
echo $i >> file.txt |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
38 |
done |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
39 |
hg commit -m "lots of text" # 3 |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
40 |
|
7680
89c2b78faec4
tests: eliminate use of sed -i (which fails on NetBSD)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7628
diff
changeset
|
41 |
sed -e 's,^2$,x,' file.txt > file.txt.tmp |
89c2b78faec4
tests: eliminate use of sed -i (which fails on NetBSD)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7628
diff
changeset
|
42 |
mv file.txt.tmp file.txt |
7628
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
43 |
hg commit -m "changed 2 to x" # 4 |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
44 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
45 |
hg up -r 3 > /dev/null 2>&1 # updated, merged, removed, unresolved |
7680
89c2b78faec4
tests: eliminate use of sed -i (which fails on NetBSD)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7628
diff
changeset
|
46 |
sed -e 's,^8$,y,' file.txt > file.txt.tmp |
89c2b78faec4
tests: eliminate use of sed -i (which fails on NetBSD)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7628
diff
changeset
|
47 |
mv file.txt.tmp file.txt |
7628
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
48 |
hg commit -m "change 8 to y" > /dev/null 2>&1 # 5 # created new head |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
49 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
50 |
hg up -C -r 4 > /dev/null 2>&1 # updated, merged, removed, unresolved |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
51 |
hg merge -r 5 > /dev/null 2>&1 # updated, merged, removed, unresolved |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
52 |
hg commit -m "merging 8 to y" # 6 |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
53 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
54 |
echo |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
55 |
ec hg diff --nodates --change 6 # must be similar to hg diff --nodates --change 5 |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
56 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
57 |
#echo |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
58 |
#hg log |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
59 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
60 |
echo |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
61 |
echo "EOF" |
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
62 |
|
9c6ae2e09e11
diff: add --change option to display single changeset diff (issue1420)
Stepan Koltsov <yozh@mx1.ru>
parents:
diff
changeset
|
63 |
# vim: set ts=4 sw=4 et: |