mercurial/templates/map-cmdline.changelog
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
Tue, 17 Aug 2010 17:46:10 +0200
changeset 11942 50a4e55aa278
parent 9999 f91e5630ce7e
child 34714 f4aeb952ab77
permissions -rw-r--r--
demandimport: store level argument on _demandmod instances The 'level' argument to __import__ was added in Python 2.6, and is specified for either relative or absolute imports. The fix introduced in e160f2312815 allowed such imports to proceed without failure, but effectively disabled demandimport for them. This is particularly unfortunate in Python 3.x, where *all* imports are either relative or absolute. The solution introduced here is to store the level argument on the demandimport instance, and propagate it to _origimport() when its value isn't None. Please note that this patch hasn't been tested in Python 3.x, and thus may not be complete. I'm worried about how sub-imports are handled; I don't know what they are, or whether the level argument should be modified for them. I've added 'TODO' notes to these cases; hopefully, someone more knowledgable of these issues will deal with them.
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* '