##// END OF EJS Templates
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

File last commit:

r38469:b45c353e default
r47592:80cac993 default
Show More
map-cmdline.show
25 lines | 1.1 KiB | text/plain | TextLexer
Gregory Szorc
show: add basic labels to work template...
r32059 # TODO there are a few deficiencies in this file:
# * The "namespace" of the labels needs to be worked out. We currently
# piggyback on existing values so color works.
Denis Laxalde
show: use labelcset() template alias for work (and stack) views...
r34878
%include map-cmdline.default
Yuya Nishihara
templater: load template fragments from [templates] section in map file...
r34715
[templates]
Gregory Szorc
show: pass the minimum length for nodes as a template keyword...
r34191 showbookmarks = '{if(active, "*", " ")} {pad(bookmark, longestbookmarklen + 4)}{shortest(node, nodelen)}\n'
Gregory Szorc
show: construct changeset templater during dispatch...
r33046
Gregory Szorc
show: show all namespaces in "work" view...
r33050 showwork = '{cset_shortnode}{namespaces % cset_namespace} {cset_shortdesc}'
Gregory Szorc
show: implement "stack" view...
r33194 showstack = '{showwork}'
Gregory Szorc
show: construct changeset templater during dispatch...
r33046
Denis Laxalde
show: use labelcset() template alias for work (and stack) views...
r34878 cset_shortnode = '{labelcset(shortest(node, nodelen))}'
Gregory Szorc
show: show all namespaces in "work" view...
r33050
# Treat branch and tags specially so we don't display "default" or "tip"
cset_namespace = '{ifeq(namespace, "branches", names_branches, ifeq(namespace, "tags", names_tags, names_others))}'
names_branches = '{ifeq(branch, "default", "", " ({label('log.{colorname}', branch)})")}'
Yuya Nishihara
show: use filter() function to strip "tip" tag...
r38469 names_tags = '{if(filter_tags(names),
" ({label('log.{colorname}', join(filter_tags(names), ' '))})")}'
Gregory Szorc
show: show all namespaces in "work" view...
r33050 names_others = '{if(names, " ({label('log.{colorname}', join(names, ' '))})")}'
Gregory Szorc
show: construct changeset templater during dispatch...
r33046 cset_shortdesc = '{label("log.description", desc|firstline)}'
Yuya Nishihara
show: use filter() function to strip "tip" tag...
r38469
[templatealias]
filter_tags(names) = filter(names, ifeq(name, 'tip', '', name))