Mercurial > hgrepos > DevTools > mercurial-extensions

changeset 66:fe4feca5b136

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The default user-filter of $Author$ is "user" now. Previously was "person".
author Franz Glasner <hg@dom66.de>
date Sun, 26 Nov 2017 17:29:49 +0100
parents bdb549d71148
children b94317b05aff
files extensions/kwarchive.py
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/extensions/kwarchive.py	Sun Nov 26 17:26:20 2017 +0100
+++ b/extensions/kwarchive.py	Sun Nov 26 17:29:49 2017 +0100
@@ -67,7 +67,7 @@
       ('', 'path', 'default', _('the canonical repository to use'), _('PATH')),
       ('', "kwconfig", '', _('an alternate pattern configuration configuration file'), _('PATTERNCONFIG')),
       ('', "no-shorten-path", None, _("don't shorten the path urls")),
-      ('', "user-filter", "person", _("the part of the user to be printed"), _("USERFILTER")),
+      ('', "user-filter", "user", _("the part of the user to be printed"), _("USERFILTER")),
     ] + cmdutil.subrepoopts + cmdutil.walkopts,
     _('[OPTION]... DEST'))
 def kwarchive(ui, repo, dest, **opts):
@@ -181,7 +181,7 @@
     [('r', 'rev', '', _('revision to distribute'), _('REV')),
      ('', 'path', 'default', _('the canonical repository to use'), _('PATH')),
      ('', "no-shorten-path", None, _("don't shorten the path urls")),
-      ('', "user-filter", "person", _("the part of the user to be printed"), _("USERFILTER")),
+      ('', "user-filter", "user", _("the part of the user to be printed"), _("USERFILTER")),
     ] + cmdutil.subrepoopts + cmdutil.walkopts,
     _('[OPTION]...'))
 def kwprint(ui, repo, **opts):
@@ -241,7 +241,7 @@
 def make_keyword_filter(ui, repo, ctx, archive_class, prefix,
                         hgpath="default",
                         shorten_path_url=True,
-                        user_filter="person",
+                        user_filter="user",
                         kwconfig=""):
     keywords = make_node_keywords(ui, repo, ctx, prefix,
                                   hgpath=hgpath,
@@ -315,7 +315,7 @@
 def make_node_keywords(ui, repo, ctx, prefix,
                        hgpath="default",
                        shorten_path_url=True,
-                       user_filter="person"):
+                       user_filter="user"):
     """Make all the node-specific (i.e. file-path independent) keywords
 
     """
@@ -344,10 +344,10 @@
         "Revision": templatefilters.short(ctx.hex()),
         "Date": templatefilters.isodatesec(ctx.date()),
     }
-    if user_filter == "person":
+    if user_filter == "user":
+        keywords["Author"] = templatefilters.userfilter(ctx.user())
+    elif user_filter == "person":
         keywords["Author"] = templatefilters.utf8(templatefilters.person(ctx.user()).replace(' ', '+'))
-    elif user_filter == "user":
-        keywords["Author"] = templatefilters.userfilter(ctx.user())
     elif user_filter == "email":
         keywords["Author"] = templatefilters.email(ctx.user())
 
@@ -367,5 +367,5 @@
 def get_checked_user_filter(opts):
     uf = opts.get("user_filter")
     if not uf in ("person", "user", "email"):
-        raise error.Abort(_("user filter must be any of `person', `user' or `email'"))
+        raise error.Abort(_("user filter must be any of `user', `person' or `email'"))
     return uf