##// END OF EJS Templates
rebase: also include commit of collapsed commits in single transaction...
rebase: also include commit of collapsed commits in single transaction When rebase.singletransaction is set, we still used to create a second transaction when committing with --collapse. It's simpler to create a single transaction. Note that in the affected .t file, the test that uses --collapse still appears to create two transactions (it prints "rebase status stored" twice). However, only a single transaction is actually created and the second printout comes from cmdutil.commitforceeditor() that explicitly calls tr.writepending(). Also note the that we now roll back any commits if the user closes the commit message editor with an error code (or leaves the message empty). That might be unfortunate, but it's consistent with how we behave in the --no-collapse case (if the user passed --edit). If we want to change that, I think it should be done consistently in a separate patch. Differential Revision: https://phab.mercurial-scm.org/D2728

File last commit:

r36531:7b74afec default
r36945:17a744c5 default
Show More
narrowtemplates.py
48 lines | 1.4 KiB | text/x-python | PythonLexer
/ hgext / narrow / narrowtemplates.py
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 # narrowtemplates.py - added template keywords for narrow clones
#
# Copyright 2017 Google, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
from mercurial import (
Augie Fackler
narrowtemplates: update to use registrar mechanism...
r36108 registrar,
Augie Fackler
narrow: move from ELLIPSIS_NODE_FLAG to revlog.REVIDX_ELLIPSIS...
r36107 revlog,
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 )
Augie Fackler
narrowtemplates: update to use registrar mechanism...
r36108 keywords = {}
templatekeyword = registrar.templatekeyword(keywords)
revsetpredicate = registrar.revsetpredicate()
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 def _isellipsis(repo, rev):
Augie Fackler
narrow: move from ELLIPSIS_NODE_FLAG to revlog.REVIDX_ELLIPSIS...
r36107 if repo.changelog.flags(rev) & revlog.REVIDX_ELLIPSIS:
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 return True
return False
Yuya Nishihara
templatekw: switch non-showlist template keywords to new API
r36531 @templatekeyword('ellipsis', requires={'repo', 'ctx'})
def ellipsis(context, mapping):
Yuya Nishihara
narrow: drop redundant templatekw/revset names from help text...
r36457 """String. 'ellipsis' if the change is an ellipsis node, else ''."""
Yuya Nishihara
templatekw: switch non-showlist template keywords to new API
r36531 repo = context.resource(mapping, 'repo')
ctx = context.resource(mapping, 'ctx')
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 if _isellipsis(repo, ctx.rev()):
return 'ellipsis'
return ''
Yuya Nishihara
templatekw: switch non-showlist template keywords to new API
r36531 @templatekeyword('outsidenarrow', requires={'repo', 'ctx'})
def outsidenarrow(context, mapping):
Yuya Nishihara
narrow: drop redundant templatekw/revset names from help text...
r36457 """String. 'outsidenarrow' if the change affects no tracked files,
else ''."""
Yuya Nishihara
templatekw: switch non-showlist template keywords to new API
r36531 repo = context.resource(mapping, 'repo')
ctx = context.resource(mapping, 'ctx')
Martin von Zweigbergk
narrow: drop safehasattr() checks for always-present repo.narrowmatch...
r36490 m = repo.narrowmatch()
if not m.always():
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 if not any(m(f) for f in ctx.files()):
return 'outsidenarrow'
return ''
Augie Fackler
narrowtemplates: update to use registrar mechanism...
r36108 @revsetpredicate('ellipsis')
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 def ellipsisrevset(repo, subset, x):
Yuya Nishihara
narrow: drop redundant templatekw/revset names from help text...
r36457 """Changesets that are ellipsis nodes."""
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 return subset.filter(lambda r: _isellipsis(repo, r))