[PATCH 1 of 2] Make the verbose flag display the full hash of the changeset

Gilles Moris gilles.moris at free.fr
Thu Mar 20 18:10:06 CDT 2008


4 files changed, 16 insertions(+), 16 deletions(-)
mercurial/cmdutil.py            |    4 ++--
templates/map-cmdline.changelog |    2 +-
templates/map-cmdline.default   |    2 +-
tests/test-command-template.out |   24 ++++++++++++------------


# HG changeset patch
# User Gilles Moris <gilles.moris at free.fr>
# Date 1206054568 -3600
# Node ID a78761e220b82e860504068ce8366e7cbd395fbf
# Parent  627665e37bdd773731bb262969f8f3b446e58568
Make the verbose flag display the full hash of the changeset

The default changeset_printer and the formatnode in the
changeset_templater are now displaying the full hexadecimal
SHA1 hash of the changeset if the verbose flag is set.
Previously, only the debug flag was printing the full hash.
The changelog style has been adjusted to cope with the longer hash.

diff -r 627665e37bdd -r a78761e220b8 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Thu Mar 20 22:58:53 2008 +0100
+++ b/mercurial/cmdutil.py	Fri Mar 21 00:09:28 2008 +0100
@@ -604,7 +604,7 @@ class changeset_printer(object):
         extra = changes[5]
         branch = extra.get("branch")
 
-        hexfunc = self.ui.debugflag and hex or short
+        hexfunc = (self.ui.debugflag or self.ui.verbose) and hex or short
 
         parents = [(p, hexfunc(log.node(p)))
                    for p in self._meaningful_parentrevs(log, rev)]
@@ -687,7 +687,7 @@ class changeset_templater(changeset_prin
     def __init__(self, ui, repo, patch, mapfile, buffered):
         changeset_printer.__init__(self, ui, repo, patch, buffered)
         filters = templatefilters.filters.copy()
-        filters['formatnode'] = (ui.debugflag and (lambda x: x)
+        filters['formatnode'] = ((ui.debugflag or ui.verbose) and (lambda x: x)
                                  or (lambda x: x[:12]))
         self.t = templater.templater(mapfile, filters,
                                      cache={
diff -r 627665e37bdd -r a78761e220b8 templates/map-cmdline.changelog
--- a/templates/map-cmdline.changelog	Thu Mar 20 22:58:53 2008 +0100
+++ b/templates/map-cmdline.changelog	Fri Mar 21 00:09:28 2008 +0100
@@ -2,7 +2,7 @@ header_verbose = ''
 header_verbose = ''
 changeset = '\t* {files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\t[{node|short}]{tags}\n\n'
 changeset_quiet = '\t* {desc|firstline|fill68|tabindent|strip}\n\n'
-changeset_verbose = '{date|isodate}  {author|person}  <{author|email}>  ({node|short}{tags})\n\n\t* {file_adds|stringify|fill68|tabindent}{file_dels|stringify|fill68|tabindent}{files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\n'
+changeset_verbose = '{date|isodate}  {author|person}  <{author|email}>\n\t({node}{tags})\n\n\t* {file_adds|stringify|fill68|tabindent}{file_dels|stringify|fill68|tabindent}{files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\n'
 start_tags = ' ['
 tag = '{tag}, '
 last_tag = '{tag}]'
diff -r 627665e37bdd -r a78761e220b8 templates/map-cmdline.default
--- a/templates/map-cmdline.default	Thu Mar 20 22:58:53 2008 +0100
+++ b/templates/map-cmdline.default	Fri Mar 21 00:09:28 2008 +0100
@@ -1,6 +1,6 @@ changeset = 'changeset:   {rev}:{node|sh
 changeset = 'changeset:   {rev}:{node|short}\n{branches}{tags}{parents}user:        {author}\ndate:        {date|date}\nsummary:     {desc|firstline}\n\n'
 changeset_quiet = '{rev}:{node|short}\n'
-changeset_verbose = 'changeset:   {rev}:{node|short}\n{branches}{tags}{parents}user:        {author}\ndate:        {date|date}\n{files}{file_copies}description:\n{desc|strip}\n\n\n'
+changeset_verbose = 'changeset:   {rev}:{node}\n{branches}{tags}{parents}user:        {author}\ndate:        {date|date}\n{files}{file_copies}description:\n{desc|strip}\n\n\n'
 changeset_debug = 'changeset:   {rev}:{node}\n{branches}{tags}{parents}{manifest}user:        {author}\ndate:        {date|date}\n{file_mods}{file_adds}{file_dels}{file_copies}{extras}description:\n{desc|strip}\n\n\n'
 start_files = 'files:      '
 file = ' {file}'
diff -r 627665e37bdd -r a78761e220b8 tests/test-command-template.out
--- a/tests/test-command-template.out	Thu Mar 20 22:58:53 2008 +0100
+++ b/tests/test-command-template.out	Fri Mar 21 00:09:28 2008 +0100
@@ -364,14 +364,14 @@ manifest: 2:6e0e82995c35
 manifest: 2:6e0e82995c35
 manifest: 1:4e8d705b1e53
 manifest: 0:a0c8bcbbb45c
-manifest--verbose: 7:f2dbc354b94e
-manifest--verbose: 6:91015e9dbdd7
-manifest--verbose: 5:4dc3def4f9b4
-manifest--verbose: 4:90ae8dda64e1
-manifest--verbose: 3:cb5a1327723b
-manifest--verbose: 2:6e0e82995c35
-manifest--verbose: 1:4e8d705b1e53
-manifest--verbose: 0:a0c8bcbbb45c
+manifest--verbose: 7:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf
+manifest--verbose: 6:91015e9dbdd76a6791085d12b0a0ec7fcd22ffbf
+manifest--verbose: 5:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
+manifest--verbose: 4:90ae8dda64e1a876c792bccb9af66284f6018363
+manifest--verbose: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
+manifest--verbose: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1
+manifest--verbose: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55
+manifest--verbose: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
 manifest--debug: 7:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf
 manifest--debug: 6:91015e9dbdd76a6791085d12b0a0ec7fcd22ffbf
 manifest--debug: 5:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
@@ -412,9 +412,9 @@ parents:
 parents: 
 parents: 
 parents: 
-parents--verbose: -1:000000000000 
-parents--verbose: 5:13207e5a10d9 4:32a18f097fcc 
-parents--verbose: 3:10e46f2dcbf4 
+parents--verbose: -1:0000000000000000000000000000000000000000 
+parents--verbose: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:32a18f097fcccf76ef282f62f8a85b3adf8d13c4 
+parents--verbose: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 
 parents--verbose: 
 parents--verbose: 
 parents--verbose: 
@@ -563,7 +563,7 @@ 1e4e1b8f71e0
 #  normal
 1e4e1b8f71e0
 #  verbose
-1e4e1b8f71e0
+1e4e1b8f71e05681d422154f5421e385fec3454f
 #  debug
 1e4e1b8f71e05681d422154f5421e385fec3454f
 # error on syntax


More information about the Mercurial-devel mailing list