mercurial/templates/map-cmdline.phases
author Martin von Zweigbergk <martinvonz@google.com>
Wed, 19 Nov 2014 11:48:30 -0800
changeset 23650 b85c548ab14d
parent 22768 66bf251ee672
child 24493 e810c7da1cae
permissions -rw-r--r--
merge: introduce 'c' action like 'g', but with additional safety _checkunknownfile() reads the filelog of the remote side's file. For narrow clones, the filelog will not exist for all files and we need a way to avoid reading them. While it would be easier for the narrow extension to just override _checkunknownfile() and make it ignore files outside the narrow clone, it seems cleaner to have manifestmerge() not care about filelogs (considering its name). In order to move the calls to _checkunknownfile() out, we need to be able to tell in which cases we should check for unknown files. Let's start by introducing a new action distinct from 'g' for this purpose. Specifically, the new action will be just like 'g' except that it will check that for conflicting unknown files first. For now, just add the new action type and convert it to 'g'.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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'
9579034d9eb2 log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19126
diff changeset
     4
changeset_quiet = '{node}'
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
9579034d9eb2 log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19126
diff changeset
    43
node = '{label("log.node",
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
9579034d9eb2 log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19126
diff changeset
    61
summary = '{label("log.summary",
9579034d9eb2 log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19126
diff changeset
    62
                  "summary:     {desc|firstline}")}\n'
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
9579034d9eb2 log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19126
diff changeset
    70
description = '{label("ui.note log.description",
9579034d9eb2 log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19126
diff changeset
    71
                       "description:")}
9579034d9eb2 log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19126
diff changeset
    72
               {label("ui.note log.description",
9579034d9eb2 log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19126
diff changeset
    73
                       "{desc|strip}")}\n\n'