##// END OF EJS Templates
rebase: don't use rebased node as dirstate p2 (BC)...
rebase: don't use rebased node as dirstate p2 (BC) When rebasing a node, we currently use the rebased node as p2 in the dirstate until just before we commit it (we then change to the desired parents). This p2 is visible to the user when the rebase gets interrupted because of merge conflicts. That can be useful to the user as a reminder of which commit is currently being rebased, but I believe it's incorrect for a few reasons: * I think the dirstate parents should be the ones that will be set when the commit is created. * I think having two parents means that you're merging those two commits, but when rebasing, you're generally grafting, not merging. * When rebasing a merge commit, we should use the two desired parents as dirstate parents (and we clearly can't have the rebased node as a third dirstate parent). * `hg graft` (and `hg update --merge`) sets only one parent and `hg rebase` should be consistent with that. I realize that this is a somewhat large user-visible change, but I think it's worth it because it will simplify things quite a bit. Differential Revision: https://phab.mercurial-scm.org/D7827

File last commit:

r38469:b45c353e default
r44821:9c9cfecd 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))