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

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

reabase: call rewriteutil.precheck() a bit later...
reabase: call rewriteutil.precheck() a bit later We now filter out descendants of divergence-causing commits in `_handleskippingobsolete()`. The filtered-out commits are removed from the rebase set (`destmap` and `state`). We should therefore call `rewriteutil.precheck()` after `_handleskippingobsolete()`. This patch does that. It hasn't mattered so far because `rewriteutil.precheck()` doesn't yet check for divergence, but it will soon. This affects one test where we now fail because the user is trying to rebase an ancestor instead of failing because they tried to rebase a public commit. We have several similar tests just after, where we still fail because of the phase, so that seems fine. The difference in behavior also seems fine to me. Differential Revision: https://phab.mercurial-scm.org/D10258
Yuya Nishihara - - Load All Authors

File last commit:

r38982:f9a98075 default
r47592:80cac993 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')}"}'