Mercurial > hgsubversion
view tests/fixtures/corrupt.svndump @ 1101:4a92eb1484ba
layouts: fix crash when importing hgsubversion itself (issue #402)
Mercurial extensions are a bit weird: they aren't normally in
sys.path, so you can't assume that "import hgsubversion" works.
Luckily, Mercurial sneaks a little treat into sys.modules so that
"import hgext_hgsubversion" does work. In fact, to get things working
*as a Mercurial extension*, all that's needed is that trivial change
to two import lines, in layouts/detect.py and layouts/standard.py.
Unfortunately, hgsubversion is also imported as a Python module, in
its own test suite. In that context, there is no "hgext_" trick --
unless we do it in ourselves, which I've done in TestBase.setUp().
That would work fine ... except that test_util imports from
hgsubversion, which ends up importing hgsubversion.layouts.{detect,standard},
which want the "hgext_" trick to work. But it hasn't been done yet
when we're still importing; it doesn't happen until setUp() runs.
So make those two imports happen late, in the functions that need them.
Incidentally, this is only necessary to support Mercurial <= 2.7.
Mercurial got a bit smarter in 2.8:
http://selenic.com/repo/hg/rev/621a26eb3a99
author | Greg Ward <greg@gerg.ca> |
---|---|
date | Thu, 02 Jan 2014 21:53:39 -0500 |
parents | 3bfb7e985c47 |
children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 00000000-0000-0000-0000-000000000000 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-11-30T15:10:25.898546Z PROPS-END Revision-number: 1 Prop-content-length: 100 Content-length: 100 K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-11-30T15:16:01.077550Z K 7 svn:log V 0 PROPS-END Node-path: another-regular-file Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 0 Text-content-md5: d41d8cd98f00b204e9800998ecf8427e Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 Content-length: 10 PROPS-END Node-path: executable-file Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 11 Text-content-md5: 01839ba8c81c3b2c7486607e0c683e62 Text-content-sha1: 5e70f8a25fe8ad4ad971bfd3388c258b019268d4 Content-length: 21 PROPS-END Executable Node-path: missing-file Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 0 Text-content-md5: d41d8cd98f00b204e9800998ecf8427e Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 Content-length: 10 PROPS-END Node-path: regular-file Node-kind: file Node-action: add Prop-content-length: 33 Text-content-length: 18 Text-content-md5: adf66a0cec83e25644c63f3c3007ae7c Text-content-sha1: 047e6e482d0c9cb812f89d18a9f07a43caab76bb Content-length: 51 K 11 svn:special V 1 * PROPS-END link Bad contents. Node-path: symlink Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 1 Text-content-md5: 7fc56270e7a70fa81a5935b72eacbe29 Text-content-sha1: 6dcd4ce23d88e2ee9568ba546c007c63d9131c1b Content-length: 11 PROPS-END A