Commit c71a4b31 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

topic: rename stackrel() to stacksubrel()

We have both subscript relations and just relations now.
parent db9a64d12014
......@@ -108,7 +108,7 @@ def stackset(repo, subset, x):
return revset.baseset(stack.stack(repo, branch=branch, topic=topic)[1:]) & subset
if util.safehasattr(revset, 'subscriptrelations'):
def stackrel(repo, subset, x, rel, z, order):
def stacksubrel(repo, subset, x, rel, z, order):
"""This is a revset-flavored implementation of stack aliases.
The syntax is: rev#stack[n] or rev#s[n]. Plenty of logic is borrowed
......@@ -160,8 +160,8 @@ if util.safehasattr(revset, 'subscriptrelations'):
return subset & revset.baseset(revs)
revset.subscriptrelations[b'stack'] = stackrel
revset.subscriptrelations[b's'] = stackrel
revset.subscriptrelations[b'stack'] = stacksubrel
revset.subscriptrelations[b's'] = stacksubrel
def topicrel(repo, subset, x, *args):
subset &= topicset(repo, subset, x)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment