mercurial/obsutil.py

40527:1b49b84d5ed5

def _cmpdiff(leftctx, rightctx):
    """return True if both ctx introduce the "same diff"

    This is a first and basic implementation, with many shortcoming.
    """
    diffopts = diffutil.diffallopts(leftctx.repo().ui, {'git': True})
    # Leftctx or right ctx might be filtered, so we need to use the contexts
    # with an unfiltered repository to safely compute the diff
    leftunfi = leftctx._repo.unfiltered()[leftctx.rev()]
    leftdiff = leftunfi.diff(opts=diffopts)
    rightunfi = rightctx._repo.unfiltered()[rightctx.rev()]
    rightdiff = rightunfi.diff(opts=diffopts)

    left, right = (0, 0)
    while None not in (left, right):
        left = _getdifflines(leftdiff)

40528:520514af2d93

def _cmpdiff(leftctx, rightctx):
    """return True if both ctx introduce the "same diff"

    This is a first and basic implementation, with many shortcoming.
    """
    # lefctx.repo() and rightctx.repo() are the same here
    repo = leftctx.repo()
    diffopts = diffutil.diffallopts(repo.ui, {'git': True})
    # Leftctx or right ctx might be filtered, so we need to use the contexts
    # with an unfiltered repository to safely compute the diff
    leftunfi = repo.unfiltered()[leftctx.rev()]
    leftdiff = leftunfi.diff(opts=diffopts)
    rightunfi = repo.unfiltered()[rightctx.rev()]
    rightdiff = rightunfi.diff(opts=diffopts)

    left, right = (0, 0)
    while None not in (left, right):
        left = _getdifflines(leftdiff)