Use chg rather than hg for Send/Receive, saving about 20 seconds per S/R (#353)

* Bump Mercurial and Chorus packages to use chg
* Preserve Chorus env vars, ensure chg can find hg
* Delete no-longer-needed test

This test is checking for a failure condition in LfMergeBridge that no
longer happens, and is hard to get running in parallel. We might as well
delete it and keep the code simple.

* Use LfMergeBridge version from before breaking change to Chorus

Later LfMergeBridge NuGet packages were accidentally compiled against a
version of Chorus with a breaking change in the localization manager,
which causes ChorusMerge failures. We'll pin LfMergeBridge to the
version just before the breaking change, just in case.

Once Chorus v7 has a NuGet package, we can upgrade Chorus again.

Author: rmunn

docker/scripts/create-installation-tarball.sh

@@ -75,6 +75,7 @@ install -d ${DBDESTDIR}/${LIB}/Mercurial/mercurial/utils
 install -d ${DBDESTDIR}/${LIB}/Mercurial/mercurial/upgrade_utils
 install -d ${DBDESTDIR}/${LIB}/MercurialExtensions
 install -d ${DBDESTDIR}/${LIB}/MercurialExtensions/fixutf8
+install -m 755 Mercurial/chg ${DBDESTDIR}/${LIB}/Mercurial
 install -m 755 Mercurial/hg ${DBDESTDIR}/${LIB}/Mercurial
 install -m 644 Mercurial/mercurial.ini ${DBDESTDIR}/${LIB}/Mercurial
 install -m 644 Mercurial/hgdemandimport/*.* ${DBDESTDIR}/${LIB}/Mercurial/hgdemandimport

lfmergeqm-background.sh

@@ -5,6 +5,6 @@
 
 while :
 do
-  sudo -H -u www-data lfmergeqm
+  sudo -H --preserve-env=CHORUS_HG_EXE -u www-data lfmergeqm
   sleep 86400
 done

lfmergeqm-looping.sh

@@ -10,7 +10,7 @@ trap "exit" TERM
 # This is expected to run as the CMD, launched by the entry point.
 
 while inotifywait -e close_write /var/lib/languageforge/lexicon/sendreceive/syncqueue; do
-  sudo -H -u www-data lfmergeqm
+  sudo -H --preserve-env=CHORUS_HG_EXE -u www-data lfmergeqm
   # Run it again just to ensure that any initial clones that missed a race condition have a chance to get noticed
-  sudo -H -u www-data lfmergeqm
+  sudo -H --preserve-env=CHORUS_HG_EXE -u www-data lfmergeqm
 done

src/LfMerge.Core.Tests/Actions/SynchronizeActionBridgeIntegrationTests.cs

@@ -93,21 +93,6 @@ public void Teardown()
 			}
 		}
 
-		[Test]
-		public void MissingFwDataFixer_Throws()
-		{
-			// Setup
-			var tmpFolder = Path.Combine(_languageDepotFolder.Path, "WorkDir");
-			Directory.CreateDirectory(tmpFolder);
-			Directory.SetCurrentDirectory(tmpFolder);
-
-			// Execute/Verify
-			Assert.That(() => _synchronizeAction.Run(_lfProject),
-				// This can't happen in real life because we ensure that we have a clone
-				// before we call sync. Therefore it is acceptable to get an exception.
-				Throws.TypeOf<InvalidOperationException>());
-		}
-
 		[Test]
 		public void Error_NoHgRepo()
 		{

src/LfMerge.Core/LfMerge.Core.csproj

@@ -41,10 +41,10 @@ See full changelog at https://github.com/sillsdev/LfMerge/blob/develop/CHANGELOG
     <PackageReference Include="MongoDB.Driver.Core.signed" Version="2.13.*" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="SIL.Bugsnag.Signed" Version="2.2.1" />
-    <PackageReference Include="SIL.Chorus.Mercurial" Version="6.5.*" PrivateAssets="All" />
-    <PackageReference Include="SIL.Chorus.ChorusMerge" Version="6.0.0-*" GeneratePathProperty="true" />
-    <PackageReference Include="SIL.ChorusPlugin.LfMergeBridge" Version="4.2.0-beta*" />
-    <PackageReference Include="SIL.Chorus.LibChorus" Version="6.0.0-*" />
+    <PackageReference Include="SIL.Chorus.Mercurial" Version="6.5.1.43" PrivateAssets="All" />
+    <PackageReference Include="SIL.Chorus.ChorusMerge" Version="6.0.0-beta0055" GeneratePathProperty="true" />
+    <PackageReference Include="SIL.ChorusPlugin.LfMergeBridge" Version="4.2.0-beta0028" />
+    <PackageReference Include="SIL.Chorus.LibChorus" Version="6.0.0-beta0055" />
     <PackageReference Include="SIL.Core.Desktop" Version="12.0.0" />
     <PackageReference Include="SIL.LCModel" Version="11.0.0-beta0077" />
     <PackageReference Include="SIL.LCModel.Core" Version="11.0.0-beta0077" GeneratePathProperty="true" />

src/LfMerge/Program.cs

@@ -40,6 +40,9 @@ public static int Main(string[] args)
 			MainClass.Logger.Notice("LfMerge {2} (database {0}) starting with args: {1}",
 				MainClass.ModelVersion, string.Join(" ", args), MainClass.GetVersionInfo("SemVer"));
 
+			// chg internal logic for finding hg trips up on LfMerge's unconvential path to hg, so we need to tell it where to find hg
+			Environment.SetEnvironmentVariable("CHGHG", $"/usr/lib/lfmerge/{MainClass.ModelVersion}/Mercurial/hg");
+
 			if (string.IsNullOrEmpty(options.ProjectCode))
 			{
 				MainClass.Logger.Error("Command line doesn't contain project code - exiting.");

src/LfMergeQueueManager/QueueManager.cs

@@ -27,7 +27,7 @@ public static void Main(string[] args)
 			if (options == null)
 				return;
 
-			MainClass.Logger.Notice("LfMergeQueueManager starting with args: {0}", string.Join(" ", args));
+			MainClass.Logger.Notice("LfMergeQueueManager starting with CHORUS_HG_EXE value \"{1}\" and args: {0}", string.Join(" ", args), Environment.GetEnvironmentVariable("CHORUS_HG_EXE") ?? "<null>");
 
 			// initialize the SLDR
 			Sldr.Initialize();