Mercurial > hg
comparison hgext/extdiff.py @ 48118:5105a9975407
errors: raise InputError from revsingle() iff revset provided by the user
Same reasoning as for `revrange()` in an earlier patch.
Differential Revision: https://phab.mercurial-scm.org/D11562
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 28 Sep 2021 15:11:22 -0700 |
parents | b74e128676d4 |
children | 6000f5b25c9b |
comparison
equal
deleted
inserted
replaced
48117:b74e128676d4 | 48118:5105a9975407 |
---|---|
557 to_rev = opts.get(b'to') | 557 to_rev = opts.get(b'to') |
558 change = opts.get(b'change') | 558 change = opts.get(b'change') |
559 do3way = b'$parent2' in cmdline | 559 do3way = b'$parent2' in cmdline |
560 | 560 |
561 if change: | 561 if change: |
562 ctx2 = scmutil.revsingle(repo, change, None) | 562 ctx2 = logcmdutil.revsingle(repo, change, None) |
563 ctx1a, ctx1b = ctx2.p1(), ctx2.p2() | 563 ctx1a, ctx1b = ctx2.p1(), ctx2.p2() |
564 elif from_rev or to_rev: | 564 elif from_rev or to_rev: |
565 repo = scmutil.unhidehashlikerevs( | 565 repo = scmutil.unhidehashlikerevs( |
566 repo, [from_rev] + [to_rev], b'nowarn' | 566 repo, [from_rev] + [to_rev], b'nowarn' |
567 ) | 567 ) |
568 ctx1a = scmutil.revsingle(repo, from_rev, None) | 568 ctx1a = logcmdutil.revsingle(repo, from_rev, None) |
569 ctx1b = repo[nullrev] | 569 ctx1b = repo[nullrev] |
570 ctx2 = scmutil.revsingle(repo, to_rev, None) | 570 ctx2 = logcmdutil.revsingle(repo, to_rev, None) |
571 else: | 571 else: |
572 ctx1a, ctx2 = logcmdutil.revpair(repo, revs) | 572 ctx1a, ctx2 = logcmdutil.revpair(repo, revs) |
573 if not revs: | 573 if not revs: |
574 ctx1b = repo[None].p2() | 574 ctx1b = repo[None].p2() |
575 else: | 575 else: |