mercurial/templates/map-cmdline.status
author Gregory Szorc <gregory.szorc@gmail.com>
Sat, 14 Apr 2018 15:19:36 -0700
changeset 37725 3ea8323d6f95
parent 34714 f4aeb952ab77
child 38947 f9a98075a37e
permissions -rw-r--r--
wireprotov2: change command response protocol to include a leading map The error handling mechanism for the new wire protocol isn't very well-defined. This commit takes us a step in the right direction by introducing a leading CBOR map for command responses. This map will contain an overall result of the command. Currently, the map indicates whether the command was overall successful or if an error occurred. And if an error occurred, that error is present in the map. There is still a dedicated error frame. My intent is to use that for protocol-level errors and for errors that are encountered after the initial response frame has been sent. This will be clarified in a later commit. Differential Revision: https://phab.mercurial-scm.org/D3385
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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')}"}'