mercurial: comparison mercurial/revset.py

equal deleted inserted replaced

-:5ec6321f49a9
+:2ac278aab2b4
 raise util.Abort(_("no bookmarks exist that match '%s'")
 % pattern)
 bmrevs = set()
 for bmrev in matchrevs:
 bmrevs.add(repo[bmrev].rev())
-s = subset.set()
+return subset & bmrevs
-return baseset([r for r in s if r in bmrevs])
 bms = set([repo[r].rev()
 for r in repo._bookmarks.values()])
 s = subset.set()
 return baseset([r for r in s if r in bms])
 Only non-public and non-obsolete changesets can be `bumped`.
 """
 # i18n: "bumped" is a keyword
 getargs(x, 0, 0, _("bumped takes no arguments"))
 bumped = obsmod.getrevs(repo, 'bumped')
-return baseset([r for r in subset if r in bumped])
+return subset & bumped
 def bundle(repo, subset, x):
 """``bundle()``
 Changesets in the bundle.
 try:
 bundlerevs = repo.changelog.bundlerevs
 except AttributeError:
 raise util.Abort(_("no bundle provided - specify with -R"))
-return baseset([r for r in subset if r in bundlerevs])
+return subset & bundlerevs
 def checkstatus(repo, subset, pat, field):
 m = None
 s = []
 hasset = matchmod.patkind(pat) == 'set'
 """``children(set)``
 Child changesets of changesets in set.
 """
 s = getset(repo, baseset(repo), x).set()
 cs = _children(repo, subset, s)
-return baseset([r for r in subset if r in cs])
+return subset & cs
 def closed(repo, subset, x):
 """``closed()``
 Changeset is closed.
 """
 Obsolete changesets with obsolete descendants only.
 """
 # i18n: "extinct" is a keyword
 getargs(x, 0, 0, _("extinct takes no arguments"))
 extincts = obsmod.getrevs(repo, 'extinct')
-return baseset([r for r in subset if r in extincts])
+return subset & extincts
 def extra(repo, subset, x):
 """``extra(label, [value])``
 Changesets with the given label in the extra metadata, with the given
 optional value.
 Hidden changesets.
 """
 # i18n: "hidden" is a keyword
 getargs(x, 0, 0, _("hidden takes no arguments"))
 hiddenrevs = repoview.filterrevs(repo, 'visible')
-return baseset([r for r in subset if r in hiddenrevs])
+return subset & hiddenrevs
 def keyword(repo, subset, x):
 """``keyword(string)``
 Search commit message, user name, and names of changed files for
 string. The match is case-insensitive.
 """``obsolete()``
 Mutable changeset with a newer version."""
 # i18n: "obsolete" is a keyword
 getargs(x, 0, 0, _("obsolete takes no arguments"))
 obsoletes = obsmod.getrevs(repo, 'obsolete')
-return baseset([r for r in subset if r in obsoletes])
+return subset & obsoletes
 def origin(repo, subset, x):
 """``origin([set])``
 Changesets that were specified as a source for the grafts, transplants or
 rebases that created the given revisions.  Omitting the optional set is the
 ps = set()
 cl = repo.changelog
 for r in getset(repo, baseset(repo), x):
 ps.add(cl.parentrevs(r)[0])
-s = subset.set()
+return subset & ps
-return baseset([r for r in s if r in ps])
 def p2(repo, subset, x):
 """``p2([set])``
 Second parent of changesets in set, or the working directory.
 """
 ps = set()
 cl = repo.changelog
 for r in getset(repo, baseset(repo), x):
 ps.add(cl.parentrevs(r)[1])
-s = subset.set()
+return subset & ps
-return baseset([r for r in s if r in ps])
 def parents(repo, subset, x):
 """``parents([set])``
 The set of all parents for all changesets in set, or the working directory.
 """
 if x is None:
 ps = tuple(p.rev() for p in repo[x].parents())
-return baseset([r for r in subset if r in ps])
+return subset & ps
 ps = set()
 cl = repo.changelog
 for r in getset(repo, baseset(repo), x):
 ps.update(cl.parentrevs(r))
-s = subset.set()
+return subset & ps
-return baseset([r for r in s if r in ps])
 def parentspec(repo, subset, x, n):
 """``set^0``
 The set.
 ``set^1`` (or ``set^``), ``set^2``
 ps.add(cl.parentrevs(r)[0])
 elif n == 2:
 parents = cl.parentrevs(r)
 if len(parents) > 1:
 ps.add(parents[1])
-s = subset.set()
+return subset & ps
-return baseset([r for r in s if r in ps])
 def present(repo, subset, x):
 """``present(set)``
 An empty set, if any revision in set isn't found; otherwise,
 all revisions in set.
 s = set([repo[tn].rev()])
 else:
 s = set([cl.rev(n) for t, n in repo.tagslist() if matcher(t)])
 else:
 s = set([cl.rev(n) for t, n in repo.tagslist() if t != 'tip'])
-return baseset([r for r in subset if r in s])
+return subset & s
 def tagged(repo, subset, x):
 return tag(repo, subset, x)
 def unstable(repo, subset, x):
 Non-obsolete changesets with obsolete ancestors.
 """
 # i18n: "unstable" is a keyword
 getargs(x, 0, 0, _("unstable takes no arguments"))
 unstables = obsmod.getrevs(repo, 'unstable')
-return baseset([r for r in subset if r in unstables])
+return subset & unstables
 def user(repo, subset, x):
 """``user(string)``
 User name contains string. The match is case-insensitive.
 s = x.set()
 else:
 s = set(x)
 return baseset(self.set() - s)
+def __and__(self, x):
+s = self.set()
+if isinstance(x, baseset):
+x = x.set()
+return baseset([y for y in s if y in x])
 # tell hggettext to extract docstrings from these functions:
 i18nfunctions = symbols.values()

changeset 20367	2ac278aab2b4
parent 20366	5ec6321f49a9
child 20393	b0638b5b004d