Mercurial > hg
diff mercurial/commands.py @ 1543:93a9298367e0
Merge with Thomas Waldmann
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 14 Nov 2005 15:09:34 +0100 |
parents | 482b4efdf013 bf4e7ef08741 |
children | d69070c2547a |
line wrap: on
line diff
--- a/mercurial/commands.py Sun Nov 13 16:25:45 2005 +0100 +++ b/mercurial/commands.py Mon Nov 14 15:09:34 2005 +0100 @@ -644,7 +644,7 @@ n = mf[abs] except (hg.RepoError, KeyError): try: - n = r.lookup(rev) + n = r.lookup(rev) # XXX rev undefined! except KeyError, inst: raise util.Abort(_('cannot find file %s in rev %s'), rel, rev) else: @@ -1016,7 +1016,7 @@ change = repo.changelog.read(n) m = repo.manifest.read(change[0]) n = m[relpath(repo, [file])[0]] - except hg.RepoError, KeyError: + except (hg.RepoError, KeyError): n = r.lookup(rev) else: n = r.tip() @@ -2470,7 +2470,7 @@ external = [] for x in u.extensions(): - def on_exception(Exception, inst): + def on_exception(Exception, inst): # XXX Exception is a builtin name!? u.warn(_("*** failed to import extension %s\n") % x[1]) u.warn("%s\n" % inst) if "--traceback" in sys.argv[1:]: