Patchwork [V3] templater: shorten pure integers

login
register
mail settings
Submitter Sean Farley
Date Feb. 21, 2014, 9:01 p.m.
Message ID <ab8f2e89302bd6687073.1393016511@laptop.local>
Download mbox | patch
Permalink /patch/3732/
State Accepted
Commit aa021ece4506f5e962c8d87ab58ab594a0105ced
Headers show

Comments

Sean Farley - Feb. 21, 2014, 9:01 p.m.
# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1392878773 21600
#      Thu Feb 20 00:46:13 2014 -0600
# Node ID ab8f2e89302bd66870738fe28ab190e5c435f652
# Parent  c1febc167d87a9f078707db9b8defa8fdf492fe9
templater: shorten pure integers

Originally, the addition of the 'shorten' template function in 9c6b86dd2ed2
would not consider pure integers for shortening. This patch considers two
simple cases: when the integer starts with zero (which is parsed by Mercurial
as a hash first) and when the integer is larger than the tip (obviously not a
rev).
Matt Mackall - Feb. 21, 2014, 9:34 p.m.
On Fri, 2014-02-21 at 15:01 -0600, Sean Farley wrote:
> # HG changeset patch
> # User Sean Farley <sean.michael.farley@gmail.com>
> # Date 1392878773 21600
> #      Thu Feb 20 00:46:13 2014 -0600
> # Node ID ab8f2e89302bd66870738fe28ab190e5c435f652
> # Parent  c1febc167d87a9f078707db9b8defa8fdf492fe9
> templater: shorten pure integers

Queued for default, thanks.

Patch

diff --git a/mercurial/templater.py b/mercurial/templater.py
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
@@ -414,11 +414,16 @@  def shortest(context, mapping, args):
                 # Fallback to the slow way.
                 if cl._partialmatch(test) is None:
                     return False
 
             try:
-                int(test)
+                i = int(test)
+                # if we are a pure int, then starting with zero will not be
+                # confused as a rev; or, obviously, if the int is larger than
+                # the value of the tip rev
+                if test[0] == '0' or i > len(cl):
+                    return True
                 return False
             except ValueError:
                 return True
         except error.RevlogError:
             return False