Mercurial > hg
view tests/test-bundle.out @ 4363: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 | ce71da8ab4f5 |
children | a6b62584d0b2 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 2 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 4 files, 9 changesets, 7 total revisions searching for changes adding changesets adding manifests adding file changes added 0 changesets with 0 changes to 4 files (run 'hg update' to get a working copy) changeset: -1:000000000000 tag: tip user: date: Thu Jan 01 00:00:00 1970 +0000 checking changesets checking manifests crosschecking files in changesets and manifests checking files 0 files, 0 changesets, 0 total revisions pulling from ../full.hg searching for changes no changes found pulling from ../full.hg requesting all changes adding changesets adding manifests adding file changes added 9 changesets with 7 changes to 4 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) rolling back last transaction pulling from ../full.hg requesting all changes adding changesets adding manifests adding file changes added 9 changesets with 7 changes to 4 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) changeset: 8:836ac62537ab tag: tip parent: 3:ac69c658229d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.3m changeset: 7:80fe151401c2 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3m changeset: 6:1e3f6b843bd6 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3 changeset: 5:024e4e7df376 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.2 changeset: 4:5f4f3ceb285e parent: 0:5649c9d34dd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.1 changeset: 3:ac69c658229d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.3 changeset: 2:d62976ca1e50 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.2 changeset: 1:10b2180f755b user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.1 changeset: 0:5649c9d34dd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.0 changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:../full.hg pulling from bundle://../full.hg requesting all changes adding changesets adding manifests adding file changes added 9 changesets with 7 changes to 4 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) requesting all changes adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 1 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 8:836ac62537ab tag: tip parent: 3:ac69c658229d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.3m changeset: 7:80fe151401c2 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3m changeset: 6:1e3f6b843bd6 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3 changeset: 5:024e4e7df376 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.2 changeset: 4:5f4f3ceb285e parent: 0:5649c9d34dd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.1 changeset: 3:ac69c658229d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.3 changeset: 2:d62976ca1e50 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.2 changeset: 1:10b2180f755b user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.1 changeset: 0:5649c9d34dd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.0 comparing with bundle://../full.hg searching for changes changeset: 4:5f4f3ceb285e parent: 0:5649c9d34dd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.1 changeset: 5:024e4e7df376 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.2 changeset: 6:1e3f6b843bd6 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3 changeset: 7:80fe151401c2 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3m changeset: 8:836ac62537ab tag: tip parent: 3:ac69c658229d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.3m comparing with ../partial2 searching for changes changeset: 4:5f4f3ceb285e parent: 0:5649c9d34dd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.1 changeset: 5:024e4e7df376 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.2 changeset: 6:1e3f6b843bd6 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3 changeset: 7:80fe151401c2 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1.3m changeset: 8:836ac62537ab tag: tip parent: 3:ac69c658229d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.3m abort: No such file or directory: ../does-not-exist.hg 1 files updated, 0 files merged, 0 files removed, 0 files unresolved searching for changes comparing with ../bundle.hg searching for changes changeset: 2:ed1b79f46b9a tag: tip parent: 0:bbd179dfa0a7 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: change foo