--- a/mercurial/revset.py Sun Oct 16 18:03:24 2016 +0900
+++ b/mercurial/revset.py Sun Feb 19 19:37:14 2017 +0900
@@ -827,8 +827,6 @@
descendants of 'startrev' are returned though renames are (currently) not
followed in this direction.
"""
- from . import context # avoid circular import issues
-
args = getargsdict(x, 'followlines', 'file *lines startrev descend')
if len(args['lines']) != 1:
raise error.ParseError(_("followlines requires a line range"))
@@ -868,12 +866,12 @@
if descend:
rs = generatorset(
(c.rev() for c, _linerange
- in context.blockdescendants(fctx, fromline, toline)),
+ in dagop.blockdescendants(fctx, fromline, toline)),
iterasc=True)
else:
rs = generatorset(
(c.rev() for c, _linerange
- in context.blockancestors(fctx, fromline, toline)),
+ in dagop.blockancestors(fctx, fromline, toline)),
iterasc=False)
return subset & rs