Mercurial > hg
annotate tests/test-bundle-vs-outgoing.t @ 20742:3681de20b0a7
parsers: fail fast if Python has wrong minor version (issue4110)
This change causes an informative ImportError to be raised when importing
the parsers extension module if the minor version of the currently-running
Python interpreter doesn't match that of the Python used when compiling
the extension module.
This change also exposes a parsers.versionerrortext constant in the
C implementation of the module. Its presence can be used to determine
whether this behavior is present in a version of the module. The value
of the constant is the leading text of the ImportError raised and is set
to "Python minor version mismatch".
Here is an example of what the new error looks like:
Traceback (most recent call last):
File "test.py", line 1, in <module>
import mercurial.parsers
ImportError: Python minor version mismatch: The Mercurial extension
modules were compiled with Python 2.7.6, but Mercurial is currently using
Python with sys.hexversion=33883888: Python 2.5.6
(r256:88840, Nov 18 2012, 05:37:10)
[GCC 4.2.1 Compatible Apple Clang 4.1 ((tags/Apple/clang-421.11.66))]
at: /opt/local/Library/Frameworks/Python.framework/Versions/2.5/Resources/
Python.app/Contents/MacOS/Python
The reason for raising an error in this scenario is that Python's C API
is known not to be compatible from minor version to minor version, even
if sys.api_version is the same. See for example this Python bug report
about incompatibilities between 2.5 and 2.6+:
http://bugs.python.org/issue8118
These incompatibilities can cause Mercurial to break in mysterious,
unforeseen ways. For example, when Mercurial compiled with Python 2.7 was
run with 2.5, the following crash occurred when running "hg status":
http://bz.selenic.com/show_bug.cgi?id=4110
After this crash was fixed, running with Python 2.5 no longer crashes, but
the following puzzling behavior still occurs:
$ hg status
...
File ".../mercurial/changelog.py", line 123, in __init__
revlog.revlog.__init__(self, opener, "00changelog.i")
File ".../mercurial/revlog.py", line 251, in __init__
d = self._io.parseindex(i, self._inline)
File ".../mercurial/revlog.py", line 158, in parseindex
index, cache = parsers.parse_index2(data, inline)
TypeError: data is not a string
which can be reproduced more simply with:
import mercurial.parsers as parsers
parsers.parse_index2("", True)
Both the crash and the TypeError occurred because the Python C API's
PyString_Check() returns the wrong value when the C header files from
Python 2.7 are run with Python 2.5. This is an example of an
incompatibility of the sort mentioned in the Python bug report above.
Failing fast with an informative error message results in a better user
experience in cases like the above. The information in the ImportError
also simplifies troubleshooting for those on Mercurial mailing lists, the
bug tracker, etc.
This patch only adds the version check to parsers.c, which is sufficient
to affect command-line commands like "hg status" and "hg summary".
An idea for a future improvement is to move the version-checking C code
to a more central location, and have it run when importing all
Mercurial extension modules and not just parsers.c.
author | Chris Jerdonek <chris.jerdonek@gmail.com> |
---|---|
date | Wed, 04 Dec 2013 20:38:27 -0800 |
parents | aa9385f983fa |
children | eb586ed5d8ce |
rev | line source |
---|---|
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
1 this structure seems to tickle a bug in bundle's search for |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
2 changesets, so first we have to recreate it |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
3 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
4 o 8 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
5 | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
6 | o 7 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
7 | | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
8 | o 6 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
9 |/| |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
10 o | 5 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
11 | | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
12 o | 4 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
13 | | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
14 | o 3 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
15 | | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
16 | o 2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
17 |/ |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
18 o 1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
19 | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
20 o 0 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
21 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
22 $ mkrev() |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
23 > { |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
24 > revno=$1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
25 > echo "rev $revno" |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
26 > echo "rev $revno" > foo.txt |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
27 > hg -q ci -m"rev $revno" |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
28 > } |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
29 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
30 setup test repo1 |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
31 |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
32 $ hg init repo1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
33 $ cd repo1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
34 $ echo "rev 0" > foo.txt |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
35 $ hg ci -Am"rev 0" |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
36 adding foo.txt |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
37 $ mkrev 1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
38 rev 1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
39 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
40 first branch |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
41 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
42 $ mkrev 2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
43 rev 2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
44 $ mkrev 3 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
45 rev 3 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
46 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
47 back to rev 1 to create second branch |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
48 |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
49 $ hg up -r1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
51 $ mkrev 4 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
52 rev 4 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
53 $ mkrev 5 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
54 rev 5 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
55 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
56 merge first branch to second branch |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
57 |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
58 $ hg up -C -r5 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
59 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
60 $ HGMERGE=internal:local hg merge |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
61 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
62 (branch merge, don't forget to commit) |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
63 $ echo "merge rev 5, rev 3" > foo.txt |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
64 $ hg ci -m"merge first branch to second branch" |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
65 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
66 one more commit following the merge |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
67 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
68 $ mkrev 7 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
69 rev 7 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
70 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
71 back to "second branch" to make another head |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
72 |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
73 $ hg up -r5 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
74 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
75 $ mkrev 8 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
76 rev 8 |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
77 |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
78 the story so far |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
79 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
16913
diff
changeset
|
80 $ hg log -G --template "{rev}\n" |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
81 @ 8 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
82 | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
83 | o 7 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
84 | | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
85 | o 6 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
86 |/| |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
87 o | 5 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
88 | | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
89 o | 4 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
90 | | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
91 | o 3 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
92 | | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
93 | o 2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
94 |/ |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
95 o 1 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
96 | |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
97 o 0 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
98 |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
99 |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
100 check that "hg outgoing" really does the right thing |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
101 |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
102 sanity check of outgoing: expect revs 4 5 6 7 8 |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
103 |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
104 $ hg clone -r3 . ../repo2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
105 adding changesets |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
106 adding manifests |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
107 adding file changes |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
108 added 4 changesets with 4 changes to 1 files |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
109 updating to branch default |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
110 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
111 |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
112 this should (and does) report 5 outgoing revisions: 4 5 6 7 8 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
113 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
114 $ hg outgoing --template "{rev}\n" ../repo2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
115 comparing with ../repo2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
116 searching for changes |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
117 4 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
118 5 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
119 6 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
120 7 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
121 8 |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
122 |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
123 test bundle (destination repo): expect 5 revisions |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
124 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
125 this should bundle the same 5 revisions that outgoing reported, but it |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
126 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
127 actually bundles 7 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
128 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
129 $ hg bundle foo.bundle ../repo2 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
130 searching for changes |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
131 5 changesets found |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
132 |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
133 test bundle (base revision): expect 5 revisions |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
134 |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
135 this should (and does) give exactly the same result as bundle |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
136 |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
137 with a destination repo... i.e. it's wrong too |
9821
7d2e9121ef4f
bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
138 |
11873
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
139 $ hg bundle --base 3 foo.bundle |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
140 5 changesets found |
0a0b2872b0de
tests: unify test-bundle-vs-outgoing
Martin Geisler <mg@lazybytes.net>
parents:
9821
diff
changeset
|
141 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
142 $ cd .. |