equal
deleted
inserted
replaced
3100 diffopts = patch.difffeatureopts(repo.ui, whitespace=True) |
3100 diffopts = patch.difffeatureopts(repo.ui, whitespace=True) |
3101 diffopts.nodates = True |
3101 diffopts.nodates = True |
3102 diffopts.git = True |
3102 diffopts.git = True |
3103 reversehunks = repo.ui.configbool('experimental', |
3103 reversehunks = repo.ui.configbool('experimental', |
3104 'revertalternateinteractivemode', |
3104 'revertalternateinteractivemode', |
3105 False) |
3105 True) |
3106 if reversehunks: |
3106 if reversehunks: |
3107 diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts) |
3107 diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts) |
3108 else: |
3108 else: |
3109 diff = patch.diff(repo, None, ctx.node(), m, opts=diffopts) |
3109 diff = patch.diff(repo, None, ctx.node(), m, opts=diffopts) |
3110 originalchunks = patch.parsepatch(diff) |
3110 originalchunks = patch.parsepatch(diff) |