Mercurial > evolve
view hgext3rd/topic/revset.py @ 2712:f19b314d8475
topics: add t0 and b0 to the stack
t0 or b0 will be the base of the stack and it's the parent of t1 or b1. The cool
thing about this is that if you update to t0 using `hg up t0` or do `hg prev` on
t1, you will be updated to t0 with the current topic preserved.
This patch adds t0 to stack and implement the preserving topic case for t0 while
using `hg update`.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Tue, 04 Jul 2017 01:30:14 +0530 |
parents | 96843c68acc8 |
children | b3abdb3d819e |
line wrap: on
line source
from __future__ import absolute_import from mercurial import ( revset, util, ) from . import ( constants, destination, stack, ) try: mkmatcher = revset._stringmatcher except AttributeError: mkmatcher = util.stringmatcher def topicset(repo, subset, x): """`topic([topic])` Specified topic or all changes with any topic specified. If `topic` starts with `re:` the remainder of the name is treated as a regular expression. TODO: make `topic(revset)` work the same as `branch(revset)`. """ args = revset.getargs(x, 0, 1, 'topic takes one or no arguments') if args: # match a specific topic topic = revset.getstring(args[0], 'topic() argument must be a string') if topic == '.': topic = repo['.'].extra().get('topic', '') _kind, _pattern, matcher = mkmatcher(topic) else: matcher = lambda t: bool(t) mutable = revset._notpublic(repo, revset.fullreposet(repo), ()) rawchange = repo.changelog.changelogrevision key = constants.extrakey def matchtopic(r): topic = rawchange(r).extra.get(key) if topic is None: return False return matcher(topic) return (subset & mutable).filter(matchtopic) def ngtipset(repo, subset, x): """`ngtip([branch])` The untopiced tip. Name is horrible so that people change it. """ args = revset.getargs(x, 1, 1, 'topic takes one') # match a specific topic branch = revset.getstring(args[0], 'ngtip() argument must be a string') if branch == '.': branch = repo['.'].branch() return subset & revset.baseset(destination.ngtip(repo, branch)) def stackset(repo, subset, x): """`stack()` All relevant changes in the current topic, This is roughly equivalent to 'topic(.) - obsolete' with a sorting moving unstable changeset after there future parent (as if evolve where already run).""" err = 'stack() takes no argument, it works on current topic' revset.getargs(x, 0, 0, err) topic = repo.currenttopic topic = None branch = None if not topic and repo.currenttopic: topic = repo.currenttopic if not topic: branch = repo[None].branch() return revset.baseset(stack.getstack(repo, branch=branch, topic=topic)[1:]) & subset def modsetup(ui): revset.symbols.update({'topic': topicset}) revset.symbols.update({'ngtip': ngtipset}) revset.symbols.update({'stack': stackset})