Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 22701:cb28d2b3db0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
formatter: add general way to switch hex/short functions This seems a bit awkward, but it can avoid duplicates in annotate, tags, branches and bookmarks. I guess fm.hexfunc can eventually be removed (or redesigned) when it gets template backend.
author Yuya Nishihara <yuya@tcha.org>
date Fri, 03 Oct 2014 22:20:02 +0900
parents 21d5416b8a8a
children 08a4e70ed183
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Oct 03 11:37:56 2014 -0500
+++ b/mercurial/commands.py	Fri Oct 03 22:20:02 2014 +0900
@@ -276,10 +276,7 @@
 
     fm = ui.formatter('annotate', opts)
     datefunc = ui.quiet and util.shortdate or util.datestr
-    if fm or ui.debugflag:
-        hexfn = hex
-    else:
-        hexfn = short
+    hexfn = fm.hexfunc
 
     opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
              ('number', ' ', lambda x: x[0].rev(), str),
@@ -6086,10 +6083,7 @@
     """
 
     fm = ui.formatter('tags', opts)
-    if fm or ui.debugflag:
-        hexfunc = hex
-    else:
-        hexfunc = short
+    hexfunc = fm.hexfunc
     tagtype = ""
 
     for t, n in reversed(repo.tagslist()):