equal
deleted
inserted
replaced
2608 ) |
2608 ) |
2609 ctx1 = scmutil.revsingle(repo, from_rev, None) |
2609 ctx1 = scmutil.revsingle(repo, from_rev, None) |
2610 ctx2 = scmutil.revsingle(repo, to_rev, None) |
2610 ctx2 = scmutil.revsingle(repo, to_rev, None) |
2611 else: |
2611 else: |
2612 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn') |
2612 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn') |
2613 ctx1, ctx2 = scmutil.revpair(repo, revs) |
2613 ctx1, ctx2 = logcmdutil.revpair(repo, revs) |
2614 |
2614 |
2615 if reverse: |
2615 if reverse: |
2616 ctxleft = ctx2 |
2616 ctxleft = ctx2 |
2617 ctxright = ctx1 |
2617 ctxright = ctx1 |
2618 else: |
2618 else: |
6907 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn') |
6907 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn') |
6908 ctx2 = scmutil.revsingle(repo, change, None) |
6908 ctx2 = scmutil.revsingle(repo, change, None) |
6909 ctx1 = ctx2.p1() |
6909 ctx1 = ctx2.p1() |
6910 else: |
6910 else: |
6911 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn') |
6911 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn') |
6912 ctx1, ctx2 = scmutil.revpair(repo, revs) |
6912 ctx1, ctx2 = logcmdutil.revpair(repo, revs) |
6913 |
6913 |
6914 forcerelativevalue = None |
6914 forcerelativevalue = None |
6915 if ui.hasconfig(b'commands', b'status.relative'): |
6915 if ui.hasconfig(b'commands', b'status.relative'): |
6916 forcerelativevalue = ui.configbool(b'commands', b'status.relative') |
6916 forcerelativevalue = ui.configbool(b'commands', b'status.relative') |
6917 uipathfn = scmutil.getuipathfn( |
6917 uipathfn = scmutil.getuipathfn( |