Mercurial > hg > mutable-history
changeset 340:37b543215187 stable
obsolete: better lookuperror handling during convert
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Fri, 06 Jul 2012 16:32:53 +0200 |
parents | 3853061e7fea |
children | 7653f80fd7a4 |
files | hgext/obsolete.py |
diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/obsolete.py +++ b/hgext/obsolete.py @@ -605,15 +605,16 @@ del oldmark['reason'] # unused until then oldobject = str(oldmark.pop('object')) oldsubjects = [str(s) for s in oldmark.pop('subjects')] + LOOKUP_ERRORS = (error.RepoLookupError, error.LookupError) if len(oldobject) != 40: try: oldobject = repo[oldobject].node() - except error.RepoLookupError: + except LOOKUP_ERRORS: pass if any(len(s) != 40 for s in oldsubjects): try: oldsubjects = [repo[s].node() for s in oldsubjects] - except error.RepoLookupError: + except LOOKUP_ERRORS: pass oldmark['date'] = '%i %i' % tuple(oldmark['date'])