equal
deleted
inserted
replaced
394 """ |
394 """ |
395 |
395 |
396 # Leftctx or right ctx might be filtered, so we need to use the contexts |
396 # Leftctx or right ctx might be filtered, so we need to use the contexts |
397 # with an unfiltered repository to safely compute the diff |
397 # with an unfiltered repository to safely compute the diff |
398 leftunfi = leftctx._repo.unfiltered()[leftctx.rev()] |
398 leftunfi = leftctx._repo.unfiltered()[leftctx.rev()] |
399 leftdiff = leftunfi.diff(git=1) |
399 leftdiff = leftunfi.diff(opts={'git': True}) |
400 rightunfi = rightctx._repo.unfiltered()[rightctx.rev()] |
400 rightunfi = rightctx._repo.unfiltered()[rightctx.rev()] |
401 rightdiff = rightunfi.diff(git=1) |
401 rightdiff = rightunfi.diff(opts={'git': True}) |
402 |
402 |
403 left, right = (0, 0) |
403 left, right = (0, 0) |
404 while None not in (left, right): |
404 while None not in (left, right): |
405 left = _getdifflines(leftdiff) |
405 left = _getdifflines(leftdiff) |
406 right = _getdifflines(rightdiff) |
406 right = _getdifflines(rightdiff) |