Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-commit.out @ 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 | fe0fe0b4d73b |
| children | 30d4d8985dd8 |
line wrap: on
line source
% commit date test abort: impossible time zone offset: 4444444 transaction abort! rollback completed abort: invalid date: '1\t15.1' transaction abort! rollback completed abort: invalid date: 'foo bar' transaction abort! rollback completed nothing changed % partial commit test trouble committing bar! abort: No such file or directory: .../test/bar adding dir/file dir/file adding dir.file abort: no match under directory .../test/dir! abort: no match under directory .../test/bleh! abort: no match under directory .../test/dir2! dir/file does-not-exist: No such file or directory abort: file .../test/does-not-exist not found! abort: file .../test/baz not tracked! abort: file .../test/quux not tracked! dir/file % partial subdir commit test adding bar/bar adding foo/foo % subdir log 1 changeset: 0:6ef3cb06bb80 user: test date: Mon Jan 12 13:46:40 1970 +0000 files: foo/foo description: commit-subdir-1 % subdir log 2 changeset: 1:f2e51572cf5a tag: tip user: test date: Mon Jan 12 13:46:41 1970 +0000 files: bar/bar description: commit-subdir-2 % full log changeset: 1:f2e51572cf5a tag: tip user: test date: Mon Jan 12 13:46:41 1970 +0000 files: bar/bar description: commit-subdir-2 changeset: 0:6ef3cb06bb80 user: test date: Mon Jan 12 13:46:40 1970 +0000 files: foo/foo description: commit-subdir-1 % dot and subdir commit test % full log changeset: 1:d9180e04fa8a tag: tip user: test date: Sat Jan 24 03:33:20 1970 +0000 files: foo/plain-file description: commit-foo-dot changeset: 0:80b572aaf098 user: test date: Mon Jan 12 13:46:40 1970 +0000 files: foo/plain-file description: commit-foo-subdir % subdir log changeset: 1:d9180e04fa8a tag: tip user: test date: Sat Jan 24 03:33:20 1970 +0000 summary: commit-foo-dot changeset: 0:80b572aaf098 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: commit-foo-subdir