From patchwork Tue Apr 16 19:50:58 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [1,of,3] Bug 3436 - Add a log style that is default+phase
From: Iulian Stana <julian.stana@gmail.com>
X-Patchwork-Id: 1365
Message-Id: <5edbf33bd2537d3a802b.1366141858@doppler>
To: mercurial-devel@selenic.com
Date: Tue, 16 Apr 2013 22:50:58 +0300

# HG changeset patch
# User Iulian Stana <julian.stana@gmail.com>
# Date 1366138834 -10800
#      Tue Apr 16 22:00:34 2013 +0300
# Node ID 5edbf33bd2537d3a802b1fbcb90ef87d9d0d8471
# Parent  8086b530e2ac23f60ee01e6fa274aec1bb32d988
Bug 3436 - Add a log style that is default+phase

diff -r 8086b530e2ac -r 5edbf33bd253 mercurial/templater.py
--- a/mercurial/templater.py	Mon Apr 15 01:22:15 2013 +0900
+++ b/mercurial/templater.py	Tue Apr 16 22:00:34 2013 +0300
@@ -412,6 +412,7 @@
         if not mapfile:
             return
         if not os.path.exists(mapfile):
+            print "sunt bun"
             raise util.Abort(_('style not found: %s') % mapfile)
 
         conf = config.config()
diff -r 8086b530e2ac -r 5edbf33bd253 mercurial/templates/map-cmdline.phases
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/templates/map-cmdline.phases	Tue Apr 16 22:00:34 2013 +0300
@@ -0,0 +1,25 @@
+changeset = 'changeset:   {rev}:{node|short}\n{branches}{bookmarks}{tags}{parents}phase:       {phase}\nuser:        {author}\ndate:        {date|date}\nsummary:     {desc|firstline}\n\n'
+changeset_quiet = '{rev}:{node|short}\n'
+changeset_verbose = 'changeset:   {rev}:{node|short}\n{branches}{bookmarks}{tags}{parents}user:        {author}\ndate:        {date|date}\n{files}{file_copies_switch}description:\n{desc|strip}\n\n\n'
+changeset_debug = 'changeset:   {rev}:{node}\n{branches}{bookmarks}{tags}phase:       {phase}\n{parents}{manifest}user:        {author}\ndate:        {date|date}\n{file_mods}{file_adds}{file_dels}{file_copies_switch}{extras}description:\n{desc|strip}\n\n\n'
+start_files = 'files:      '
+file = ' {file}'
+end_files = '\n'
+start_file_mods = 'files:      '
+file_mod = ' {file_mod}'
+end_file_mods = '\n'
+start_file_adds = 'files+:     '
+file_add = ' {file_add}'
+end_file_adds = '\n'
+start_file_dels = 'files-:     '
+file_del = ' {file_del}'
+end_file_dels = '\n'
+start_file_copies = 'copies:     '
+file_copy = ' {name} ({source})'
+end_file_copies = '\n'
+parent = 'parent:      {rev}:{node|formatnode}\n'
+manifest = 'manifest:    {rev}:{node}\n'
+branch = 'branch:      {branch}\n'
+tag = 'tag:         {tag}\n'
+bookmark = 'bookmark:    {bookmark}\n'
+extra = 'extra:       {key}={value|stringescape}\n'
diff -r 8086b530e2ac -r 5edbf33bd253 tests/test-log.t
--- a/tests/test-log.t	Mon Apr 15 01:22:15 2013 +0900
+++ b/tests/test-log.t	Tue Apr 16 22:00:34 2013 +0300
@@ -67,6 +67,17 @@
   abort: cannot follow file not in parent revision: "dir"
   [255]
 
+-f, one
+
+  $ hg log -f -l1 --style phases
+  changeset:   4:7e4639b4691b
+  tag:         tip
+  phase:       draft
+  user:        test
+  date:        Thu Jan 01 00:00:05 1970 +0000
+  summary:     e
+  
+
 -f, but no args
 
   $ hg log -f