# HG changeset patch
# User victory.bedrosova
# Date 1611226867 -3600
# Node ID a377f996514e4b9dfc66a4f47196cd4a6d3aa82d
# Parent  c1c70b506d457801729236c9cc7adf98e43da620
from trunk: fixed tests for recent hg versions
(grafted from 5bec80ce92ae32b6e271be3131dcfbd4cebbf918)

diff -r c1c70b506d45 -r a377f996514e mercurial-common/src/python/load-commands-command.py
--- a/mercurial-common/src/python/load-commands-command.py	Thu Oct 15 11:20:01 2020 +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"
diff -r c1c70b506d45 -r a377f996514e mercurial-common/src/python/load-substates-command-46.py
--- a/mercurial-common/src/python/load-substates-command-46.py	Thu Oct 15 11:20:01 2020 +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
diff -r c1c70b506d45 -r a377f996514e mercurial-common/src/python/load-substates-command.py
--- a/mercurial-common/src/python/load-substates-command.py	Thu Oct 15 11:20:01 2020 +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
diff -r c1c70b506d45 -r a377f996514e mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommandTest.java
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommandTest.java	Thu Oct 15 11:20:01 2020 +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 /\""));
     }
   }