| author | Matt Mackall <mpm@selenic.com> |
| Sun, 08 Oct 2006 19:57:45 -0500 | |
| changeset 3295 | 764688cf51e5 |
| parent 2976 | 61fcd9fac434 |
| child 3328 | 49966b5ab16f |
| permissions | -rwxr-xr-x |
|
2891
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
1 |
#!/bin/sh |
|
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
2 |
|
|
2976
61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2932
diff
changeset
|
3 |
echo "[extensions]" >> $HGRCPATH |
|
61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2932
diff
changeset
|
4 |
echo "extdiff=" >> $HGRCPATH |
|
2891
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
5 |
|
|
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
6 |
hg init a |
|
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 |
cd a |
|
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
8 |
echo a > a |
|
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
9 |
hg add |
|
2932
d77022db1bca
Solaris portability fixes
Danek Duvall <danek.duvall@sun.com>
parents:
2897
diff
changeset
|
10 |
diff -N /dev/null /dev/null 2> /dev/null |
|
d77022db1bca
Solaris portability fixes
Danek Duvall <danek.duvall@sun.com>
parents:
2897
diff
changeset
|
11 |
if [ $? -ne 0 ]; then |
|
d77022db1bca
Solaris portability fixes
Danek Duvall <danek.duvall@sun.com>
parents:
2897
diff
changeset
|
12 |
opt="-p gdiff" |
|
d77022db1bca
Solaris portability fixes
Danek Duvall <danek.duvall@sun.com>
parents:
2897
diff
changeset
|
13 |
fi |
|
d77022db1bca
Solaris portability fixes
Danek Duvall <danek.duvall@sun.com>
parents:
2897
diff
changeset
|
14 |
hg extdiff -o -Nr $opt |
|
2891
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
15 |
|
|
2976
61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2932
diff
changeset
|
16 |
echo "[extdiff]" >> $HGRCPATH |
|
61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2932
diff
changeset
|
17 |
echo "cmd.falabala=echo" >> $HGRCPATH |
|
61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2932
diff
changeset
|
18 |
echo "opts.falabala=diffing" >> $HGRCPATH |
|
2891
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
19 |
|
|
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
20 |
hg falabala |
|
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
21 |
|
|
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
22 |
hg help falabala |
|
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
23 |
|
|
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
24 |
hg ci -d '0 0' -mtest1 |
|
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
25 |
|
|
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
26 |
echo b >> a |
|
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
27 |
hg ci -d '1 0' -mtest2 |
|
453097750fbf
extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
28 |
|
|
2897
8fd6925ae32f
Fixed test-extdiff.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2891
diff
changeset
|
29 |
hg falabala -r 0:1 || echo "diff-like tools yield a non-zero exit code" |