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

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

split: new extension to split changesets...
split: new extension to split changesets This diff introduces an experimental split extension to split changesets. The implementation is largely inspired by Laurent Charignon's implementation for mutable-history (changeset 9603aa1ecdfd54b0d86e262318a72e0a2ffeb6cc [1]) This version contains various improvements: - Rebase by default. This is more friendly for new users. Split won't lead to merge conflicts so a rebase won't give the user more trouble. This has been on by default at Facebook for months now and seems to be a good UX improvement. The rebase skips obsoleted or orphaned changesets, which can avoid issues like allowdivergence, merge conflicts, etc. This is more flexible because the user can decide what to do next (see the last test case in test-split.t) - Remove "Done split? [y/n]" prompt. That could be detected by checking `repo.status()` instead. - Works with obsstore disabled. Without obsstore, split uses strip to clean up old nodes, and it can even handle split a non-head changeset with "allowunstable" disabled, since it runs a rebase to solve the "unstable" issue in a same transaction. - More friendly editor text. Put what has been already split into the editor text so users won't lost track about where they are. [1]: https://bitbucket.org/marmoute/mutable-history/commits/9603aa1ecdfd54b Differential Revision: https://phab.mercurial-scm.org/D1082
Denis Laxalde - - Load All Authors

File last commit:

r34878:eb24f1d1 default
r35471:02ea370c @7 default
Show More
map-cmdline.show
21 lines | 1.0 KiB | text/plain | TextLexer
/ mercurial / templates / map-cmdline.show
History | Source | Raw |Copy content |Copy permalink
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)})")}'
names_tags = '{if(names % "{ifeq(name, 'tip', '', name)}", " ({label('log.{colorname}', join(names % "{ifeq(name, 'tip', '', name)}", ' '))})")}'
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)}'