--- a/mercurial/sshrepo.py
+++ b/mercurial/sshrepo.py
@@ -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 @@ class sshrepository(remoterepository):
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 @@ class sshrepository(remoterepository):
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 @@ class sshrepository(remoterepository):
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 @@ class sshrepository(remoterepository):
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 @@ class sshrepository(remoterepository):
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 @@ class sshrepository(remoterepository):
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