diff -r 381293e1135e -r d65e246100ed mercurial/help.py --- a/mercurial/help.py Mon Sep 19 17:15:39 2016 -0400 +++ b/mercurial/help.py Sun Oct 09 03:11:18 2016 +0200 @@ -20,7 +20,6 @@ encoding, error, extensions, - fancyopts, filemerge, fileset, minirst, @@ -66,7 +65,6 @@ def optrst(header, options, verbose): data = [] multioccur = False - alllong = set(o[1] for o in options) for option in options: if len(option) == 5: shortopt, longopt, default, desc, optlabel = option @@ -89,16 +87,6 @@ multioccur = True elif (default is not None) and not isinstance(default, bool): lo += " %s" % optlabel - elif longopt not in fancyopts.nevernegate: - if longopt.startswith('no-'): - # This odd if statement guards against showing - # --no-commit and --commit on backout (as a practical - # example) as --[no-]commit in help. - if (longopt[3:]) not in alllong: - lo = '--[no-]' + lo[5:] - else: - if ('no-' + longopt) not in alllong: - lo = '--[no-]' + lo[2:] data.append((so, lo, desc))