Patchwork [5,of,5] templatekw: add {changes}, {distance} and {tag} to the {latesttag} keyword

login
register
mail settings
Submitter Matt Harbison
Date Oct. 4, 2015, 9:47 p.m.
Message ID <dcfd95985b4e3aeb4d3a.1443995258@Envy>
Download mbox | patch
Permalink /patch/10793/
State Superseded
Commit 8a732c322ca782424bdad45936b48ee65f20ae78
Headers show

Comments

Matt Harbison - Oct. 4, 2015, 9:47 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1440473417 14400
#      Mon Aug 24 23:30:17 2015 -0400
# Node ID dcfd95985b4e3aeb4d3a4f48b2633f7b3ad45703
# Parent  4109a8fff07e8687740bc92bea55bca8f1009569
templatekw: add {changes}, {distance} and {tag} to the {latesttag} keyword
Pierre-Yves David - Oct. 5, 2015, 12:16 a.m.
On 10/04/2015 02:47 PM, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1440473417 14400
> #      Mon Aug 24 23:30:17 2015 -0400
> # Node ID dcfd95985b4e3aeb4d3a4f48b2633f7b3ad45703
> # Parent  4109a8fff07e8687740bc92bea55bca8f1009569
> templatekw: add {changes}, {distance} and {tag} to the {latesttag} keyword

This series looks correct to me and the feature is pretty nice.
I'll give yuya a chance to look at and push it as he has a lot about 
template in his head.

Patch

diff --git a/mercurial/templatekw.py b/mercurial/templatekw.py
--- a/mercurial/templatekw.py
+++ b/mercurial/templatekw.py
@@ -344,11 +344,7 @@ 
     """:latesttag: List of strings. The global tags on the most recent globally
     tagged ancestor of this changeset.
     """
-    repo, ctx = args['repo'], args['ctx']
-    cache = args['cache']
-    latesttags = getlatesttags(repo, ctx, cache)[2]
-
-    return showlist('latesttag', latesttags, separator=':', **args)
+    return showlatesttags(None, **args)
 
 def showlatesttags(pattern, **args):
     """helper method for the latesttag keyword and function"""
diff --git a/tests/test-command-template.t b/tests/test-command-template.t
--- a/tests/test-command-template.t
+++ b/tests/test-command-template.t
@@ -2690,6 +2690,19 @@ 
   1: t1+0
   0: null+1
 
+  $ hg log --template "{rev}: {latesttag() % '{tag}+{distance},{changes} '}\n"
+  10: t5+5,5 
+  9: t5+4,4 
+  8: t5+3,3 
+  7: t5+2,2 
+  6: t5+1,1 
+  5: t5+0,0 
+  4: at3+1,1 t3+1,1 
+  3: at3+0,0 t3+0,0 
+  2: t2+0,0 
+  1: t1+0,0 
+  0: null+1,1 
+
   $ hg log --template "{rev}: {latesttag('re:^t[13]$') % '{tag}, C: {changes}, D: {distance}'}\n"
   10: t3, C: 8, D: 7
   9: t3, C: 7, D: 6