Mercurial > hg > mercurial
changeset 1047:5bec80ce92ae Lakhnau-2020.2.x release-85882
from trunk: fixed tests for recent hg versions
author | victory.bedrosova |
---|---|
date | Thu, 21 Jan 2021 12:01:07 +0100 |
parents | 63f58969673f |
children | c25f301c57dd |
files | mercurial-common/src/python/load-commands-command.py mercurial-common/src/python/load-substates-command-46.py mercurial-common/src/python/load-substates-command.py mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommandTest.java |
diffstat | 4 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-common/src/python/load-commands-command.py Tue Jan 19 15:35:29 2021 +0300 +++ b/mercurial-common/src/python/load-commands-command.py Thu Jan 21 12:01:07 2021 +0100 @@ -46,10 +46,12 @@ #so here goes command registration and options cmdtable = { - "CMD": (load_commands_command, [], " OUTPUT_FILE") + b"CMD": (load_commands_command, [], b" OUTPUT_FILE") } -commands.norepo += " CMD" +load_commands_command.norepo = True +load_commands_command.optionalrepo = False +load_commands_command.inferrepo = False testedwith = '2.2.2' buglink = "upsource-support@jetbrains.com"
--- a/mercurial-common/src/python/load-substates-command-46.py Tue Jan 19 15:35:29 2021 +0300 +++ b/mercurial-common/src/python/load-substates-command-46.py Thu Jan 21 12:01:07 2021 +0100 @@ -141,7 +141,7 @@ #so here goes command registration and options cmdtable = { - "load-substates": (load_substates_command, [ ], " [options] OUTPUT_FILE") + b"load-substates": (load_substates_command, [ ], b" [options] OUTPUT_FILE") } load_substates_command.norepo = False
--- a/mercurial-common/src/python/load-substates-command.py Tue Jan 19 15:35:29 2021 +0300 +++ b/mercurial-common/src/python/load-substates-command.py Thu Jan 21 12:01:07 2021 +0100 @@ -140,7 +140,7 @@ #so here goes command registration and options cmdtable = { - "load-substates": (load_substates_command, [ ], " [options] OUTPUT_FILE") + b"load-substates": (load_substates_command, [ ], b" [options] OUTPUT_FILE") } load_substates_command.norepo = False
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommandTest.java Tue Jan 19 15:35:29 2021 +0300 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommandTest.java Thu Jan 21 12:01:07 2021 +0100 @@ -39,8 +39,8 @@ assertTrue(cl.getCommandLineString().endsWith(" \"param with spaces\" \"param with quote \\\" rm -rf /\"")); assertTrue(cl.toGeneralCommandLine().getCommandLineString().endsWith(" \"param with spaces\" \"param with quote \\\" rm -rf /\"")); } else { - assertTrue(cl.getCommandLineString().endsWith(" param with spaces param with quote \" rm -rf /")); - assertTrue(cl.toGeneralCommandLine().getCommandLineString().endsWith(" param with spaces param with quote \" rm -rf /")); + assertTrue(cl.getCommandLineString().endsWith(" \"param with spaces\" \"param with quote \" rm -rf /\"")); + assertTrue(cl.toGeneralCommandLine().getCommandLineString().endsWith(" \"param with spaces\" \"param with quote \" rm -rf /\"")); } }