# HG changeset patch # User Matt Mackall # Date 1273269540 18000 # Node ID 2114e44b08f64ab2913fbe3fbbea279b9997a632 # Parent d061ef1d781cf30ab4781335627ce693638d684d clean up remaining generic exceptions diff -r d061ef1d781c -r 2114e44b08f6 hgext/convert/cvsps.py --- 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) diff -r d061ef1d781c -r 2114e44b08f6 mercurial/pure/mpatch.py --- 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