Mercurial > hgsubversion
changeset 1512:6d0fe7ce9898
commands: fix command option registering
A recent patch introduced svnopts as a way of sharing the svn command options
between the old and the new way of registering a command. It turns out 'svnopts'
was already used further up in the module to define the flags that should be
added to *all* Mercurial commands. So our definition of it here cause us to add
all of these options to all Mercurial commands.
This was caught because it changes --rev to be '' instead of [], which breaks a
number of assumptions in the other commands.
Given that none of the subversion tests are command line tests, I'm not sure how
to test this. It was caught in other extensions tests.
(grafted from 3b1334407783a4379fd515e2ed9acc61e3f175ff)
(grafted from 6db63ead5556f2bf72e423ca8c6df08ea3a5b009)
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Wed, 24 May 2017 15:07:00 -0700 |
| parents | cb29f4bffcc7 |
| children | 07c38eee3954 |
| files | hgsubversion/__init__.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgsubversion/__init__.py +++ b/hgsubversion/__init__.py @@ -196,7 +196,7 @@ hg.schemes.update({ 'file': _lookup, 'ht if hgutil.safehasattr(commands, 'optionalrepo'): commands.optionalrepo += ' svn' -svnopts = [ +svncommandopts = [ ('u', 'svn-url', '', 'path to the Subversion server.'), ('', 'stupid', False, 'be stupid and use diffy replay.'), ('A', 'authors', '', 'username mapping filename'), @@ -218,7 +218,7 @@ svnusage = 'hg svn <subcommand> ...' # compatibility until we drop support for 3.7 for templatekeywords and 4.3 for # commands) cmdtable = { - "svn": (svncommands.svn, svnopts, svnusage), + "svn": (svncommands.svn, svncommandopts, svnusage), } try: from mercurial import registrar @@ -228,7 +228,7 @@ try: if hgutil.safehasattr(registrar, 'command'): cmdtable = {} command = registrar.command(cmdtable) - @command('svn', svnopts, svnusage) + @command('svn', svncommandopts, svnusage) def svncommand(*args, **kwargs): return svncommands.svn(*args, **kwargs) except (ImportError, AttributeError):