Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-clone @ 4359:2e3c54fb79a3
actually port simplemerge to hg
- use bdiff instead of patiencediff; this is a larger change, since
bdiff works on 2 multi-line strings, while patiencediff works on 2
lists;
- rename the main class from Merge3 to Merge3Text and add a Merge3
class that derives from Merge3Text. This new Merge3 class has
the same interface from the original class, so that the tests
still work;
- Merge3 uses util.binary to detect binary data and raises
util.Abort instead of a specific exception;
- don't use the @decorator syntax, to keep python2.3 compatibility;
- the test uses unittest, which likes to print how long it took to
run. This obviously doesn't play too well with hg's test suite,
so we override time.time to fool unittest;
- one test has a different (but still valid) output because of the
different diff algorithm used;
- the TestCase class used by bzr has some extras to help debugging.
test-merge3.py used 2 of them:
- log method to log some data
- assertEqualDiff method to ease viewing diffs of diffs
We add a dummy log method and use regular assertEquals instead of
assertEqualDiff.
- make simplemerge executable and add "#!/usr/bin/env python" header
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 16 Apr 2007 20:17:39 -0300 |
parents | ba198d17eea9 |
children | 76c4cadb49fc |
rev | line source |
---|---|
834
78a9f95766dc
Use sh instead of bash in tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
1 #!/bin/sh |
550 | 2 |
3 mkdir a | |
4 cd a | |
5 hg init | |
6 echo a > a | |
7 hg add a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
550
diff
changeset
|
8 hg commit -m test -d '0 0' |
550 | 9 |
10 # Default operation | |
11 hg clone . ../b | |
12 cd ../b | |
13 cat a | |
14 hg verify | |
15 | |
16 # No update | |
17 hg clone -U . ../c | |
18 cd ../c | |
1926
ba198d17eea9
changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents:
839
diff
changeset
|
19 cat a 2>/dev/null || echo "a not present" |
550 | 20 hg verify |
21 | |
22 # Default destination | |
23 mkdir ../d | |
24 cd ../d | |
25 hg clone ../a | |
26 cd a | |
27 hg cat a |