mercurial/templates/map-cmdline.changelog
author Matt Harbison <matt_harbison@yahoo.com>
Sat, 07 Feb 2015 19:40:02 -0500
changeset 24133 79c2c29c71ae
parent 9999 f91e5630ce7e
child 34714 f4aeb952ab77
permissions -rw-r--r--
largefiles: don't warn when reverting a forgotten largefile Previously, when a largefile is forgotten and then reverted, a warning was issued: $ hg revert -R subrepo subrepo/large.txt file not managed: subrepo/large.txt (glob) This was purely cosmetic as the file itself actually was reverted. The problem was even with all of the matcher patching, the largefile pattern given on the command line wasn't converted to a standin because the standin was neither in ctx nor wctx. This causes the named largefile to be added to the 'names' dict in cmdutil.revert() in the repo walk at line 2550. The warning was printed out when the 'names' dict is iterated, because the file was specified exactly. Since core revert recurses into subrepos and largefiles only overrides the revert method in commands.py, it doesn't work properly when reverting a subrepo. However, it still will recurse into the subrepo and call the installed matcher method, so lfdirstate is reopened for the current repo level to prevent any new problems.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2033
e3280d350792 Group changes done by the same developer on the same with --style=changelog
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2032
diff changeset
     1
header = '{date|shortdate}  {author|person}  <{author|email}>\n\n'
e3280d350792 Group changes done by the same developer on the same with --style=changelog
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2032
diff changeset
     2
header_verbose = ''
9936
3aa420c56ac4 list branches in changelog template
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 2033
diff changeset
     3
changeset = '\t* {files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\t[{node|short}]{tags}{branches}\n\n'
2033
e3280d350792 Group changes done by the same developer on the same with --style=changelog
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2032
diff changeset
     4
changeset_quiet = '\t* {desc|firstline|fill68|tabindent|strip}\n\n'
9936
3aa420c56ac4 list branches in changelog template
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 2033
diff changeset
     5
changeset_verbose = '{date|isodate}  {author|person}  <{author|email}>  ({node|short}{tags}{branches})\n\n\t* {file_adds|stringify|fill68|tabindent}{file_dels|stringify|fill68|tabindent}{files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\n'
1987
04c17fc39c84 add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     6
start_tags = ' ['
04c17fc39c84 add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     7
tag = '{tag}, '
04c17fc39c84 add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     8
last_tag = '{tag}]'
9936
3aa420c56ac4 list branches in changelog template
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 2033
diff changeset
     9
start_branches = ' <'
3aa420c56ac4 list branches in changelog template
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 2033
diff changeset
    10
branch = '{branch}, '
3aa420c56ac4 list branches in changelog template
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 2033
diff changeset
    11
last_branch = '{branch}>'
1987
04c17fc39c84 add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    12
file = '{file}, '
2032
cd6bdbc508dd Don't print filenames in braces for changelog style.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1987
diff changeset
    13
last_file = '{file}:\n\t'
1987
04c17fc39c84 add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    14
file_add = '{file_add}, '
2032
cd6bdbc508dd Don't print filenames in braces for changelog style.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1987
diff changeset
    15
last_file_add = '{file_add}: new file.\n* '
1987
04c17fc39c84 add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    16
file_del = '{file_del}, '
2032
cd6bdbc508dd Don't print filenames in braces for changelog style.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1987
diff changeset
    17
last_file_del = '{file_del}: deleted file.\n* '