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

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

unshelve: disable unshelve during merge (issue5123)...
unshelve: disable unshelve during merge (issue5123) As stated in the issue5123, unshelve can destroy the second parent of the context when tried to unshelve with an uncommitted merge. This patch makes unshelve to abort when called with an uncommitted merge. See how shelve.mergefiles works. Commit structure looks like this: ``` ... -> pctx -> tmpwctx -> shelvectx / / second merge parent pctx = parent before merging working context(first merge parent) tmpwctx = commited working directory after merge(with two parents) shelvectx = shelved context ``` shelve.mergefiles first updates to pctx then it reverts shelvectx to pctx with: ``` cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), *pathtofiles(repo, files), **{'no_backup': True}) ``` Reverting tmpwctx files that were merged from second parent to pctx makes them added because they are not in pctx. Changing this revert operation is crucial to restore parents after unshelve. This is a complicated issue as this is not fixing a regression. Thus, for the time being, unshelve during an uncommitted merge can be aborted. (Details taken from http://mercurial.808500.n3.nabble.com/PATCH-V3-shelve-restore-parents-after-unshelve-issue5123-tt4036858.html#a4037408) Differential Revision: https://phab.mercurial-scm.org/D6169
Yuya Nishihara - - Load All Authors

File last commit:

r38469:b45c353e default
r42217:03f6480b default
Show More
map-cmdline.show
25 lines | 1.1 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)})")}'
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))