Patchwork [4,of,6] map-cmdline.bisect: rewrite just %include the default template

login
register
mail settings
Submitter Jordi Gutiérrez Hermoso
Date May 2, 2015, 4:56 a.m.
Message ID <5adc92b85bfe045bfd52.1430542579@Iris>
Download mbox | patch
Permalink /patch/8851/
State Rejected
Headers show

Comments

Jordi Gutiérrez Hermoso - May 2, 2015, 4:56 a.m.
# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1430542515 14400
#      Sat May 02 00:55:15 2015 -0400
# Node ID 5adc92b85bfe045bfd527d836eccad53a5568e92
# Parent  824b9b5a5521bfdb5325fe3bb2498f8c3a5fbc94
map-cmdline.bisect: rewrite just %include the default template

This also adds labels to the output, which I guess is kind of a BC or
a bugfix. I'm not sure which.
Pierre-Yves David - May 5, 2015, 12:42 a.m.
On 05/01/2015 09:56 PM, Jordi Gutiérrez Hermoso wrote:
> # HG changeset patch
> # User Jordi Gutiérrez Hermoso <jordigh@octave.org>
> # Date 1430542515 14400
> #      Sat May 02 00:55:15 2015 -0400
> # Node ID 5adc92b85bfe045bfd527d836eccad53a5568e92
> # Parent  824b9b5a5521bfdb5325fe3bb2498f8c3a5fbc94
> map-cmdline.bisect: rewrite just %include the default template
>
> This also adds labels to the output, which I guess is kind of a BC or
> a bugfix. I'm not sure which.

I would says bug fix ;-)

Could that be reflected in the tests?

Patch

diff --git a/mercurial/templates/map-cmdline.bisect b/mercurial/templates/map-cmdline.bisect
--- a/mercurial/templates/map-cmdline.bisect
+++ b/mercurial/templates/map-cmdline.bisect
@@ -1,25 +1,7 @@ 
-changeset = 'changeset:   {rev}:{node|short}\nbisect:      {bisect}\n{branches}{bookmarks}{tags}{parents}user:        {author}\ndate:        {date|date}\nsummary:     {desc|firstline}\n\n'
-changeset_quiet = '{bisect|shortbisect} {rev}:{node|short}\n'
-changeset_verbose = 'changeset:   {rev}:{node|short}\nbisect:      {bisect}\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}\nbisect:      {bisect}\n{branches}{bookmarks}{tags}{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'
+%include map-cmdline.default
+
+changeset = '{cset}{lbisect}{branches}{bookmarks}{tags}{parents}{user}{ldate}{summary}\n'
+changeset_verbose = '{cset}{lbisect}{branches}{bookmarks}{tags}{parents}{user}{ldate}{lfiles}{lfile_copies_switch}{description}\n'
+changeset_debug = '{fullcset}{lbisect}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{user}{ldate}{lfile_mods}{lfile_adds}{lfile_dels}{lfile_copies_switch}{extras}{description}\n'
+
+lbisect ='{label("log.bisect", "bisect:      {bisect}\n")}'