--- a/hgext/convert/cvsps.py Fri May 07 16:51:45 2010 -0400
+++ b/hgext/convert/cvsps.py Fri May 07 16:59:00 2010 -0500
@@ -239,12 +239,12 @@
continue
match = re_01.match(line)
if match:
- raise Exception(match.group(1))
+ raise logerror(match.group(1))
match = re_02.match(line)
if match:
- raise Exception(match.group(2))
+ raise logerror(match.group(2))
if re_03.match(line):
- raise Exception(line)
+ raise logerror(line)
elif state == 1:
# expect 'Working file' (only when using log instead of rlog)
--- a/mercurial/pure/mpatch.py Fri May 07 16:51:45 2010 -0400
+++ b/mercurial/pure/mpatch.py Fri May 07 16:59:00 2010 -0500
@@ -112,7 +112,7 @@
outlen += length
if bin != binend:
- raise Exception("patch cannot be decoded")
+ raise ValueError("patch cannot be decoded")
outlen += orig - last
return outlen