##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

patch: include flag-only file changes in "special" when filtering (issue5864)...
patch: include flag-only file changes in "special" when filtering (issue5864) This patch fix the issue5864 (or maybe issue5865 too) which occurs during split (or I should say at the time of filtering the hunks in interactive mode) where user hits a not ending loop of "no changes to record". And it's not only the case for split it will happen in every interactive case for e.g. `hg commit -i` or `hg uncommit -i` After looking into code I found that when filtering we have some notation called "special" for the file headers which doesn't contain any hunk and just contain the header (for e.g. newly added empty file or deleted file) where the user cannot change the content of operation. And I think we can put this "flag-only" file change in that same bucket of "special". But I doubt a bit about the case when a file have flag change and atleast one hunk then user won't be able to separate the flag change from hunks. Changed test file reflect the fixed behaviour. Differential Revision: https://phab.mercurial-scm.org/D6058
Yuya Nishihara - - Load All Authors

File last commit:

r38982:f9a98075 default
r42149:f8c5225b default
Show More
map-cmdline.status
21 lines | 972 B | text/plain | TextLexer
/ mercurial / templates / map-cmdline.status
History | Source | Raw |Copy content |Copy permalink
Jordi Gutiérrez Hermoso
log: add a status template...
 r25006 %include map-cmdline.default
Yuya Nishihara
templater: load template fragments from [templates] section in map file...
 r34715 [templates]
Jordi Gutiérrez Hermoso
log: add a status template...
 r25006 # Override base templates
Yuya Nishihara
templates: rename "user" to "luser" defined in default map file (API)...
 r38982 changeset = '{cset}{branches}{bookmarks}{tags}{parents}{luser}{ldate}{summary}{lfiles}\n'
changeset_verbose = '{cset}{branches}{bookmarks}{tags}{parents}{luser}{ldate}{description}{lfiles}\n'
changeset_debug = '{fullcset}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{luser}{ldate}{extras}{description}{lfiles}\n'
Jordi Gutiérrez Hermoso
log: add a status template...
 r25006
# Override the file templates
lfiles = '{if(files,
label('ui.note log.files',
Yuya Nishihara
log: fix status template to list copy source per dest (issue5155)...
 r29000 'files:\n'))}{lfile_mods}{lfile_adds}{lfile_dels}'
Jordi Gutiérrez Hermoso
log: add a status template...
 r25006
Yuya Nishihara
log: fix status template to list copy source per dest (issue5155)...
 r29000 lfile_adds = '{file_adds % "{lfile_add}{lfile_src}"}'
lfile_mods = '{file_mods % "{lfile_mod}{lfile_src}"}'
Jordi Gutiérrez Hermoso
log: add a status template...
 r25006 lfile_add = '{label("status.added", "A {file}\n")}'
Yuya Nishihara
log: fix status template to list copy source per dest (issue5155)...
 r29000 lfile_mod = '{label("status.modified", "M {file}\n")}'
lfile_src = '{ifcontains(file, file_copies_switch,
label("status.copied", " {get(file_copies_switch, file)}\n"))}'
Jordi Gutiérrez Hermoso
log: add a status template...
 r25006
lfile_dels = '{file_dels % "{label('status.removed', 'R {file}\n')}"}'