view tests/fixtures/siblingbranchfix.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 41c333473dda
children
line wrap: on
line source

SVN-fs-dump-format-version: 2

UUID: 380991ed-036e-45db-832e-7a8ca661c4f0

Revision-number: 0
Prop-content-length: 56
Content-length: 56

K 8
svn:date
V 27
2009-09-19T07:20:51.801386Z
PROPS-END

Revision-number: 1
Prop-content-length: 100
Content-length: 100

K 7
svn:log
V 3
btt
K 10
svn:author
V 3
djc
K 8
svn:date
V 27
2009-09-19T07:20:52.057610Z
PROPS-END

Node-path: branches
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Node-path: tags
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Node-path: trunk
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Revision-number: 2
Prop-content-length: 106
Content-length: 106

K 7
svn:log
V 9
Add file.
K 10
svn:author
V 3
djc
K 8
svn:date
V 27
2009-09-19T07:20:53.056417Z
PROPS-END

Node-path: trunk/a
Node-kind: file
Node-action: add
Prop-content-length: 10
Text-content-length: 2
Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
Content-length: 12

PROPS-END
a


Revision-number: 3
Prop-content-length: 122
Content-length: 122

K 7
svn:log
V 24
Branch to repo root dir.
K 10
svn:author
V 3
djc
K 8
svn:date
V 27
2009-09-19T07:20:56.043593Z
PROPS-END

Node-path: wrongbranch
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 2
Node-copyfrom-path: trunk


Revision-number: 4
Prop-content-length: 138
Content-length: 138

K 7
svn:log
V 40
Move branch to correct branches location
K 10
svn:author
V 3
djc
K 8
svn:date
V 27
2009-09-19T07:20:59.045512Z
PROPS-END

Node-path: branches/wrongbranch
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 3
Node-copyfrom-path: wrongbranch


Node-path: wrongbranch
Node-action: delete