Both callers were doing this, and resolvehexnodeidprefix() was also
working on the unfiltered repo, so it makes more sense to have it all
in one place.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/show.py (4 lines) | |||
| M | mercurial/scmutil.py (7 lines) | |||
| M | mercurial/templatefuncs.py (5 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Abandoned | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| The number of revisions in the repo is taken into account to prevent | The number of revisions in the repo is taken into account to prevent | ||||
| a numeric node prefix from conflicting with an integer revision number. | a numeric node prefix from conflicting with an integer revision number. | ||||
| If we fail to do this, a value of e.g. ``10023`` could mean either | If we fail to do this, a value of e.g. ``10023`` could mean either | ||||
| revision 10023 or node ``10023abc...``. | revision 10023 or node ``10023abc...``. | ||||
| """ | """ | ||||
| if not revs: | if not revs: | ||||
| return minlen | return minlen | ||||
| # don't use filtered repo because it's slow. see templater.shortest(). | |||||
| cl = repo.changelog | cl = repo.changelog | ||||
| return max(len(scmutil.shortesthexnodeidprefix(repo.unfiltered(), | return max(len(scmutil.shortesthexnodeidprefix(repo, hex(cl.node(r)), | ||||
| hex(cl.node(r)), | |||||
| minlen)) for r in revs) | minlen)) for r in revs) | ||||
| # Adjust the docstring of the show command so it shows all registered views. | # Adjust the docstring of the show command so it shows all registered views. | ||||
| # This is a bit hacky because it runs at the end of module load. When moved | # This is a bit hacky because it runs at the end of module load. When moved | ||||
| # into core or when another extension wants to provide a view, we'll need | # into core or when another extension wants to provide a view, we'll need | ||||
| # to do this more robustly. | # to do this more robustly. | ||||
| # TODO make this more robust. | # TODO make this more robust. | ||||
| def _updatedocstring(): | def _updatedocstring(): | ||||
| if ui.debugflag: | if ui.debugflag: | ||||
| hexfunc = hex | hexfunc = hex | ||||
| else: | else: | ||||
| hexfunc = short | hexfunc = short | ||||
| return '%d:%s' % (rev, hexfunc(node)) | return '%d:%s' % (rev, hexfunc(node)) | ||||
| def resolvehexnodeidprefix(repo, prefix): | def resolvehexnodeidprefix(repo, prefix): | ||||
| # Uses unfiltered repo because it's faster when prefix is ambiguous/ | # Uses unfiltered repo because it's faster when prefix is ambiguous/ | ||||
| # This matches the "shortest" template function. | # This matches the shortesthexnodeidprefix() function below. | ||||
| node = repo.unfiltered().changelog._partialmatch(prefix) | node = repo.unfiltered().changelog._partialmatch(prefix) | ||||
| if node is None: | if node is None: | ||||
| return | return | ||||
| repo.changelog.rev(node) # make sure node isn't filtered | repo.changelog.rev(node) # make sure node isn't filtered | ||||
| return node | return node | ||||
| def shortesthexnodeidprefix(repo, hexnode, minlength=1): | def shortesthexnodeidprefix(repo, hexnode, minlength=1): | ||||
| """Find the shortest unambiguous prefix that matches hexnode.""" | """Find the shortest unambiguous prefix that matches hexnode.""" | ||||
| return repo.changelog.shortest(hexnode, minlength) | # _partialmatch() of filtered changelog could take O(len(repo)) time, | ||||
| # which would be unacceptably slow. so we look for hash collision in | |||||
| # unfiltered space, which means some hashes may be slightly longer. | |||||
| return repo.unfiltered().changelog.shortest(hexnode, minlength) | |||||
| def isrevsymbol(repo, symbol): | def isrevsymbol(repo, symbol): | ||||
| """Checks if a symbol exists in the repo. | """Checks if a symbol exists in the repo. | ||||
| See revsymbol() for details. Raises error.LookupError if the symbol is an | See revsymbol() for details. Raises error.LookupError if the symbol is an | ||||
| ambiguous nodeid prefix. | ambiguous nodeid prefix. | ||||
| """ | """ | ||||
| try: | try: | ||||
| node = evalstring(context, mapping, args[0]) | node = evalstring(context, mapping, args[0]) | ||||
| minlength = 4 | minlength = 4 | ||||
| if len(args) > 1: | if len(args) > 1: | ||||
| minlength = evalinteger(context, mapping, args[1], | minlength = evalinteger(context, mapping, args[1], | ||||
| # i18n: "shortest" is a keyword | # i18n: "shortest" is a keyword | ||||
| _("shortest() expects an integer minlength")) | _("shortest() expects an integer minlength")) | ||||
| # _partialmatch() of filtered changelog could take O(len(repo)) time, | |||||
| # which would be unacceptably slow. so we look for hash collision in | |||||
| # unfiltered space, which means some hashes may be slightly longer. | |||||
| repo = context.resource(mapping, 'ctx')._repo | repo = context.resource(mapping, 'ctx')._repo | ||||
| return scmutil.shortesthexnodeidprefix(repo.unfiltered(), node, minlength) | return scmutil.shortesthexnodeidprefix(repo, node, minlength) | ||||
| @templatefunc('strip(text[, chars])') | @templatefunc('strip(text[, chars])') | ||||
| def strip(context, mapping, args): | def strip(context, mapping, args): | ||||
| """Strip characters from a string. By default, | """Strip characters from a string. By default, | ||||
| strips all leading and trailing whitespace.""" | strips all leading and trailing whitespace.""" | ||||
| if not (1 <= len(args) <= 2): | if not (1 <= len(args) <= 2): | ||||
| # i18n: "strip" is a keyword | # i18n: "strip" is a keyword | ||||
| raise error.ParseError(_("strip expects one or two arguments")) | raise error.ParseError(_("strip expects one or two arguments")) | ||||