[PATCH 3 of 3] revset: minor changes adding baseset to revsets
Lucas Moscovicz
lmoscovicz at fb.com
Thu Feb 6 18:01:43 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 d725adf344bad2a6cf7ac817f9d882e78a693801
# Parent 3ab8d986e51808fc3e56e63125a6a38a9d0d2418
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
@@ -249,7 +249,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,8 +334,7 @@
for i in range(n):
r = cl.parentrevs(r)[0]
ps.add(r)
- s = subset.set()
- return baseset([r for r in s if r in ps])
+ return baseset([r for r in subset if r in ps])
def author(repo, subset, x):
"""``author(string)``
More information about the Mercurial-devel
mailing list