--- a/mercurial/httprepo.py Wed Aug 15 16:09:50 2007 -0500
+++ b/mercurial/httprepo.py Wed Aug 15 16:10:24 2007 -0500
@@ -9,7 +9,7 @@
from node import *
from remoterepo import *
from i18n import _
-import hg, os, urllib, urllib2, urlparse, zlib, util, httplib
+import repo, os, urllib, urllib2, urlparse, zlib, util, httplib
import errno, keepalive, tempfile, socket, changegroup
class passwordmgr(urllib2.HTTPPasswordMgrWithDefaultRealm):
@@ -277,7 +277,7 @@
if self.caps is None:
try:
self.caps = self.do_read('capabilities').split()
- except hg.RepoError:
+ except repo.RepoError:
self.caps = ()
self.ui.debug(_('capabilities: %s\n') %
(' '.join(self.caps or ['none'])))
@@ -329,7 +329,7 @@
proto.startswith('text/plain') or
proto.startswith('application/hg-changegroup')):
self.ui.debug(_("Requested URL: '%s'\n") % cu)
- raise hg.RepoError(_("'%s' does not appear to be an hg repository")
+ raise repo.RepoError(_("'%s' does not appear to be an hg repository")
% self._url)
if proto.startswith('application/mercurial-'):
@@ -337,10 +337,10 @@
version = proto.split('-', 1)[1]
version_info = tuple([int(n) for n in version.split('.')])
except ValueError:
- raise hg.RepoError(_("'%s' sent a broken Content-type "
+ raise repo.RepoError(_("'%s' sent a broken Content-type "
"header (%s)") % (self._url, proto))
if version_info > (0, 1):
- raise hg.RepoError(_("'%s' uses newer protocol %s") %
+ raise repo.RepoError(_("'%s' uses newer protocol %s") %
(self._url, version))
return resp
@@ -358,7 +358,7 @@
success, data = d[:-1].split(' ', 1)
if int(success):
return bin(data)
- raise hg.RepoError(data)
+ raise repo.RepoError(data)
def heads(self):
d = self.do_read("heads")
--- a/mercurial/sshrepo.py Wed Aug 15 16:09:50 2007 -0500
+++ b/mercurial/sshrepo.py Wed Aug 15 16:10:24 2007 -0500
@@ -8,7 +8,7 @@
from node import *
from remoterepo import *
from i18n import _
-import hg, os, re, stat, util
+import repo, os, re, stat, util
class sshrepository(remoterepository):
def __init__(self, ui, path, create=0):
@@ -17,7 +17,7 @@
m = re.match(r'^ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?$', path)
if not m:
- self.raise_(hg.RepoError(_("couldn't parse location %s") % path))
+ self.raise_(repo.RepoError(_("couldn't parse location %s") % path))
self.user = m.group(2)
self.host = m.group(3)
@@ -37,7 +37,7 @@
ui.note('running %s\n' % cmd)
res = os.system(cmd)
if res != 0:
- self.raise_(hg.RepoError(_("could not create remote repo")))
+ self.raise_(repo.RepoError(_("could not create remote repo")))
self.validate_repo(ui, sshcmd, args, remotecmd)
@@ -69,7 +69,7 @@
lines.append(l)
max_noise -= 1
else:
- self.raise_(hg.RepoError(_("no suitable response from remote hg")))
+ self.raise_(repo.RepoError(_("no suitable response from remote hg")))
self.capabilities = ()
lines.reverse()
@@ -136,7 +136,7 @@
if int(success):
return bin(data)
else:
- self.raise_(hg.RepoError(data))
+ self.raise_(repo.RepoError(data))
def heads(self):
d = self.call("heads")
@@ -175,7 +175,7 @@
def unbundle(self, cg, heads, source):
d = self.call("unbundle", heads=' '.join(map(hex, heads)))
if d:
- self.raise_(hg.RepoError(_("push refused: %s") % d))
+ self.raise_(repo.RepoError(_("push refused: %s") % d))
while 1:
d = cg.read(4096)
@@ -201,7 +201,7 @@
def addchangegroup(self, cg, source, url):
d = self.call("addchangegroup")
if d:
- self.raise_(hg.RepoError(_("push refused: %s") % d))
+ self.raise_(repo.RepoError(_("push refused: %s") % d))
while 1:
d = cg.read(4096)
if not d: break