Mercurial > hg-stable

changeset 22705:d4869b280cd6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branches: include active, closed and current flags in template output
author Yuya Nishihara <yuya@tcha.org>
date Thu, 02 Oct 2014 23:26:02 +0900
parents 386339ffe421
children ad25986c4cd3
files mercurial/commands.py tests/test-branches.t
diffstat 2 files changed, 18 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Oct 02 23:13:56 2014 +0900
+++ b/mercurial/commands.py	Thu Oct 02 23:26:02 2014 +0900
@@ -1116,7 +1116,8 @@
         else:
             label = 'branches.inactive'
             notice = _(' (inactive)')
-        if tag == repo.dirstate.branch():
+        current = (tag == repo.dirstate.branch())
+        if current:
             label = 'branches.current'
 
         fm.startitem()
@@ -1126,6 +1127,7 @@
         fmt = ' ' * padsize + ' %d:%s'
         fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
                      label='log.changeset changeset.%s' % ctx.phasestr())
+        fm.data(active=isactive, closed=not isopen, current=current)
         if not ui.quiet:
             fm.plain(notice)
         fm.plain('\n')
--- a/tests/test-branches.t	Thu Oct 02 23:13:56 2014 +0900
+++ b/tests/test-branches.t	Thu Oct 02 23:26:02 2014 +0900
@@ -475,27 +475,42 @@
   $ hg branches -Tjson --closed
   [
    {
+    "active": true,
     "branch": "b",
+    "closed": false,
+    "current": true,
     "node": "e23b5505d1ad24aab6f84fd8c7cb8cd8e5e93be0",
     "rev": 13
    },
    {
+    "active": true,
     "branch": "a branch name much longer than the default justification used by branches",
+    "closed": false,
+    "current": false,
     "node": "10ff5895aa5793bd378da574af8cec8ea408d831",
     "rev": 7
    },
    {
+    "active": false,
     "branch": "c",
+    "closed": true,
+    "current": false,
     "node": "f894c25619d3f1484639d81be950e0a07bc6f1f6",
     "rev": 14
    },
    {
+    "active": false,
     "branch": "a",
+    "closed": false,
+    "current": false,
     "node": "d8cbc61dbaa6dc817175d1e301eecb863f280832",
     "rev": 5
    },
    {
+    "active": false,
     "branch": "default",
+    "closed": false,
+    "current": false,
     "node": "19709c5a4e75bf938f8e349aff97438539bb729e",
     "rev": 0
    }