Mercurial > public > mercurial-scm > hg

comparison mercurial/obsutil.py @ 38587:b62000a28812

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diffutil: remove diffopts() in favor of diffallopts() patch.diffopts() exists only for backward compatibility. We don't need it in new module.
author Yuya Nishihara <yuya@tcha.org>
date Fri, 06 Jul 2018 21:41:36 +0900
parents 79d7d715f3d0
children 1c93e0237a24
comparison
equal deleted inserted replaced
38586:79d7d715f3d0 38587:b62000a28812
393 def _cmpdiff(leftctx, rightctx): 393 def _cmpdiff(leftctx, rightctx):
394 """return True if both ctx introduce the "same diff" 394 """return True if both ctx introduce the "same diff"
395 395
396 This is a first and basic implementation, with many shortcoming. 396 This is a first and basic implementation, with many shortcoming.
397 """ 397 """
398 diffopts = diffutil.diffopts(leftctx.repo().ui, {'git': True}) 398 diffopts = diffutil.diffallopts(leftctx.repo().ui, {'git': True})
399 # Leftctx or right ctx might be filtered, so we need to use the contexts 399 # Leftctx or right ctx might be filtered, so we need to use the contexts
400 # with an unfiltered repository to safely compute the diff 400 # with an unfiltered repository to safely compute the diff
401 leftunfi = leftctx._repo.unfiltered()[leftctx.rev()] 401 leftunfi = leftctx._repo.unfiltered()[leftctx.rev()]
402 leftdiff = leftunfi.diff(opts=diffopts) 402 leftdiff = leftunfi.diff(opts=diffopts)
403 rightunfi = rightctx._repo.unfiltered()[rightctx.rev()] 403 rightunfi = rightctx._repo.unfiltered()[rightctx.rev()]