[hg-import bug] operation not supported over http

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:
> Aaron Bentley wrote:
>>> I'm getting an error from the hg-import plugin on non-hg branches.
>>>
>>> $ bzr pull --remember http://michael.ellerman.id.au/bzr/plugins/shelf
>>> bzr: ERROR: mercurial.util.Abort: operation not supported over http
>>>   at /usr/local/lib/python2.4/site-packages/mercurial/httprepo.py line 71
>>>   in lock
>>>
>>> It appears that the plugin breaks find-repo, which means that branches
>>> in shared repositories don't work (unless they're in the repo root).
>>>
>>> Aaron
> 
> 
> It seems like the plugin needs to trap the Abort exception. It seems
> like we may be locking too strongly for 'lock_read()'. Probably
> lock_read() should not call 'lock()' at all.

That's probably so, if we want to support Hg over http properly.  But I
think we should not have gotten here.  I think HgDirFormat should throw
NotBranchError in probe_transport, if there's no .hg directory.

So here's a patch that fixes it for now.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFElJU30F+nu1YWqI0RAqNmAJ9I24umFV1JU7N3zj4lgp2RwEDnjgCfaNti
pjg90kXntBW7EKHRyWWmmXw=
=gCm5
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: hg-import-fix.patch
Type: text/x-patch
Size: 1100 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060617/5d778bd9/attachment.bin