Mercurial > hg
annotate mercurial/templates/map-cmdline.status @ 35011:a2dfc723b6b5
bundle: allow bundlerepo to support alternative manifest implementations
With our treemanifest logic, the manifests are no longer transported as part of
the changegroup and are no longer stored in a revlog. This means the
self.manifestlog line in bundlerepo.filestart no longer calls
_constructmanifest, and therefore does not consume the manifest portion of the
changegroup, which means filestart is not populated and we result in an infinite
loop.
The fix is to make filestart aware that self.manifestlog might not consume the
changegroup part, and consume it manually if necessary.
There's currently no way to test this in core, but our treemanifest extension
has tests to cover this.
Differential Revision: https://phab.mercurial-scm.org/D1329
author | Durham Goode <durham@fb.com> |
---|---|
date | Tue, 07 Nov 2017 10:16:53 -0800 |
parents | f4aeb952ab77 |
children | f9a98075a37e |
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 |
34714
f4aeb952ab77
templater: load template fragments from [templates] section in map file
Yuya Nishihara <yuya@tcha.org>
parents:
29000
diff
changeset
|
3 [templates] |
25006
517763f87141
log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
4 # Override base templates |
517763f87141
log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
5 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
|
6 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
|
7 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
|
8 |
517763f87141
log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
9 # Override the file templates |
517763f87141
log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
10 lfiles = '{if(files, |
517763f87141
log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
11 label('ui.note log.files', |
29000
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
25628
diff
changeset
|
12 'files:\n'))}{lfile_mods}{lfile_adds}{lfile_dels}' |
25006
517763f87141
log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
13 |
29000
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
25628
diff
changeset
|
14 lfile_adds = '{file_adds % "{lfile_add}{lfile_src}"}' |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
25628
diff
changeset
|
15 lfile_mods = '{file_mods % "{lfile_mod}{lfile_src}"}' |
25006
517763f87141
log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
16 lfile_add = '{label("status.added", "A {file}\n")}' |
29000
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
25628
diff
changeset
|
17 lfile_mod = '{label("status.modified", "M {file}\n")}' |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
25628
diff
changeset
|
18 lfile_src = '{ifcontains(file, file_copies_switch, |
2d3837a4bded
log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents:
25628
diff
changeset
|
19 label("status.copied", " {get(file_copies_switch, file)}\n"))}' |
25006
517763f87141
log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
20 |
517763f87141
log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
21 lfile_dels = '{file_dels % "{label('status.removed', 'R {file}\n')}"}' |