##// END OF EJS Templates
rebase: introduce support for automatically rebasing orphan changes...
rebase: introduce support for automatically rebasing orphan changes _destautorebase(SRC) is based on the _destrestack(SRC) revset from fbamend. The supporting _possibledestination function is extracted from evolve, with minor cleanups. We've considered some alternatives here: * This change, but with --auto as the flag name. We're hedging our bets on this a little in this change so that if this ends up being the wrong direction we haven't burned the valauble --auto name on rebase. * --destination auto: I've got reservations about the discoverability of this, and we don't currently have a good story for a revset alias of sorts that changes behavior depending on the context in which it's used. * A "rebase presets" feature, where we could use the currently-an-error positional argument space for the rebase command to define presets, so that users could define a 'linearize' preset that specifies --revision='orphan()-obsolete()' and --dest=_destautoorphanrebase(SRC). Personally, I find the third option somewhat appealing, but am hesitant to "spend" the functionality space of positional arguments to the rebase command. We should revisit the way we expose this functionality sometime in the 4.7 cycle once we've had a chance to vet the implementation of the functionality. Differential Revision: https://phab.mercurial-scm.org/D2668

File last commit:

r36531:7b74afec default
r37805:92213f67 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))