annotate mercurial/templates/map-cmdline.bisect @ 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25007
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
1 %include map-cmdline.default
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
2
34714
f4aeb952ab77 templater: load template fragments from [templates] section in map file
Yuya Nishihara <yuya@tcha.org>
parents: 25007
diff changeset
3 [templates]
25007
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
4 changeset = '{cset}{lbisect}{branches}{bookmarks}{tags}{parents}{user}{ldate}{summary}\n'
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
5 changeset_quiet = '{lshortbisect} {rev}:{node|short}\n'
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
6 changeset_verbose = '{cset}{lbisect}{branches}{bookmarks}{tags}{parents}{user}{ldate}{lfiles}{lfile_copies_switch}{description}\n'
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
7 changeset_debug = '{fullcset}{lbisect}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{user}{ldate}{lfile_mods}{lfile_adds}{lfile_dels}{lfile_copies_switch}{extras}{description}\n'
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
8
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
9 # We take the zeroth word in order to omit "(implicit)" in the label
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
10 bisectlabel = ' bisect.{word('0', bisect)}'
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
11
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
12 lbisect ='{label("log.bisect{if(bisect, bisectlabel)}",
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
13 "bisect: {bisect}\n")}'
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
14 lshortbisect ='{label("log.bisect{if(bisect, bisectlabel)}",
7c324f65e4ef map-cmdline.bisect: rewrite to just %include the default template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15156
diff changeset
15 "{bisect|shortbisect}")}'