Mercurial > public > mercurial-scm > hg
diff mercurial/templatekw.py @ 41728:36b62a522814
templatekw: make negrev return empty for wdir() and nullrev
I considered just returning the same output that {rev} returns here,
but {rev} also returns essentially gibberish: either an INT_MAX-kind
of variable for wdir() or -1 for null. Since these are numbers that
are intended to be used for calculations, and since the numbers for
wdir() and -1 are not really very helpful for calculation (and worse,
when used as a revision number -1 is equal to unhidden tip), I figured
the most reasonable thing to do here is to just return nothing for
negrev.
This could potentially break scripts that are expecting to parse a
nonempty integer out of a {negrev}, but that seems like a very remote
concern at this juncture.
author | Jordi Guti?rrez Hermoso <jordigh@octave.org> |
---|---|
date | Mon, 18 Feb 2019 23:43:40 -0500 |
parents | 37b33c34bf4f |
children | 52d4cb162902 |
line wrap: on
line diff
--- a/mercurial/templatekw.py Mon Feb 18 18:44:21 2019 -0500 +++ b/mercurial/templatekw.py Mon Feb 18 23:43:40 2019 -0500 @@ -559,8 +559,11 @@ """Integer. The repository-local changeset negative revision number, which counts in the opposite direction.""" ctx = context.resource(mapping, 'ctx') + rev = ctx.rev() + if rev is None or rev < 0: # wdir() or nullrev? + return None repo = context.resource(mapping, 'repo') - return scmutil.intrev(ctx) - len(repo) + return rev - len(repo) @templatekeyword('node', requires={'ctx'}) def shownode(context, mapping):