changeset 24139:73b3218bb078

churn: deprecate -t option in favour of -T We use -T consistently elsewhere to refer to the --template option. The old -t option is now renamed to --oldtemplate so that -t still works. This has the benign side effect of introducing and immediately deprecating a new long option. We also test with both -t and -T options.
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Tue, 24 Feb 2015 11:37:07 -0500
parents eabe44ec5af5
children 5a64b676c5d3
files hgext/churn.py tests/test-churn.t
diffstat 2 files changed, 27 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/churn.py	Tue Feb 24 10:55:24 2015 +0100
+++ b/hgext/churn.py	Tue Feb 24 11:37:07 2015 -0500
@@ -46,7 +46,7 @@
             date = datetime.datetime(*time.gmtime(float(t) - tz)[:6])
             return date.strftime(opts['dateformat'])
     else:
-        tmpl = opts.get('template', '{author|email}')
+        tmpl = opts.get('oldtemplate') or opts.get('template')
         tmpl = maketemplater(ui, repo, tmpl)
         def getkey(ctx):
             ui.pushbuffer()
@@ -95,7 +95,9 @@
      _('count rate for the specified revision or revset'), _('REV')),
     ('d', 'date', '',
      _('count rate for revisions matching date spec'), _('DATE')),
-    ('t', 'template', '{author|email}',
+    ('t', 'oldtemplate', '',
+     _('template to group changesets (DEPRECATED)'), _('TEMPLATE')),
+    ('T', 'template', '{author|email}',
      _('template to group changesets'), _('TEMPLATE')),
     ('f', 'dateformat', '',
      _('strftime-compatible format for grouping by date'), _('FORMAT')),
--- a/tests/test-churn.t	Tue Feb 24 10:55:24 2015 +0100
+++ b/tests/test-churn.t	Tue Feb 24 11:37:07 2015 -0500
@@ -171,4 +171,27 @@
   El Ni\xc3\xb1o         1 *************** (esc)
   with space      1 ***************
 
+Test --template argument, with backwards compatiblity
+
+  $ hg churn -t '{author|user}'
+  user1      4 ***************************************************************
+  user3      3 ***********************************************
+  user2      2 ********************************
+  nino       1 ****************
+  with       1 ****************
+             0 
+  user4      0 
+  $ hg churn -T '{author|user}'
+  user1      4 ***************************************************************
+  user3      3 ***********************************************
+  user2      2 ********************************
+  nino       1 ****************
+  with       1 ****************
+             0 
+  user4      0 
+  $ hg churn -t 'alltogether'
+  alltogether     11 *********************************************************
+  $ hg churn -T 'alltogether'
+  alltogether     11 *********************************************************
+
   $ cd ..