# HG changeset patch # User Thomas Arendsen Hein # Date 1161166622 -7200 # Node ID 0600d326d96a0e1d6fd5e4ff46a946650fa9a875 # Parent 6e998a4575c68af51f046c7d6f27b9747ff90664 Adjust default cmdline style to really match verbose/debug log. diff --git a/templates/map-cmdline.default b/templates/map-cmdline.default --- a/templates/map-cmdline.default +++ b/templates/map-cmdline.default @@ -1,6 +1,10 @@ changeset = 'changeset: {rev}:{node|short}\n{tags}{short_parents}user: {author}\ndate: {date|date}\nsummary: {desc|firstline}\n\n' changeset_quiet = '{rev}:{node|short}\n' -changeset_verbose = 'changeset: {rev}:{node}\n{tags}{parents}{manifest}user: {author}\ndate: {date|date}\nfiles: {files}\n{file_adds}{file_dels}{file_copies}description:\n{desc|strip}\n\n\n' +changeset_verbose = 'changeset: {rev}:{node|short}\n{tags}{parents}{manifest}user: {author}\ndate: {date|date}\n{files}{file_adds}{file_dels}{file_copies}description:\n{desc|strip}\n\n\n' +changeset_debug = 'changeset: {rev}:{node}\n{tags}{parents}{manifest}user: {author}\ndate: {date|date}\n{files}{file_adds}{file_dels}{file_copies}description:\n{desc|strip}\n\n\n' +start_files = 'files: ' +file = ' {file}' +end_files = '\n' start_file_adds = 'files+: ' file_add = ' {file_add}' end_file_adds = '\n' diff --git a/tests/test-command-template b/tests/test-command-template --- a/tests/test-command-template +++ b/tests/test-command-template @@ -24,12 +24,15 @@ echo 'logtemplate =' >> .hg/hgrc echo 'style =' >> .hg/hgrc echo '# default style is like normal output' +echo '# normal' hg log > log.out hg log --style default > style.out diff log.out style.out +echo '# verbose' hg log -v > log.out hg log -v --style default > style.out diff log.out style.out +echo '# debug' hg log --debug > log.out hg log --debug --style default > style.out diff log.out style.out diff --git a/tests/test-command-template.out b/tests/test-command-template.out --- a/tests/test-command-template.out +++ b/tests/test-command-template.out @@ -1,26 +1,7 @@ # default style is like normal output -1c1 -< changeset: 3:10e46f2dcbf4 ---- -> changeset: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -10c10 -< changeset: 2:97054abb4ab8 ---- -> changeset: 2:97054abb4ab824450e9164180baf491ae0078465 -18c18 -< changeset: 1:b608e9d1a3f0 ---- -> changeset: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -29c29 -< changeset: 0:1e4e1b8f71e0 ---- -> changeset: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -18a19 -> files: -29a31 -> files: -43a46 -> files: +# normal +# verbose +# debug # compact style works 3[tip] 10e46f2dcbf4 1970-01-16 01:06 +0000 person no user, no domain