--- a/mercurial/bundlerepo.py Sat Apr 30 16:33:47 2011 +0200
+++ b/mercurial/bundlerepo.py Sat Apr 30 09:43:20 2011 -0700
@@ -15,7 +15,7 @@
from i18n import _
import os, struct, tempfile, shutil
import changegroup, util, mdiff, discovery
-import localrepo, changelog, manifest, filelog, revlog, error, url
+import localrepo, changelog, manifest, filelog, revlog, error
class bundlerevlog(revlog.revlog):
def __init__(self, opener, indexfile, bundle,
@@ -274,7 +274,7 @@
cwd = os.path.join(cwd,'')
if parentpath.startswith(cwd):
parentpath = parentpath[len(cwd):]
- u = url.url(path)
+ u = util.url(path)
path = u.localpath()
if u.scheme == 'bundle':
s = path.split("+", 1)