Mercurial > hg

annotate mercurial/templates/map-cmdline.status @ 25755:72d395e399c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: remove useless dirstate.normallookup() invocation in revert() Explicit 'dirstate.normallookup()' invocation in 'revert()' is useless now, because previous patch fixed the relevant issue by writing in-memory dirstate changes out at the end of dirty check. 'dirstate.normallookup()' invocation was introduced by 21b33f0460e0 to avoid occasional test failure (see issue4583 for detail). This is partial backout of it (added tests are still left).
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Wed, 08 Jul 2015 17:01:09 +0900
parents 9c647f427aef
children 2d3837a4bded
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25006
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
1 %include map-cmdline.default
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
2
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
3 # Override base templates
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
4 changeset = '{cset}{branches}{bookmarks}{tags}{parents}{user}{ldate}{summary}{lfiles}\n'
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
5 changeset_verbose = '{cset}{branches}{bookmarks}{tags}{parents}{user}{ldate}{description}{lfiles}\n'
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
6 changeset_debug = '{fullcset}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{user}{ldate}{extras}{description}{lfiles}\n'
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
7
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
8 # Override the file templates
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
9 lfiles = '{if(files,
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
10 label('ui.note log.files',
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
11 'files:\n'))}{lfile_mods}{lfile_adds}{lfile_copies_switch}{lfile_dels}'
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
12
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
13 # Exclude copied files, will display those in lfile_copies_switch
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
14 lfile_adds = '{file_adds % "{ifcontains(file, file_copies_switch,
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
15 '',
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
16 '{lfile_add}')}"}'
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
17 lfile_add = '{label("status.added", "A {file}\n")}'
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
18
25628
9c647f427aef templates: fix missing closing brace in map-cmdline.status
Yuya Nishihara <yuya@tcha.org>
parents: 25006
diff changeset
19 lfile_copies_switch = '{file_copies_switch % "{lfile_copy_orig}{lfile_copy_dest}"}'
25006
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
20 lfile_copy_orig = '{label("status.added", "A {name}\n")}'
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
21 lfile_copy_dest = '{label("status.copied", " {source}\n")}'
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
22
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
23 lfile_mods = '{file_mods % "{label('status.modified', 'M {file}\n')}"}'
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
24
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
25 lfile_dels = '{file_dels % "{label('status.removed', 'R {file}\n')}"}'