| indygreg | |
| Alphare |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/localrepo.py (2 lines) | |||
| M | mercurial/revlog.py (2 lines) | |||
| M | mercurial/revset.py (2 lines) | |||
| M | mercurial/scmutil.py (2 lines) | |||
| M | mercurial/templatefuncs.py (5 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | joerg.sonnenberger | ||
| Closed | joerg.sonnenberger |
| self.local() | self.local() | ||||
| and changeid in self.unfiltered().dirstate.parents() | and changeid in self.unfiltered().dirstate.parents() | ||||
| ): | ): | ||||
| msg = _(b"working directory has unknown parent '%s'!") | msg = _(b"working directory has unknown parent '%s'!") | ||||
| raise error.Abort(msg % short(changeid)) | raise error.Abort(msg % short(changeid)) | ||||
| changeid = hex(changeid) # for the error message | changeid = hex(changeid) # for the error message | ||||
| raise | raise | ||||
| elif len(changeid) == 40: | elif len(changeid) == 2 * self.nodeconstants.nodelen: | ||||
| node = bin(changeid) | node = bin(changeid) | ||||
| rev = self.changelog.rev(node) | rev = self.changelog.rev(node) | ||||
| else: | else: | ||||
| raise error.ProgrammingError( | raise error.ProgrammingError( | ||||
| b"unsupported changeid '%s' of type %s" | b"unsupported changeid '%s' of type %s" | ||||
| % (changeid, pycompat.bytestr(type(changeid))) | % (changeid, pycompat.bytestr(type(changeid))) | ||||
| ) | ) | ||||
| raise ValueError | raise ValueError | ||||
| if rev < 0: | if rev < 0: | ||||
| rev = len(self) + rev | rev = len(self) + rev | ||||
| if rev < 0 or rev >= len(self): | if rev < 0 or rev >= len(self): | ||||
| raise ValueError | raise ValueError | ||||
| return self.node(rev) | return self.node(rev) | ||||
| except (ValueError, OverflowError): | except (ValueError, OverflowError): | ||||
| pass | pass | ||||
| if len(id) == 40: | if len(id) == 2 * self.nodeconstants.nodelen: | ||||
| try: | try: | ||||
| # a full hex nodeid? | # a full hex nodeid? | ||||
| node = bin(id) | node = bin(id) | ||||
| self.rev(node) | self.rev(node) | ||||
| return node | return node | ||||
| except (TypeError, error.LookupError): | except (TypeError, error.LookupError): | ||||
| pass | pass | ||||
| names -= {nullrev} | names -= {nullrev} | ||||
| return subset & names | return subset & names | ||||
| def _node(repo, n): | def _node(repo, n): | ||||
| """process a node input""" | """process a node input""" | ||||
| rn = None | rn = None | ||||
| if len(n) == 40: | if len(n) == 2 * repo.nodeconstants.nodelen: | ||||
| try: | try: | ||||
| rn = repo.changelog.rev(bin(n)) | rn = repo.changelog.rev(bin(n)) | ||||
| except error.WdirUnsupported: | except error.WdirUnsupported: | ||||
| rn = wdirrev | rn = wdirrev | ||||
| except (LookupError, TypeError): | except (LookupError, TypeError): | ||||
| rn = None | rn = None | ||||
| else: | else: | ||||
| try: | try: | ||||
| if r < 0 or r >= l and r != wdirrev: | if r < 0 or r >= l and r != wdirrev: | ||||
| raise ValueError | raise ValueError | ||||
| return repo[r] | return repo[r] | ||||
| except error.FilteredIndexError: | except error.FilteredIndexError: | ||||
| raise | raise | ||||
| except (ValueError, OverflowError, IndexError): | except (ValueError, OverflowError, IndexError): | ||||
| pass | pass | ||||
| if len(symbol) == 40: | if len(symbol) == 2 * repo.nodeconstants.nodelen: | ||||
| try: | try: | ||||
| node = bin(symbol) | node = bin(symbol) | ||||
| rev = repo.changelog.rev(node) | rev = repo.changelog.rev(node) | ||||
| return repo[rev] | return repo[rev] | ||||
| except error.FilteredLookupError: | except error.FilteredLookupError: | ||||
| raise | raise | ||||
| except (TypeError, LookupError): | except (TypeError, LookupError): | ||||
| pass | pass | ||||
| context, | context, | ||||
| mapping, | mapping, | ||||
| args[1], | args[1], | ||||
| # i18n: "shortest" is a keyword | # i18n: "shortest" is a keyword | ||||
| _(b"shortest() expects an integer minlength"), | _(b"shortest() expects an integer minlength"), | ||||
| ) | ) | ||||
| repo = context.resource(mapping, b'repo') | repo = context.resource(mapping, b'repo') | ||||
| if len(hexnode) > 40: | hexnodelen = 2 * repo.nodeconstants.nodelen | ||||
| if len(hexnode) > hexnodelen: | |||||
| return hexnode | return hexnode | ||||
| elif len(hexnode) == 40: | elif len(hexnode) == hexnodelen: | ||||
| try: | try: | ||||
| node = bin(hexnode) | node = bin(hexnode) | ||||
| except TypeError: | except TypeError: | ||||
| return hexnode | return hexnode | ||||
| else: | else: | ||||
| try: | try: | ||||
| node = scmutil.resolvehexnodeidprefix(repo, hexnode) | node = scmutil.resolvehexnodeidprefix(repo, hexnode) | ||||
| except error.WdirUnsupported: | except error.WdirUnsupported: | ||||