Control: reopen -1 Control: found 1.6-0.2 1.6-0.2 fixed the issue for repositories that don't follow the standard layout only. If you from a repository that follows the standard svn layout (i.e., with a trunk/ tags/ and branches/ directory) still fails:
# hg clone --traceback svn://localhost/celesteville
destination directory: celesteville
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/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/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/hgsubversion/svnrepo.py", line 81, in
wrapper
return fn(self, *args, **opts)
File "/usr/lib/python2.7/dist-packages/hgsubversion/svnrepo.py", line 104, in
pull
return wrappers.pull(self, remote, heads, force)
File "/usr/lib/python2.7/dist-packages/hgsubversion/wrappers.py", line 423,
in pull
tbdelta = meta.update_branch_tag_map_for_rev(r)
File "/usr/lib/python2.7/dist-packages/hgsubversion/svnmeta.py", line 441, in
update_branch_tag_map_for_rev
t_name = self.get_path_tag(p)
File "/usr/lib/python2.7/dist-packages/hgsubversion/svnmeta.py", line 259, in
get_path_tag
return self.layoutobj.get_path_tag(path, self.taglocations)
File "/usr/lib/python2.7/dist-packages/hgsubversion/svnmeta.py", line 249, in
taglocations
return self.layoutobj.taglocations(self.meta_data_dir)
File "/usr/lib/python2.7/dist-packages/hgsubversion/layouts/standard.py",
line 60, in taglocations
from hgext_hgsubversion import util
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 hgext_hgsubversion
abort: No module named hgext_hgsubversion!
This patch from upstream fixes it:
https://bitbucket.org/durin42/hgsubversion/commits/0f16e11b2c2bccb2f92d5f9a741d031eac344769?at=default
Cheers,
Javi
On Sat, Mar 22, 2014 at 03:21:25PM +0000, Debian Bug Tracking System wrote:
> Source: hgsubversion
> Source-Version: 1.6-0.2
>
> We believe that the bug you reported is fixed in the latest version of
> hgsubversion, which is due to be installed in the Debian FTP archive.
>
> A summary of the changes between this version and the previous one is
> attached.
>
> Thank you for reporting the bug, which will now be closed. If you
> have further comments please address them to [email protected],
> and the maintainer will reopen the bug report if appropriate.
>
> Debian distribution maintenance software
> pp.
> Javi Merino <[email protected]> (supplier of updated hgsubversion package)
>
> (This message was generated automatically at their request; if you
> believe that there is a problem with it please contact the archive
> administrators by mailing [email protected])
>
>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Format: 1.8
> Date: Sat, 22 Mar 2014 14:18:29 +0000
> Source: hgsubversion
> Binary: hgsubversion
> Architecture: source all
> Version: 1.6-0.2
> Distribution: unstable
> Urgency: medium
> Maintainer: Qijiang Fan <[email protected]>
> Changed-By: Javi Merino <[email protected]>
> Description:
> hgsubversion - Subversion client as Mercurial extension
> Closes: 742080
> Changes:
> hgsubversion (1.6-0.2) unstable; urgency=medium
> .
> * Non-maintainer upload.
> * Fix "some commands (like clone) fail" by installing hgsubversion
> in sys.path (Closes: #742080)
> Checksums-Sha1:
> 5f4146dca6e4af193c1a0019882423324c70a9b6 1910 hgsubversion_1.6-0.2.dsc
> 4289a3951173e40239e2472039391779f9bc123f 2692
> hgsubversion_1.6-0.2.debian.tar.xz
> 554cabb538a97261ff4b90eb30cd25268f9f7a41 70116 hgsubversion_1.6-0.2_all.deb
> Checksums-Sha256:
> 7883605e0ab7b346b8c704149aeecdeae1a8aa89068030e5d437329060e486d5 1910
> hgsubversion_1.6-0.2.dsc
> 0dd8b4cbd1130f9c21c48020339f1dcffe0e625431d8f892f7a78f94cec9de5b 2692
> hgsubversion_1.6-0.2.debian.tar.xz
> e30c55d0b8936d397d9bc5bed3d9951dad469f3ae9b77c86e38b6cf500417ded 70116
> hgsubversion_1.6-0.2_all.deb
> Files:
> 47d7c3e359f627d19922c12e91534de5 1910 vcs extra hgsubversion_1.6-0.2.dsc
> f8b14c2f60f6f6006779ad3d53e7e156 2692 vcs extra
> hgsubversion_1.6-0.2.debian.tar.xz
> cf545db2f5bfba029c85076c238d221a 70116 vcs extra hgsubversion_1.6-0.2_all.deb
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1
>
> iQIcBAEBCAAGBQJTLZxhAAoJEAe0hFJ2jTgkbFMQANtF89vIacM5CPNGEgD1ekMX
> UO4MqCHumNAucoyMbLNR6hPbdclnPvTeTeyQNUim6PI+M8nuvocvhvNzVElE1FEu
> tiIs5tOll9D64R7BFQtSYIKs9isNOu6KfF0vcmtj1NNFt8dxTerwQO96FWPP/w0+
> a8DV2JHfCqVC0uUPr+jOm7qUrTwkuoMQuaVNsyqNiNsy7ANU+595F7rbEa4d9vXZ
> xjYzFzS/hfLReHqZYSUuIx0WwTPPgXznj0BSnCxpczFoVpwLgEI7rbEvSWR+yO+n
> Oms0chUBVD0q+9VsoLz4RKoKCyT30C1vzaAjMOMCphtTk+M2YI72Hu15OiaVNWVE
> UIItU8vkSNtixue11NUwp7P09Lk1k123Z/6wrt9qxXie4Y2jARWhXt5OB7+iQ4JP
> bDLlVguPWE3Z5onNePhfvV9uiiCW1mDDcrZAN12atDyL+3psjRzdtuveIL2zpVa+
> NLp211uK54zUtzJ/ZjBqCGVY5ju1zm1O7H9Gg3rNkpUlQDqM86EiQZGhZDNiHQhg
> k1mXyXlfEsLMrZ4mnlteUif+1+hp1C6WkHsgUE0n142/GjxIl7bc0vbWmcGEdjJP
> f1iK/0HHTEBKKRpNrcj1dZ0t2gsVBIoL9eYI/ZpgA/pszGlUTJf2UdT16UZEXsMW
> p8mMYocAOJtaiCoYKFYe
> =RNB8
> -----END PGP SIGNATURE-----
> Date: Wed, 19 Mar 2014 00:07:44 +0000
> From: Javi Merino <[email protected]>
> To: Debian Bug Tracking System <[email protected]>
> Subject: hgsubversion: some commands (like clone) fail
> X-Mailer: reportbug 6.5.0
>
> 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:
>
signature.asc
Description: Digital signature
