diff hgext3rd/topic/revset.py @ 5332:801bbfc4e2e8

topic: rename stackrel() to stacksubrel() We have both subscript relations and just relations now.
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 19 May 2020 12:23:29 +0800
parents 426f2800b793
children 028e4ea75456
line wrap: on
line diff
--- a/hgext3rd/topic/revset.py	Sat May 16 16:07:34 2020 +0800
+++ b/hgext3rd/topic/revset.py	Tue May 19 12:23:29 2020 +0800
@@ -108,7 +108,7 @@
     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 @@
 
         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)