hgext/extdiff.py
changeset 44808 aac816f584ad
parent 43790 765a9c299c44
child 44867 8e8fd938ca07
--- a/hgext/extdiff.py	Wed May 06 11:40:17 2020 -0700
+++ b/hgext/extdiff.py	Fri May 08 08:50:47 2020 -0700
@@ -360,14 +360,12 @@
     - just invoke the diff for a single file in the working dir
     '''
 
+    cmdutil.check_at_most_one_arg(opts, b'rev', b'change')
     revs = opts.get(b'rev')
     change = opts.get(b'change')
     do3way = b'$parent2' in cmdline
 
-    if revs and change:
-        msg = _(b'cannot specify --rev and --change at the same time')
-        raise error.Abort(msg)
-    elif change:
+    if change:
         ctx2 = scmutil.revsingle(repo, change, None)
         ctx1a, ctx1b = ctx2.p1(), ctx2.p2()
     else: