Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 44885:aac816f584ad
diff: use cmdutil.check_at_most_one_arg() for checking --rev/--change
The same check was done in extdiff as well, so I fixed that too.
There are apparently no tests for this.
Differential Revision: https://phab.mercurial-scm.org/D8510
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 08 May 2020 08:50:47 -0700 |
| parents | a9ff0742c8ea |
| children | 07a6a29d25ea |
line wrap: on
line diff
--- a/mercurial/commands.py Wed May 06 11:40:17 2020 -0700 +++ b/mercurial/commands.py Fri May 08 08:50:47 2020 -0700 @@ -2475,16 +2475,14 @@ Returns 0 on success. """ + cmdutil.check_at_most_one_arg(opts, 'rev', 'change') opts = pycompat.byteskwargs(opts) revs = opts.get(b'rev') change = opts.get(b'change') stat = opts.get(b'stat') reverse = opts.get(b'reverse') - if revs and change: - msg = _(b'cannot specify --rev and --change at the same time') - raise error.Abort(msg) - elif change: + if change: repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn') ctx2 = scmutil.revsingle(repo, change, None) ctx1 = ctx2.p1()