Mercurial > hg
annotate tests/test-rebuildstate.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 | ddc17eaf0f1b |
rev | line source |
---|---|
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
1 basic test for hg debugrebuildstate |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
2 |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
3 $ hg init repo |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
4 $ cd repo |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
6 $ touch foo bar |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
7 $ hg ci -Am 'add foo bar' |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
8 adding bar |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
9 adding foo |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
11 $ touch baz |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
12 $ hg add baz |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
13 $ hg rm bar |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
14 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
15 $ hg debugrebuildstate |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
16 |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
17 state dump after |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
18 |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
19 $ hg debugstate --nodates | sort |
15440
9ab2b3b730ee
windows: use umask 022 in debugstate output
Mads Kiilerich <mads@kiilerich.com>
parents:
12121
diff
changeset
|
20 n 644 -1 bar |
9ab2b3b730ee
windows: use umask 022 in debugstate output
Mads Kiilerich <mads@kiilerich.com>
parents:
12121
diff
changeset
|
21 n 644 -1 foo |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
22 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
23 status |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
24 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
25 $ hg st -A |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
26 ! bar |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
27 ? baz |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
28 C foo |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
29 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15440
diff
changeset
|
30 $ cd .. |