Improve workflow for debugging a Send/Receive

Author: jasonleenaylor

src/LibFLExBridge-ChorusPlugin/Handling/ConfigLayout/DictionaryConfigurationHandlerStrategy.cs

@@ -1,4 +1,4 @@
-// --------------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------
 // Copyright (C) 2015-2017 SIL International. All rights reserved.
 //
 // Distributable under the terms of the MIT License.
@@ -15,9 +15,7 @@
 using Chorus.merge;
 using Chorus.merge.xml.generic;
 using Chorus.VcsDrivers.Mercurial;
-using LibFLExBridgeChorusPlugin.Handling;
 using LibFLExBridgeChorusPlugin.Infrastructure;
-using LibTriboroughBridgeChorusPlugin;
 using SIL.IO;
 
 namespace LibFLExBridgeChorusPlugin.Handling.ConfigLayout

src/LibFLExBridge-ChorusPlugin/Infrastructure/FlexBridgeSynchronizerAdjunct.cs

@@ -101,27 +101,27 @@ private bool RunFixFwData(IProgress progress)
 		{
 			using (var process = new Process())
 			{
-			var startInfo = process.StartInfo;
-			startInfo.FileName = _fixitPathname.Replace("\"", null);
-			startInfo.Arguments = "\"" + _fwdataPathname.Replace("\"", null) + "\"";
-			startInfo.CreateNoWindow = false;
-			startInfo.UseShellExecute = false;
-			startInfo.WorkingDirectory = Path.GetDirectoryName(_fixitPathname) ?? string.Empty;
-			startInfo.RedirectStandardOutput = true;
-			process.Start();
-			var mergeOutput = process.StandardOutput.ReadToEnd();
-			process.WaitForExit();
-			// If the user requests verbose output they can see all the fixup reports.
-			// Unfortunately this includes sequences of dots intended to show progress on the console.
-			// They always occur at the start of a line. The Replace gets rid of them.
-			progress.WriteVerbose(new Regex(@"(?<=(^|\n|\r))\.+").Replace(mergeOutput, ""));
-			// 0 means fixup ran but fixed nothing, 1 means it ran and fixed something, anything else is a problem
-			if(process.ExitCode != 0 && process.ExitCode != 1)
-			{
-				throw new Exception("Merge fixing program has crashed.");
+				var startInfo = process.StartInfo;
+				startInfo.FileName = _fixitPathname.Replace("\"", null);
+				startInfo.Arguments = "\"" + _fwdataPathname.Replace("\"", null) + "\"";
+				startInfo.CreateNoWindow = false;
+				startInfo.UseShellExecute = false;
+				startInfo.WorkingDirectory = Path.GetDirectoryName(_fixitPathname) ?? string.Empty;
+				startInfo.RedirectStandardOutput = true;
+				process.Start();
+				var mergeOutput = process.StandardOutput.ReadToEnd();
+				process.WaitForExit();
+				// If the user requests verbose output they can see all the fixup reports.
+				// Unfortunately this includes sequences of dots intended to show progress on the console.
+				// They always occur at the start of a line. The Replace gets rid of them.
+				progress.WriteVerbose(new Regex(@"(?<=(^|\n|\r))\.+").Replace(mergeOutput, ""));
+				// 0 means fixup ran but fixed nothing, 1 means it ran and fixed something, anything else is a problem
+				if(process.ExitCode != 0 && process.ExitCode != 1)
+				{
+					throw new Exception("Merge fixing program has crashed.");
+				}
+				return process.ExitCode == 1;
 			}
-			return process.ExitCode == 1;
-		}
 		}
 
 		/// <summary>

src/RepositoryUtility/Program.cs

@@ -2,12 +2,14 @@
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.Composition.Hosting;
 using System.IO;
 using System.Reflection;
 using System.Windows.Forms;
 using Chorus.VcsDrivers.Mercurial;
 using Gecko;
