This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5107

localrepo: ensure we properly %-format int in exception throw
ClosedPublic

Authored by durin42 on Oct 14 2018, 11:07 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa2ebdca4d10e: localrepo: ensure we properly %-format int in exception throw
Summary

I'm not thrilled with this, but it'll do.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Oct 14 2018, 11:07 AM
yuja added a subscriber: yuja.Oct 15 2018, 11:18 AM
    raise error.FilteredRepoLookupError(_("filtered revision '%s'")
                                        % pycompat.bytestr(changeid))
except (IndexError, LookupError):

+ if isinstance(changeid, int):
+ raise error.RepoLookupError(
+ _("unknown revision '%d'") % changeid)

raise error.RepoLookupError(_("unknown revision '%s'") % changeid)

Use pycompat.bytestr(changeid)? It's worked around as such just a few lines
above.

durin42 retitled this revision from localrepo: ensure we properly %-format ints vs strings in exception throw to localrepo: ensure we properly %-format int in exception throw.Oct 16 2018, 1:12 PM
durin42 updated this revision to Diff 12173.
Closed by commit rHGa2ebdca4d10e: localrepo: ensure we properly %-format int in exception throw (authored by durin42). · Explain WhyOct 18 2018, 9:11 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (3 lines)

Diff 12173

mercurial/localrepo.py

(changeid, type(changeid))) (changeid, type(changeid)))
return context.changectx(self, rev, node) return context.changectx(self, rev, node)
except (error.FilteredIndexError, error.FilteredLookupError): except (error.FilteredIndexError, error.FilteredLookupError):
raise error.FilteredRepoLookupError(_("filtered revision '%s'") raise error.FilteredRepoLookupError(_("filtered revision '%s'")
% pycompat.bytestr(changeid)) % pycompat.bytestr(changeid))
except (IndexError, LookupError): except (IndexError, LookupError):
raise error.RepoLookupError(_("unknown revision '%s'") % changeid) raise error.RepoLookupError(
_("unknown revision '%s'") % pycompat.bytestr(changeid))
except error.WdirUnsupported: except error.WdirUnsupported:
return context.workingctx(self) return context.workingctx(self)
def __contains__(self, changeid): def __contains__(self, changeid):
"""True if the given changeid exists """True if the given changeid exists
error.AmbiguousPrefixLookupError is raised if an ambiguous node error.AmbiguousPrefixLookupError is raised if an ambiguous node
specified. specified.