--- a/mercurial/cmdutil.py Sat Feb 18 18:00:01 2017 +0900
+++ b/mercurial/cmdutil.py Sun Feb 19 18:16:09 2017 +0900
@@ -41,6 +41,7 @@
revlog,
revset,
scmutil,
+ smartset,
templatekw,
templater,
util,
@@ -2090,11 +2091,11 @@
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 @@
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 @@
if idx >= limit:
break
limitedrevs.append(rev)
- revs = revset.baseset(limitedrevs)
+ revs = smartset.baseset(limitedrevs)
return revs, expr, filematcher
@@ -2140,7 +2141,7 @@
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 @@
if limit <= idx:
break
limitedrevs.append(r)
- revs = revset.baseset(limitedrevs)
+ revs = smartset.baseset(limitedrevs)
return revs, expr, filematcher