[PATCH 1 of 3] revset: import set classes directly from smartset module
Yuya Nishihara
yuya at tcha.org
Sun Feb 19 13:12:04 UTC 2017
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1487495769 -32400
# Sun Feb 19 18:16:09 2017 +0900
# Node ID 211cf331f8cf94d8fa1d2324f7cee5047124e8e6
# Parent 22722c297b33c2f68a8a34e0b0be0e6a9e0f4759
revset: import set classes directly from smartset module
Follows up 1be65deb3d54.
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -22,8 +22,8 @@ from mercurial import (
match as matchmod,
pathutil,
registrar,
- revset,
scmutil,
+ smartset,
util,
)
@@ -855,7 +855,7 @@ def pulledrevsetsymbol(repo, subset, x):
firstpulled = repo.firstpulled
except AttributeError:
raise error.Abort(_("pulled() only available in --lfrev"))
- return revset.baseset([r for r in subset if r >= firstpulled])
+ return smartset.baseset([r for r in subset if r >= firstpulled])
def overrideclone(orig, ui, source, dest=None, **opts):
d = dest
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -91,6 +91,7 @@ from mercurial import (
registrar,
revset,
scmutil,
+ smartset,
subrepo,
util,
)
@@ -3569,7 +3570,7 @@ def revsetmq(repo, subset, x):
"""
revset.getargs(x, 0, 0, _("mq takes no arguments"))
applied = set([repo[r.node].rev() for r in repo.mq.applied])
- return revset.baseset([r for r in subset if r in applied])
+ return smartset.baseset([r for r in subset if r in applied])
# tell hggettext to extract docstrings from these functions:
i18nfunctions = [revsetmq]
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -47,6 +47,7 @@ from mercurial import (
repoview,
revset,
scmutil,
+ smartset,
util,
)
@@ -118,8 +119,8 @@ def _revsetdestrebase(repo, subset, x):
# i18n: "_rebasedefaultdest" is a keyword
sourceset = None
if x is not None:
- sourceset = revset.getset(repo, revset.fullreposet(repo), x)
- return subset & revset.baseset([_destrebase(repo, sourceset)])
+ sourceset = revset.getset(repo, smartset.fullreposet(repo), x)
+ return subset & smartset.baseset([_destrebase(repo, sourceset)])
class rebaseruntime(object):
"""This class is a container for rebase runtime state"""
diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -33,6 +33,7 @@ from mercurial import (
revlog,
revset,
scmutil,
+ smartset,
util,
)
@@ -723,7 +724,7 @@ def revsettransplanted(repo, subset, x):
s = revset.getset(repo, subset, x)
else:
s = subset
- return revset.baseset([r for r in s if
+ return smartset.baseset([r for r in s if
repo[r].extra().get('transplant_source')])
templatekeyword = registrar.templatekeyword()
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -41,6 +41,7 @@ from . import (
revlog,
revset,
scmutil,
+ smartset,
templatekw,
templater,
util,
@@ -2090,11 +2091,11 @@ def _logrevs(repo, opts):
if opts.get('rev'):
revs = scmutil.revrange(repo, opts['rev'])
elif follow and repo.dirstate.p1() == nullid:
- revs = revset.baseset()
+ revs = smartset.baseset()
elif follow:
revs = repo.revs('reverse(:.)')
else:
- revs = revset.spanset(repo)
+ revs = smartset.spanset(repo)
revs.reverse()
return revs
@@ -2109,7 +2110,7 @@ def getgraphlogrevs(repo, pats, opts):
limit = loglimit(opts)
revs = _logrevs(repo, opts)
if not revs:
- return revset.baseset(), None, None
+ return smartset.baseset(), None, None
expr, filematcher = _makelogrevset(repo, pats, opts, revs)
if opts.get('rev'):
# User-specified revs might be unsorted, but don't sort before
@@ -2125,7 +2126,7 @@ def getgraphlogrevs(repo, pats, opts):
if idx >= limit:
break
limitedrevs.append(rev)
- revs = revset.baseset(limitedrevs)
+ revs = smartset.baseset(limitedrevs)
return revs, expr, filematcher
@@ -2140,7 +2141,7 @@ def getlogrevs(repo, pats, opts):
limit = loglimit(opts)
revs = _logrevs(repo, opts)
if not revs:
- return revset.baseset([]), None, None
+ return smartset.baseset([]), None, None
expr, filematcher = _makelogrevset(repo, pats, opts, revs)
if expr:
matcher = revset.match(repo.ui, expr, order=revset.followorder)
@@ -2151,7 +2152,7 @@ def getlogrevs(repo, pats, opts):
if limit <= idx:
break
limitedrevs.append(r)
- revs = revset.baseset(limitedrevs)
+ revs = smartset.baseset(limitedrevs)
return revs, expr, filematcher
diff --git a/mercurial/graphmod.py b/mercurial/graphmod.py
--- a/mercurial/graphmod.py
+++ b/mercurial/graphmod.py
@@ -22,6 +22,7 @@ from __future__ import absolute_import
from .node import nullrev
from . import (
revset,
+ smartset,
util,
)
@@ -67,8 +68,8 @@ def dagwalker(repo, revs):
if gp is None:
# precompute slow query as we know reachableroots() goes
# through all revs (issue4782)
- if not isinstance(revs, revset.baseset):
- revs = revset.baseset(revs)
+ if not isinstance(revs, smartset.baseset):
+ revs = smartset.baseset(revs)
gp = gpcache[mpar] = sorted(set(revset.reachableroots(
repo, revs, [mpar])))
if not gp:
diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py
+++ b/mercurial/hgweb/webcommands.py
@@ -33,6 +33,7 @@ from .. import (
graphmod,
revset,
scmutil,
+ smartset,
templatefilters,
templater,
util,
@@ -1148,7 +1149,7 @@ def graph(web, req, tmpl):
# We have to feed a baseset to dagwalker as it is expecting smartset
# object. This does not have a big impact on hgweb performance itself
# since hgweb graphing code is not itself lazy yet.
- dag = graphmod.dagwalker(web.repo, revset.baseset(revs))
+ dag = graphmod.dagwalker(web.repo, smartset.baseset(revs))
# As we said one line above... not lazy.
tree = list(graphmod.colored(dag, web.repo))
More information about the Mercurial-devel
mailing list