Mercurial > hg
annotate mercurial/templates/map-cmdline.phases @ 25279:708b19c18adf stable
mergecopies: avoid slowdown from linkrev adjustment (issue4680)
checkcopies was using fctx.rev() which it was expecting would be
equivalent to linkrev() but was triggering the new _adjustlinkrev path.
This was making grafts and merges with large sets of potential copies
very expensive.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 26 May 2015 06:45:18 -0500 |
parents | 6518880de1b3 |
children | 9570587b6986 |
rev | line source |
---|---|
22767
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
1 # Base templates. Due to name clashes with existing keywords, we have |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
2 # to replace some keywords with 'lkeyword', for 'labelled keyword' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
3 changeset = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{user}{ldate}{summary}\n' |
24493
e810c7da1cae
templates: fix "log -q" output of phases style
Yuya Nishihara <yuya@tcha.org>
parents:
22768
diff
changeset
|
4 changeset_quiet = '{lnode}' |
22768
66bf251ee672
log: show phase in hg log -v with the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22767
diff
changeset
|
5 changeset_verbose = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{user}{ldate}{lfiles}{lfile_copies_switch}{description}\n' |
22767
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
6 changeset_debug = '{fullcset}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{user}{ldate}{lfile_mods}{lfile_adds}{lfile_dels}{lfile_copies_switch}{extras}{description}\n' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
7 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
8 # File templates |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
9 lfiles = '{if(files, |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
10 label("ui.note log.files", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
11 "files: {files}\n"))}' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
12 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
13 lfile_mods = '{if(file_mods, |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
14 label("ui.debug log.files", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
15 "files: {file_mods}\n"))}' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
16 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
17 lfile_adds = '{if(file_adds, |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
18 label("ui.debug log.files", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
19 "files+: {file_adds}\n"))}' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
20 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
21 lfile_dels = '{if(file_dels, |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
22 label("ui.debug log.files", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
23 "files-: {file_dels}\n"))}' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
24 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
25 lfile_copies_switch = '{if(file_copies_switch, |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
26 label("ui.note log.copies", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
27 "copies: {file_copies_switch |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
28 % ' {name} ({source})'}\n"))}' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
29 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
30 # General templates |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
31 cset = '{label("log.changeset changeset.{phase}", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
32 "changeset: {rev}:{node|short}")}\n' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
33 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
34 lphase = '{label("log.phase", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
35 "phase: {phase}")}\n' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
36 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
37 fullcset = '{label("log.changeset changeset.{phase}", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
38 "changeset: {rev}:{node}")}\n' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
39 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
40 parent = '{label("log.parent changeset.{phase}", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
41 "parent: {rev}:{node|formatnode}")}\n' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
42 |
24493
e810c7da1cae
templates: fix "log -q" output of phases style
Yuya Nishihara <yuya@tcha.org>
parents:
22768
diff
changeset
|
43 lnode = '{label("log.node", |
22767
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
44 "{rev}:{node|short}")}\n' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
45 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
46 manifest = '{label("ui.debug log.manifest", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
47 "manifest: {rev}:{node}")}\n' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
48 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
49 branch = '{label("log.branch", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
50 "branch: {branch}")}\n' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
51 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
52 tag = '{label("log.tag", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
53 "tag: {tag}")}\n' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
54 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
55 bookmark = '{label("log.bookmark", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
56 "bookmark: {bookmark}")}\n' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
57 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
58 user = '{label("log.user", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
59 "user: {author}")}\n' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
60 |
24853
6518880de1b3
template-phases: do not show description or summary if empty
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24493
diff
changeset
|
61 summary = '{if(desc|strip, "{label('log.summary', |
6518880de1b3
template-phases: do not show description or summary if empty
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24493
diff
changeset
|
62 'summary: {desc|firstline}')}\n")}' |
22767
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
63 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
64 ldate = '{label("log.date", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
65 "date: {date|date}")}\n' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
66 |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
67 extra = '{label("ui.debug log.extra", |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
68 "extra: {key}={value|stringescape}")}\n' |
9579034d9eb2
log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19126
diff
changeset
|
69 |
24853
6518880de1b3
template-phases: do not show description or summary if empty
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24493
diff
changeset
|
70 description = '{if(desc|strip, "{label('ui.note log.description', |
6518880de1b3
template-phases: do not show description or summary if empty
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24493
diff
changeset
|
71 'description:')} |
6518880de1b3
template-phases: do not show description or summary if empty
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24493
diff
changeset
|
72 {label('ui.note log.description', |
6518880de1b3
template-phases: do not show description or summary if empty
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24493
diff
changeset
|
73 '{desc|strip}')}\n\n")}' |