[PATCH] revset: minor changes adding baseset to revsets

Lucas Moscovicz lmoscovicz at fb.com
Mon Feb 10 11:04:14 CST 2014


# HG changeset patch
# User Lucas Moscovicz <lmoscovicz at fb.com>
# Date 1391727445 28800
#      Thu Feb 06 14:57:25 2014 -0800
# Node ID 3925ccf169223cfde890c83d5429f3f533f07214
# Parent  c491d77ac81a96cce64b67c13d381cb01093984b
revset: minor changes adding baseset to revsets

Changed bits of code to work with baseset implementations.

diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -250,7 +250,7 @@
 def orset(repo, subset, x, y):
     xl = getset(repo, subset, x)
     yl = getset(repo, subset - xl, y)
-    return baseset(xl + yl)
+    return xl + yl
 
 def notset(repo, subset, x):
     return subset - getset(repo, subset, x)
@@ -334,7 +334,7 @@
         raise error.ParseError(_("~ expects a number"))
     ps = set()
     cl = repo.changelog
-    for r in getset(repo, cl, x):
+    for r in getset(repo, baseset(cl), x):
         for i in range(n):
             r = cl.parentrevs(r)[0]
         ps.add(r)


More information about the Mercurial-devel mailing list