Patchwork [2,of,3] tags: change field name of formatter output to be the same as log command

login
register
mail settings
Submitter Yuya Nishihara
Date Sept. 21, 2014, 4:53 a.m.
Message ID <e579ab975ff4e4c4b6ec.1411275210@mimosa>
Download mbox | patch
Permalink /patch/5903/
State Accepted
Headers show

Comments

Yuya Nishihara - Sept. 21, 2014, 4:53 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1411271183 -32400
#      Sun Sep 21 12:46:23 2014 +0900
# Node ID e579ab975ff4e4c4b6ec37a82b81c4cd837df4b1
# Parent  7b3de162d3beb819be49fcd2c508677368fb5bb8
tags: change field name of formatter output to be the same as log command

Since -T option is not public yet, this won't break backward compatibility.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -6011,7 +6011,7 @@  def tags(ui, repo, **opts):
         fm.startitem()
         fm.write('tag', '%s', t, label=label)
         fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
-        fm.condwrite(not ui.quiet, 'rev id', fmt,
+        fm.condwrite(not ui.quiet, 'rev node', fmt,
                      repo.changelog.rev(n), hn, label=label)
         fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
                      tagtype, label=label)
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
   [
    {
-    "id": "a52c0692f24a",
+    "node": "a52c0692f24a",
     "rev": 5,
     "tag": "tip",
     "type": ""
    },
    {
-    "id": "ca661e7520de",
+    "node": "ca661e7520de",
     "rev": 3,
     "tag": "\xc3\xa9", (esc)
     "type": ""