--- a/hgext/convert/cvsps.py Tue May 11 20:21:25 2010 +0200
+++ b/hgext/convert/cvsps.py Tue May 11 20:22:37 2010 +0200
@@ -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/hgext/mq.py Tue May 11 20:21:25 2010 +0200
+++ b/hgext/mq.py Tue May 11 20:22:37 2010 +0200
@@ -2668,9 +2668,9 @@
m = []
a, u = len(q.applied), len(q.unapplied(repo))
if a:
- m.append(_("%d applied") % a)
+ m.append(ui.label(_("%d applied"), 'qseries.applied') % a)
if u:
- m.append(_("%d unapplied") % u)
+ m.append(ui.label(_("%d unapplied"), 'qseries.unapplied') % u)
if m:
ui.write("mq: %s\n" % ', '.join(m))
else:
--- a/mercurial/pure/mpatch.py Tue May 11 20:21:25 2010 +0200
+++ b/mercurial/pure/mpatch.py Tue May 11 20:22:37 2010 +0200
@@ -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