Show More
@@ -2489,10 +2489,13 b' def diff(ui, repo, *pats, **opts):' | |||||
2489 | else: |
|
2489 | else: | |
2490 | repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn') |
|
2490 | repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn') | |
2491 | ctx1, ctx2 = scmutil.revpair(repo, revs) |
|
2491 | ctx1, ctx2 = scmutil.revpair(repo, revs) | |
2492 | node1, node2 = ctx1.node(), ctx2.node() |
|
|||
2493 |
|
2492 | |||
2494 | if reverse: |
|
2493 | if reverse: | |
2495 | node1, node2 = node2, node1 |
|
2494 | ctxleft = ctx2 | |
|
2495 | ctxright = ctx1 | |||
|
2496 | else: | |||
|
2497 | ctxleft = ctx1 | |||
|
2498 | ctxright = ctx2 | |||
2496 |
|
2499 | |||
2497 | diffopts = patch.diffallopts(ui, opts) |
|
2500 | diffopts = patch.diffallopts(ui, opts) | |
2498 | m = scmutil.match(ctx2, pats, opts) |
|
2501 | m = scmutil.match(ctx2, pats, opts) | |
@@ -2502,8 +2505,8 b' def diff(ui, repo, *pats, **opts):' | |||||
2502 | ui, |
|
2505 | ui, | |
2503 | repo, |
|
2506 | repo, | |
2504 | diffopts, |
|
2507 | diffopts, | |
2505 | repo[node1], |
|
2508 | ctxleft, | |
2506 | repo[node2], |
|
2509 | ctxright, | |
2507 | m, |
|
2510 | m, | |
2508 | stat=stat, |
|
2511 | stat=stat, | |
2509 | listsubrepos=opts.get(b'subrepos'), |
|
2512 | listsubrepos=opts.get(b'subrepos'), |
General Comments 0
You need to be logged in to leave comments.
Login now