mercurial/commands.py
changeset 22701 cb28d2b3db0b
parent 22694 21d5416b8a8a
child 22702 08a4e70ed183
--- 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()):