Mercurial > hg
annotate tests/test-abort-checkin.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 | f2719b387380 |
children | e955549cd045 |
rev | line source |
---|---|
11848
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
1 $ cat > abortcommit.py <<EOF |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
2 > from mercurial import util |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
3 > def hook(**args): |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
4 > raise util.Abort("no commits allowed") |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
5 > def reposetup(ui, repo): |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
6 > repo.ui.setconfig("hooks", "pretxncommit.nocommits", hook) |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
7 > EOF |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
8 $ abspath=`pwd`/abortcommit.py |
4140
193e0f8d9a47
test-abort-checkin: use a hook to abort the commit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2990
diff
changeset
|
9 |
11848
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
10 $ echo "[extensions]" >> $HGRCPATH |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
11 $ echo "mq=" >> $HGRCPATH |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
12 $ echo "abortcommit = $abspath" >> $HGRCPATH |
4140
193e0f8d9a47
test-abort-checkin: use a hook to abort the commit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2990
diff
changeset
|
13 |
11848
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
14 $ hg init foo |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
15 $ cd foo |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
16 $ echo foo > foo |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
17 $ hg add foo |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
18 |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
19 mq may keep a reference to the repository so __del__ will not be |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
20 called and .hg/journal.dirstate will not be deleted: |
2726
6bd351194a96
Add test mq keeping a reference to localrepo which can't remove journal on exit.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
21 |
11848
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
22 $ hg ci -m foo |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
23 error: pretxncommit.nocommits hook failed: no commits allowed |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
24 transaction abort! |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
25 rollback completed |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
26 abort: no commits allowed |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11848
diff
changeset
|
27 [255] |
11848
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
28 $ hg ci -m foo |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
29 error: pretxncommit.nocommits hook failed: no commits allowed |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
30 transaction abort! |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
31 rollback completed |
f54ff49393fb
tests: unify test-abort-checkin
Martin Geisler <mg@lazybytes.net>
parents:
4140
diff
changeset
|
32 abort: no commits allowed |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11848
diff
changeset
|
33 [255] |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12327
diff
changeset
|
34 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12327
diff
changeset
|
35 $ cd .. |