+using L10NSharp;
 using RepositoryUtility.Properties;
 using SIL.IO;
 using SIL.PlatformUtilities;
@@ -39,7 +41,10 @@ static void Main()
 
 			Application.EnableVisualStyles();
 			Application.SetCompatibleTextRenderingDefault(false);
-
+			TriboroughBridgeUtilities.SetupLocalization(new Dictionary<string, string>
+			{
+				{ CommandLineProcessor.locale, "en" }
+			});
 			using (var hotspot = new HotSpotProvider())
 			{
 				// This is a kludge to make sure we have a real reference to PalasoUIWindowsForms.

src/RepositoryUtility/Properties/Settings.Designer.cs

@@ -14,5 +14,8 @@
     <Setting Name="CallUpgrade" Provider="RepositoryUtility.Properties.SettingsProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="OpenLocalStartFolder" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>

src/RepositoryUtility/Properties/Settings.settings

@@ -22,6 +22,7 @@
 using LibFLExBridgeChorusPlugin.DomainServices;
 using LibTriboroughBridgeChorusPlugin;
 using LibTriboroughBridgeChorusPlugin.Infrastructure.ActionHandlers;
+using RepositoryUtility.Properties;
 using SIL.PlatformUtilities;
 using SIL.Progress;
 
@@ -123,14 +124,17 @@ private void HandleOpenLocalRepositoryClick(object sender, EventArgs e)
 			// Get some selected folder that hopefully has a repo in it.
 			using (var folderDlg = new FolderBrowserDialog())
 			{
+				var openLocalStartLoc = Settings.Default.OpenLocalStartFolder;
 				folderDlg.ShowNewFolderButton = false;
-				folderDlg.SelectedPath = _repoHoldingFolder;
+				folderDlg.SelectedPath = string.IsNullOrEmpty(openLocalStartLoc) ? _repoHoldingFolder : openLocalStartLoc;
 				if (folderDlg.ShowDialog(this) != DialogResult.OK)
 				{
 					_repoFolder = null;
 					return;
 				}
 				_repoFolder = folderDlg.SelectedPath;
+				Settings.Default.OpenLocalStartFolder = _repoFolder;
+				Settings.Default.Save();
 			}
 
 			if (!HasRepo)
@@ -256,6 +260,17 @@ private void HandleSendBackToSourceMenuClick(object sender, EventArgs e)
 							: Path.Combine(_repoFolder, Path.GetFileName(_repoFolder) + LibTriboroughBridgeSharedConstants.FwXmlExtension),
 						repoType);
 				syncDlg.SetSynchronizerAdjunct(syncAdjunt);
+				var versionString = LibFLExBridgeUtilities.GetFlexModelVersion(_repoFolder);
+				var versionNumbers = versionString.Split(new[] { "{", ":", "}" },
+					StringSplitOptions.RemoveEmptyEntries);
+				if (versionNumbers.Length == 0)
+					throw new Exception("Invalid version number in branch name");
+				var version = Int32.Parse(versionNumbers.Length > 1 ? versionNumbers[1] : versionNumbers[0]);
+
+				MetadataCache.MdCache.UpgradeToVersion(version);
+				// Use Lexicon location to build up custom properties in support of validating a commit outside of a merge context
+				var mergeOrderFolder = Path.Combine(_repoFolder, FlexBridgeConstants.Lexicon);
+				MetadataCache.MdCache.AddCustomPropInfo(new MergeOrder(mergeOrderFolder, mergeOrderFolder, mergeOrderFolder, new NullMergeSituation()));
 
 				// Chorus does it in this order:
 				// Local Commit

src/RepositoryUtility/RepositoryUtilityForm.cs

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
@@ -13,6 +13,9 @@
             <setting name="CallUpgrade" serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="OpenLocalStartFolder" serializeAs="String">
+                <value />
+            </setting>
         </RepositoryUtility.Properties.Settings>
     </userSettings>
 </configuration>