src/Commands/Command.cs

@@ -40,7 +40,59 @@ namespace SourceGit.Commands
 
         public bool Exec()
         {
-            var start = CreateGitStartInfo();
+            var start = new ProcessStartInfo();
+            start.FileName = Native.OS.GitExecutable;
+            start.Arguments = "--no-pager -c core.quotepath=off -c credential.helper=manager ";
+            start.UseShellExecute = false;
+            start.CreateNoWindow = true;
+            start.RedirectStandardOutput = true;
+            start.RedirectStandardError = true;
+            start.StandardOutputEncoding = Encoding.UTF8;
+            start.StandardErrorEncoding = Encoding.UTF8;
+
+            // Force using this app as SSH askpass program
+            var selfExecFile = Process.GetCurrentProcess().MainModule!.FileName;
+            if (!OperatingSystem.IsLinux())
+                start.Environment.Add("DISPLAY", "required");
+            start.Environment.Add("SSH_ASKPASS", selfExecFile); // Can not use parameter here, because it invoked by SSH with `exec`
+            start.Environment.Add("SSH_ASKPASS_REQUIRE", "prefer");
+            start.Environment.Add("SOURCEGIT_LAUNCH_AS_ASKPASS", "TRUE");
+
+            // If an SSH private key was provided, sets the environment.
+            if (!string.IsNullOrEmpty(SSHKey))
+                start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o StrictHostKeyChecking=accept-new -i '{SSHKey}'");
+            else
+                start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o StrictHostKeyChecking=accept-new");
+
+            // Force using en_US.UTF-8 locale to avoid GCM crash
+            if (OperatingSystem.IsLinux())
+                start.Environment.Add("LANG", "en_US.UTF-8");
+
+            // Fix sometimes `LSEnvironment` not working on macOS
+            if (OperatingSystem.IsMacOS())
+                start.Environment.Add("PATH", "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin");
+
+            // Force using this app as git editor.
+            switch (Editor)
+            {
+                case EditorType.CoreEditor:
+                    start.Arguments += $"-c core.editor=\"\\\"{selfExecFile}\\\" --core-editor\" ";
+                    break;
+                case EditorType.RebaseEditor:
+                    start.Arguments += $"-c core.editor=\"\\\"{selfExecFile}\\\" --rebase-message-editor\" -c sequence.editor=\"\\\"{selfExecFile}\\\" --rebase-todo-editor\" -c rebase.abbreviateCommands=true ";
+                    break;
+                default:
+                    start.Arguments += "-c core.editor=true ";
+                    break;
+            }
+
+            // Append command args
+            start.Arguments += Args;
+
+            // Working directory
+            if (!string.IsNullOrEmpty(WorkingDirectory))
+                start.WorkingDirectory = WorkingDirectory;
+
             var errs = new List<string>();
             var proc = new Process() { StartInfo = start };
             var isCancelled = false;
@@ -134,9 +186,20 @@ namespace SourceGit.Commands
 
         public ReadToEndResult ReadToEnd()
         {
-            var start = CreateGitStartInfo();
-            var proc = new Process() { StartInfo = start };
+            var start = new ProcessStartInfo();
+            start.FileName = Native.OS.GitExecutable;
+            start.Arguments = "--no-pager -c core.quotepath=off " + Args;
+            start.UseShellExecute = false;
+            start.CreateNoWindow = true;
+            start.RedirectStandardOutput = true;
+            start.RedirectStandardError = true;
+            start.StandardOutputEncoding = Encoding.UTF8;
+            start.StandardErrorEncoding = Encoding.UTF8;
 
+            if (!string.IsNullOrEmpty(WorkingDirectory))
+                start.WorkingDirectory = WorkingDirectory;
+
+            var proc = new Process() { StartInfo = start };
             try
             {
                 proc.Start();
@@ -164,68 +227,7 @@ namespace SourceGit.Commands
             return rs;
         }
 
-        protected virtual void OnReadline(string line)
-        {
-            // Implemented by derived class
-        }
-
-        private ProcessStartInfo CreateGitStartInfo()
-        {
-            var start = new ProcessStartInfo();
-            start.FileName = Native.OS.GitExecutable;
-            start.Arguments = "--no-pager -c core.quotepath=off -c credential.helper=manager ";
-            start.UseShellExecute = false;
-            start.CreateNoWindow = true;
-            start.RedirectStandardOutput = true;
-            start.RedirectStandardError = true;
-            start.StandardOutputEncoding = Encoding.UTF8;
-            start.StandardErrorEncoding = Encoding.UTF8;
-
-            // Force using this app as SSH askpass program
-            var selfExecFile = Process.GetCurrentProcess().MainModule!.FileName;
-            if (!OperatingSystem.IsLinux())
-                start.Environment.Add("DISPLAY", "required");
-            start.Environment.Add("SSH_ASKPASS", selfExecFile); // Can not use parameter here, because it invoked by SSH with `exec`
-            start.Environment.Add("SSH_ASKPASS_REQUIRE", "prefer");
-            start.Environment.Add("SOURCEGIT_LAUNCH_AS_ASKPASS", "TRUE");
-
-            // If an SSH private key was provided, sets the environment.
-            if (!string.IsNullOrEmpty(SSHKey))
-                start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o StrictHostKeyChecking=accept-new -i '{SSHKey}'");
-            else
-                start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o StrictHostKeyChecking=accept-new");
-
-            // Force using en_US.UTF-8 locale to avoid GCM crash
-            if (OperatingSystem.IsLinux())
-                start.Environment.Add("LANG", "en_US.UTF-8");
-
-            // Fix sometimes `LSEnvironment` not working on macOS
-            if (OperatingSystem.IsMacOS())
-                start.Environment.Add("PATH", "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin");
-
-            // Force using this app as git editor.
-            switch (Editor)
-            {
-                case EditorType.CoreEditor:
-                    start.Arguments += $"-c core.editor=\"\\\"{selfExecFile}\\\" --core-editor\" ";
-                    break;
-                case EditorType.RebaseEditor:
-                    start.Arguments += $"-c core.editor=\"\\\"{selfExecFile}\\\" --rebase-message-editor\" -c sequence.editor=\"\\\"{selfExecFile}\\\" --rebase-todo-editor\" -c rebase.abbreviateCommands=true ";
-                    break;
-                default:
-                    start.Arguments += "-c core.editor=true ";
-                    break;
-            }
-
-            // Append command args
-            start.Arguments += Args;
-
-            // Working directory
-            if (!string.IsNullOrEmpty(WorkingDirectory))
-                start.WorkingDirectory = WorkingDirectory;
-
-            return start;
-        }
+        protected virtual void OnReadline(string line) { }
 
         [GeneratedRegex(@"\d+%")]
         private static partial Regex REG_PROGRESS();

src/Models/Statistics.cs

@@ -43,8 +43,7 @@ namespace SourceGit.Models
         {
             _mode = mode;
 
-            YAxes = [new Axis()
-            {
+            YAxes = [new Axis() {
                 TextSize = 10,
                 MinLimit = 0,
                 SeparatorsPaint = new SolidColorPaint(new SKColor(0x40808080)) { StrokeThickness = 1 }

src/ViewModels/Launcher.cs

@@ -32,8 +32,8 @@ namespace SourceGit.ViewModels
                 {
                     PopupHost.Active = value;
 
-                    if (!_ignoreIndexChange && value is { Data: Repository repo })
-                        ActiveWorkspace.ActiveIdx = ActiveWorkspace.Repositories.IndexOf(repo.FullPath);
+                    if (!_ignoreIndexChange && value is { Data: Repository })
+                        ActiveWorkspace.ActiveIdx = Pages.IndexOf(value);
                 }
             }
         }
@@ -131,22 +131,10 @@ namespace SourceGit.ViewModels
 
         public void MoveTab(LauncherPage from, LauncherPage to)
         {
-            _ignoreIndexChange = true;
-
             var fromIdx = Pages.IndexOf(from);
             var toIdx = Pages.IndexOf(to);
             Pages.Move(fromIdx, toIdx);
             ActivePage = from;
-
-            ActiveWorkspace.Repositories.Clear();
-            foreach (var p in Pages)
-            {
-                if (p.Data is Repository r)
-                    ActiveWorkspace.Repositories.Add(r.FullPath);
-            }
-            ActiveWorkspace.ActiveIdx = ActiveWorkspace.Repositories.IndexOf(from.Node.Id);
-
-            _ignoreIndexChange = false;
         }
 
         public void GotoNextTab()
@@ -176,9 +164,7 @@ namespace SourceGit.ViewModels
                 var last = Pages[0];
                 if (last.Data is Repository repo)
                 {
-                    ActiveWorkspace.Repositories.Clear();
-                    ActiveWorkspace.ActiveIdx = 0;
-
+                    ActiveWorkspace.Repositories.Remove(repo.FullPath);
                     Models.AutoFetchManager.Instance.RemoveRepository(repo.FullPath);
                     repo.Close();
 
@@ -194,7 +180,6 @@ namespace SourceGit.ViewModels
                     App.Quit(0);
                 }
 
-                _ignoreIndexChange = false;
                 return;
             }
 
@@ -228,8 +213,6 @@ namespace SourceGit.ViewModels
             if (Pages.Count == 1)
                 return;
 
-            _ignoreIndexChange = true;
-
             var id = ActivePage.Node.Id;
             foreach (var one in Pages)
             {
@@ -238,17 +221,12 @@ namespace SourceGit.ViewModels
             }
 
             Pages = new AvaloniaList<LauncherPage> { ActivePage };
-            ActiveWorkspace.ActiveIdx = 0;
             OnPropertyChanged(nameof(Pages));
-
-            _ignoreIndexChange = false;
             GC.Collect();
         }
 
         public void CloseRightTabs()
         {
-            _ignoreIndexChange = true;
-
             var endIdx = Pages.IndexOf(ActivePage);
             for (var i = Pages.Count - 1; i > endIdx; i--)
             {
@@ -256,7 +234,6 @@ namespace SourceGit.ViewModels
                 Pages.Remove(Pages[i]);
             }
 
-            _ignoreIndexChange = false;
             GC.Collect();
         }
 
@@ -293,6 +270,7 @@ namespace SourceGit.ViewModels
             };
 
             repo.Open();
+            ActiveWorkspace.AddRepository(repo.FullPath);
             Models.AutoFetchManager.Instance.AddRepository(repo.FullPath, repo.GitDir);
 
             if (page == null)
@@ -316,16 +294,6 @@ namespace SourceGit.ViewModels
             }
 
             ActivePage = page;
-
-            ActiveWorkspace.Repositories.Clear();
-            foreach (var p in Pages)
-            {
-                if (p.Data is Repository r)
-                    ActiveWorkspace.Repositories.Add(r.FullPath);
-            }
-
-            if (!_ignoreIndexChange)
-                ActiveWorkspace.ActiveIdx = ActiveWorkspace.Repositories.IndexOf(node.Id);
         }
 
         public void DispatchNotification(string pageId, string message, bool isError)

src/ViewModels/Workspace.cs

@@ -51,6 +51,12 @@ namespace SourceGit.ViewModels
             get => new SolidColorBrush(_color);
         }
 
+        public void AddRepository(string repo)
+        {
+            if (!Repositories.Contains(repo))
+                Repositories.Add(repo);
+        }
+
         private string _name = string.Empty;
         private uint _color = 4278221015;
         private bool _isActive = false;

src/Views/ChangeCollectionView.axaml.cs

@@ -244,7 +244,7 @@ namespace SourceGit.Views
             _disableSelectionChangingEvent = true;
 
             var selected = new List<Models.Change>();
-            if (sender is ListBox { SelectedItems: { } selectedItems })
+            if (sender is ListBox { SelectedItems: {} selectedItems })
             {
                 foreach (var item in selectedItems)
                 {