diff mercurial/revset.py @ 31093:0e07855e6054

context: also return ancestor's line range in blockancestors
author Denis Laxalde <denis.laxalde@logilab.fr>
date Mon, 16 Jan 2017 17:14:36 +0100
parents 0b8356705de6
children 080734cd2440
line wrap: on
line diff
--- a/mercurial/revset.py	Mon Jan 16 17:08:25 2017 +0100
+++ b/mercurial/revset.py	Mon Jan 16 17:14:36 2017 +0100
@@ -952,7 +952,8 @@
     fromline -= 1
 
     fctx = repo[rev].filectx(fname)
-    revs = (c.rev() for c in context.blockancestors(fctx, fromline, toline))
+    revs = (c.rev() for c, _linerange
+            in context.blockancestors(fctx, fromline, toline))
     return subset & generatorset(revs, iterasc=False)
 
 @predicate('all()', safe=True)