[PATCH 3 of 3] tags: use full hash for formatter output as in log or annotate commands

Yuya Nishihara yuya at tcha.org
Sat Sep 20 23:53:31 CDT 2014


# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1411271448 -32400
#      Sun Sep 21 12:50:48 2014 +0900
# Node ID c09a49bc5786f890d531cbf7b3459d27d9cc9d3c
# Parent  e579ab975ff4e4c4b6ec37a82b81c4cd837df4b1
tags: use full hash for formatter output as in log or annotate commands

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5997,7 +5997,10 @@ def tags(ui, repo, **opts):
     """
 
     fm = ui.formatter('tags', opts)
-    hexfunc = ui.debugflag and hex or short
+    if fm or ui.debugflag:
+        hexfunc = hex
+    else:
+        hexfunc = short
     tagtype = ""
 
     for t, n in reversed(repo.tagslist()):
diff --git a/tests/test-encoding.t b/tests/test-encoding.t
--- a/tests/test-encoding.t
+++ b/tests/test-encoding.t
@@ -184,13 +184,13 @@ hg tags (JSON)
   $ hg tags -Tjson
   [
    {
-    "node": "a52c0692f24a",
+    "node": "a52c0692f24ad921c0a31e1736e7635a8b23b670",
     "rev": 5,
     "tag": "tip",
     "type": ""
    },
    {
-    "node": "ca661e7520de",
+    "node": "ca661e7520dec3f5438a63590c350bebadb04989",
     "rev": 3,
     "tag": "\xc3\xa9", (esc)
     "type": ""


More information about the Mercurial-devel mailing list