Mercurial > hg
changeset 35223:4edd2202f7d7
dispatch: alias --repo to --repository while parsing early options
This prepares for replacing old _early*opt() functions. My initial attempt
was to extend options table to support 'repository|repo' syntax. It worked,
but seemed too invasive. So I decided to add an optional argument to
fancyopts() instead.
This also changes the nevernegate dict to be keyed by a canonical_name,
not by an option-name for clarity.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 25 Nov 2017 17:03:52 +0900 |
| parents | 66c11a66ad1a |
| children | 6e6d0a5b88e6 |
| files | mercurial/dispatch.py mercurial/fancyopts.py tests/test-dispatch.t |
| diffstat | 3 files changed, 34 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dispatch.py Mon Dec 04 19:08:41 2017 +0800 +++ b/mercurial/dispatch.py Sat Nov 25 17:03:52 2017 +0900 @@ -649,7 +649,8 @@ def _earlyparseopts(args): options = {} fancyopts.fancyopts(args, commands.globalopts, options, - gnu=False, early=True) + gnu=False, early=True, + optaliases={'repository': ['repo']}) return options def _earlygetopt(aliases, args, strip=True):
--- a/mercurial/fancyopts.py Mon Dec 04 19:08:41 2017 +0800 +++ b/mercurial/fancyopts.py Sat Nov 25 17:03:52 2017 +0900 @@ -226,7 +226,7 @@ return opts, args -def fancyopts(args, options, state, gnu=False, early=False): +def fancyopts(args, options, state, gnu=False, early=False, optaliases=None): """ read args, parse options, and store options in state @@ -246,8 +246,15 @@ integer - parameter strings is stored as int function - call function with parameter + optaliases is a mapping from a canonical option name to a list of + additional long options. This exists for preserving backward compatibility + of early options. If we want to use it extensively, please consider moving + the functionality to the options table (e.g separate long options by '|'.) + non-option args are returned """ + if optaliases is None: + optaliases = {} namelist = [] shortlist = '' argmap = {} @@ -261,10 +268,13 @@ else: short, name, default, comment = option # convert opts to getopt format - oname = name + onames = [name] + onames.extend(optaliases.get(name, [])) name = name.replace('-', '_') - argmap['-' + short] = argmap['--' + oname] = name + argmap['-' + short] = name + for n in onames: + argmap['--' + n] = name defmap[name] = default # copy defaults to state @@ -279,24 +289,24 @@ if not (default is None or default is True or default is False): if short: short += ':' - if oname: - oname += '=' - elif oname not in nevernegate: - if oname.startswith('no-'): - insert = oname[3:] - else: - insert = 'no-' + oname - # backout (as a practical example) has both --commit and - # --no-commit options, so we don't want to allow the - # negations of those flags. - if insert not in alllong: - assert ('--' + oname) not in negations - negations['--' + insert] = '--' + oname - namelist.append(insert) + onames = [n + '=' for n in onames] + elif name not in nevernegate: + for n in onames: + if n.startswith('no-'): + insert = n[3:] + else: + insert = 'no-' + n + # backout (as a practical example) has both --commit and + # --no-commit options, so we don't want to allow the + # negations of those flags. + if insert not in alllong: + assert ('--' + n) not in negations + negations['--' + insert] = '--' + n + namelist.append(insert) if short: shortlist += short if name: - namelist.append(oname) + namelist.extend(onames) # parse arguments if early:
--- a/tests/test-dispatch.t Mon Dec 04 19:08:41 2017 +0800 +++ b/tests/test-dispatch.t Sat Nov 25 17:03:52 2017 +0900 @@ -150,6 +150,10 @@ [255] $ HGPLAIN=+strictflags hg --cwd .. -q -Ra log -b default 0:cb9a9f314b8b + $ HGPLAIN=+strictflags hg --cwd .. -q --repository a log -b default + 0:cb9a9f314b8b + $ HGPLAIN=+strictflags hg --cwd .. -q --repo a log -b default + 0:cb9a9f314b8b For compatibility reasons, HGPLAIN=+strictflags is not enabled by plain HGPLAIN: