--- Begin Message ---
Package: hgsubversion
Version: 1.6-0.1
Severity: important
Tags: patch
Some commands fail with hgsubversion 1.6. For example clone:
$ hg --traceback --config extensions.hgsubversion= clone svn://127.0.0.1/babar
destination directory: babar
Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 134, in
_runcatch
return _dispatch(req)
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 806, in
_dispatch
cmdpats, cmdoptions)
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 586, in
runcommand
ret = _runcommand(ui, options, cmd, d)
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 897, in
_runcommand
return checkargs()
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 868, in
checkargs
return cmdfunc()
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 803, in
<lambda>
d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 511, in check
return func(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/mercurial/extensions.py", line 151, in
wrap
util.checksignature(origfn), *args, **kwargs)
File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 511, in check
return func(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/hgext/hgsubversion/wrappers.py", line
596, in clone
orig(ui, source, dest, **opts)
File "/usr/lib/python2.7/dist-packages/mercurial/util.py", line 511, in check
return func(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/mercurial/commands.py", line 1310, in
clone
branch=opts.get('branch'))
File "/usr/lib/python2.7/dist-packages/mercurial/extensions.py", line 196, in
wrap
return wrapper(origfn, *args, **kwargs)
File "/usr/lib/python2.7/dist-packages/hgext/hgsubversion/wrappers.py", line
585, in hgclonewrapper
data['srcrepo'], data['dstrepo'] = orig(ui, *args, **opts)
File "/usr/lib/python2.7/dist-packages/mercurial/hg.py", line 374, in clone
destpeer.local().clone(srcpeer, heads=revs, stream=stream)
File "/usr/lib/python2.7/dist-packages/mercurial/localrepo.py", line 2402, in
clone
return self.pull(remote, heads)
File "/usr/lib/python2.7/dist-packages/hgext/hgsubversion/svnrepo.py", line
81, in wrapper
return fn(self, *args, **opts)
File "/usr/lib/python2.7/dist-packages/hgext/hgsubversion/svnrepo.py", line
104, in pull
return wrappers.pull(self, remote, heads, force)
File "/usr/lib/python2.7/dist-packages/hgext/hgsubversion/wrappers.py", line
370, in pull
repo.ui)
File "/usr/lib/python2.7/dist-packages/hgext/hgsubversion/layouts/detect.py",
line 31, in layout_from_subversion
from hgsubversion import svnwrap
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 111,
in _demandimport
return _hgextimport(_import, name, globals, locals, fromlist, level)
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 43,
in _hgextimport
return importfunc(name, globals, *args)
ImportError: No module named hgsubversion
abort: No module named hgsubversion!
The attached patch fixes it for me.
Cheers,
Javi
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.13-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages hgsubversion depends on:
ii mercurial 2.9.1-1
ii python 2.7.5-5
ii python-subvertpy 0.9.1-5
ii subversion 1.8.8-1
hgsubversion recommends no packages.
hgsubversion suggests no packages.
-- no debconf information
# HG changeset patch
# Parent 7d47a0f731354505ed9ae8d60d2a6996e8c3294f
diff --git a/hgsubversion/layouts/detect.py b/hgsubversion/layouts/detect.py
--- a/hgsubversion/layouts/detect.py
+++ b/hgsubversion/layouts/detect.py
@@ -26,7 +26,7 @@ def layout_from_subversion(svn, revision
"""
# import late to avoid trouble when running the test suite
try:
- from hgext_hgsubversion import svnwrap
+ from hgext.hgsubversion import svnwrap
except ImportError:
from hgsubversion import svnwrap
diff --git a/hgsubversion/layouts/standard.py b/hgsubversion/layouts/standard.py
--- a/hgsubversion/layouts/standard.py
+++ b/hgsubversion/layouts/standard.py
@@ -57,7 +57,7 @@ class StandardLayout(base.BaseLayout):
def taglocations(self, meta_data_dir):
# import late to avoid trouble when running the test suite
- from hgext_hgsubversion import util
+ from hgext.hgsubversion import util
if self._tag_locations is None:
--- End Message ---
