Mercurial > hg
view mercurial/templates/map-cmdline.status @ 32405:bdc4861ffe59
fsmonitor: fix silly "*kwargs" bug in merge.update() override
Everyone knows that it's supposed to be spelled with two asterisks.
It started failing in fad5e299cfc7 (update: accept --merge to allow
merging across topo branches (issue5125), 2017-02-13) because until
then there was only one argument that was covered by the kwargs, so
*kwargs or **kwargs both worked (or at least that's what I think with
my limited understanding of Python).
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 22 May 2017 10:41:32 -0700 |
parents | 2d3837a4bded |
children | f4aeb952ab77 |
line wrap: on
line source
%include map-cmdline.default # Override base templates changeset = '{cset}{branches}{bookmarks}{tags}{parents}{user}{ldate}{summary}{lfiles}\n' changeset_verbose = '{cset}{branches}{bookmarks}{tags}{parents}{user}{ldate}{description}{lfiles}\n' changeset_debug = '{fullcset}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{user}{ldate}{extras}{description}{lfiles}\n' # Override the file templates lfiles = '{if(files, label('ui.note log.files', 'files:\n'))}{lfile_mods}{lfile_adds}{lfile_dels}' lfile_adds = '{file_adds % "{lfile_add}{lfile_src}"}' lfile_mods = '{file_mods % "{lfile_mod}{lfile_src}"}' lfile_add = '{label("status.added", "A {file}\n")}' lfile_mod = '{label("status.modified", "M {file}\n")}' lfile_src = '{ifcontains(file, file_copies_switch, label("status.copied", " {get(file_copies_switch, file)}\n"))}' lfile_dels = '{file_dels % "{label('status.removed', 'R {file}\n')}"}'