diff mercurial/cmdutil.py @ 43926:daed70e95d60

rebase: use cmdutil.check_at_most_one_arg() for --confirm/--dry-run I've also updated the helper to work with the hyphenated --dry-run option. Differential Revision: https://phab.mercurial-scm.org/D7641
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 13 Dec 2019 14:49:48 -0800
parents fff21278554b
children 4ca89cc20d02
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Tue Dec 17 21:25:54 2019 -0500
+++ b/mercurial/cmdutil.py	Fri Dec 13 14:49:48 2019 -0800
@@ -268,6 +268,7 @@
     previous = None
     for x in args:
         if opts.get(x):
+            x = x.replace(b'_', b'-')
             if previous:
                 raise error.Abort(
                     _(b'cannot specify both --%s and --%s') % (previous, x)