mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
20d3269298
Before, copied files were assumed as "A" (added) and listed followed by non-copy added files. This could double entries of a copy if it had "M" (modified) state. So, this patch makes the template check if a file is included in copies dict. This way, entries should never be doubled. The output of "log -Tstatus -C" does not always agree with "status -C --change" due to the bug of "status", which is documented in test-status.t. See also 21a68fa3c757.
21 lines
957 B
Plaintext
21 lines
957 B
Plaintext
%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')}"}'
|