facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

Fix lots of exception-related problems.

Browse Source 
These have been around since the Big Code Split.
This commit is contained in:
Bryan O'Sullivan 2005-09-14 15:41:22 -07:00
parent 75da334110
commit d5a9cb0366
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mercurial/httprepo.py
View File

@ -5,9 +5,10 @@
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
import urllib, urllib2, urlparse, os, zlib
from node import *
from remoterepo import *
from demandload import *
demandload(globals(), "hg os urllib urllib2 urlparse zlib")
class httprepository(remoterepository):
def __init__(self, ui, path):
@ -76,14 +77,14 @@ class httprepository(remoterepository):
if not proto.startswith('application/mercurial') and \
not proto.startswith('text/plain') and \
not proto.startswith('application/hg-changegroup'):
raise RepoError("'%s' does not appear to be an hg repository"
% self.url)
raise hg.RepoError("'%s' does not appear to be an hg repository" %
self.url)
if proto.startswith('application/mercurial'):
version = proto[22:]
if float(version) > 0.1:
raise RepoError("'%s' uses newer protocol %s" %
(self.url, version))
raise hg.RepoError("'%s' uses newer protocol %s" %
(self.url, version))
return resp

15
mercurial/sshrepo.py
View File

@ -5,9 +5,10 @@
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
import os, re, select
from node import *
from remoterepo import *
from demandload import *
demandload(globals(), "hg os re select")
class sshrepository(remoterepository):
def __init__(self, ui, path):
@ -16,7 +17,7 @@ class sshrepository(remoterepository):
m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', path)
if not m:
raise RepoError("couldn't parse destination %s" % path)
raise hg.RepoError("couldn't parse destination %s" % path)
self.user = m.group(2)
self.host = m.group(3)
@ -71,7 +72,7 @@ class sshrepository(remoterepository):
try:
l = int(l)
except:
raise RepoError("unexpected response '%s'" % l)
raise hg.RepoError("unexpected response '%s'" % l)
return r.read(l)
def lock(self):
@ -86,7 +87,7 @@ class sshrepository(remoterepository):
try:
return map(bin, d[:-1].split(" "))
except:
raise RepoError("unexpected response '%s'" % (d[:400] + "..."))
raise hg.RepoError("unexpected response '%s'" % (d[:400] + "..."))
def branches(self, nodes):
n = " ".join(map(hex, nodes))
@ -95,7 +96,7 @@ class sshrepository(remoterepository):
br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ]
return br
except:
raise RepoError("unexpected response '%s'" % (d[:400] + "..."))
raise hg.RepoError("unexpected response '%s'" % (d[:400] + "..."))
def between(self, pairs):
n = "\n".join(["-".join(map(hex, p)) for p in pairs])
@ -104,7 +105,7 @@ class sshrepository(remoterepository):
p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ]
return p
except:
raise RepoError("unexpected response '%s'" % (d[:400] + "..."))
raise hg.RepoError("unexpected response '%s'" % (d[:400] + "..."))
def changegroup(self, nodes):
n = " ".join(map(hex, nodes))
@ -114,7 +115,7 @@ class sshrepository(remoterepository):
def addchangegroup(self, cg):
d = self.call("addchangegroup")
if d:
raise RepoError("push refused: %s", d)
raise hg.RepoError("push refused: %s", d)
while 1:
d = cg.read(4096)