enhance: do not show Initialize Repository popup for bare repositories (#891)

Author: love-linger

src/ViewModels/Welcome.cs

@@ -83,6 +83,37 @@ public void ToggleNodeIsExpanded(RepositoryNode node)
             }
         }
 
+        public void OpenOrInitRepository(string path, RepositoryNode parent, bool bMoveExistedNode)
+        {
+            if (!Directory.Exists(path))
+            {
+                if (File.Exists(path))
+                    path = Path.GetDirectoryName(path);
+                else
+                    return;
+            }
+
+            var isBare = new Commands.IsBareRepository(path).Result();
+            if (isBare)
+            {
+                App.RaiseException(string.Empty, $"'{path}' is a bare repository, which is not supported by SourceGit!");
+                return;
+            }
+
+            var test = new Commands.QueryRepositoryRootPath(path).ReadToEnd();
+            if (!test.IsSuccess || string.IsNullOrEmpty(test.StdOut))
+            {
+                InitRepository(path, parent, test.StdErr);
+                return;
+            }
+
+            var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), parent, bMoveExistedNode);
+            Refresh();
+
+            var launcher = App.GetLauncer();
+            launcher?.OpenRepositoryInTab(node, launcher.ActivePage);
+        }
+
         public void InitRepository(string path, RepositoryNode parent, string reason)
         {
             if (!Preferences.Instance.IsGitConfigured())

src/Views/Welcome.axaml.cs

@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 
 using Avalonia;
 using Avalonia.Controls;
@@ -197,7 +196,7 @@ private void DropOnTreeView(object sender, DragEventArgs e)
                 {
                     foreach (var item in items)
                     {
-                        OpenOrInitRepository(item.Path.LocalPath);
+                        ViewModels.Welcome.Instance.OpenOrInitRepository(item.Path.LocalPath, null, true);
                         break;
                     }
                 }
@@ -261,7 +260,7 @@ private void DropOnTreeNode(object sender, DragEventArgs e)
                 {
                     foreach (var item in items)
                     {
-                        OpenOrInitRepository(item.Path.LocalPath, to);
+                        ViewModels.Welcome.Instance.OpenOrInitRepository(item.Path.LocalPath, to, true);
                         break;
                     }
                 }
@@ -290,37 +289,6 @@ private void OnDoubleTappedTreeNode(object sender, TappedEventArgs e)
             }
         }
 
-        private void OpenOrInitRepository(string path, ViewModels.RepositoryNode parent = null)
-        {
-            if (!Directory.Exists(path))
-            {
-                if (File.Exists(path))
-                    path = Path.GetDirectoryName(path);
-                else
-                    return;
-            }
-
-            var isBare = new Commands.IsBareRepository(path).Result();
-            if (isBare)
-            {
-                App.RaiseException(string.Empty, $"'{path}' is a bare repository, which is not supported by SourceGit!");
-                return;
-            }
-
-            var test = new Commands.QueryRepositoryRootPath(path).ReadToEnd();
-            if (!test.IsSuccess || string.IsNullOrEmpty(test.StdOut))
-            {
-                ViewModels.Welcome.Instance.InitRepository(path, parent, test.StdErr);
-                return;
-            }
-
-            var node = ViewModels.Preferences.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), parent, true);
-            ViewModels.Welcome.Instance.Refresh();
-
-            var launcher = this.FindAncestorOfType<Launcher>()?.DataContext as ViewModels.Launcher;
-            launcher?.OpenRepositoryInTab(node, launcher.ActivePage);
-        }
-
         private bool _pressedTreeNode = false;
         private Point _pressedTreeNodePosition = new Point();
         private bool _startDragTreeNode = false;

src/Views/WelcomeToolbar.axaml.cs

@@ -4,7 +4,6 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
-using Avalonia.VisualTree;
 
 namespace SourceGit.Views
 {
@@ -36,7 +35,7 @@ private async void OpenLocalRepository(object _1, RoutedEventArgs e)
             {
                 var selected = await topLevel.StorageProvider.OpenFolderPickerAsync(options);
                 if (selected.Count == 1)
-                    OpenOrInitRepository(selected[0].Path.LocalPath);
+                    ViewModels.Welcome.Instance.OpenOrInitRepository(selected[0].Path.LocalPath, null, false);
             }
             catch (Exception exception)
             {
@@ -45,30 +44,6 @@ private async void OpenLocalRepository(object _1, RoutedEventArgs e)
 
             e.Handled = true;
         }
-
-        private void OpenOrInitRepository(string path, ViewModels.RepositoryNode parent = null)
-        {
-            if (!Directory.Exists(path))
-            {
-                if (File.Exists(path))
-                    path = Path.GetDirectoryName(path);
-                else
-                    return;
-            }
-
-            var test = new Commands.QueryRepositoryRootPath(path).ReadToEnd();
-            if (!test.IsSuccess || string.IsNullOrEmpty(test.StdOut))
-            {
-                ViewModels.Welcome.Instance.InitRepository(path, parent, test.StdErr);
-                return;
-            }
-
-            var node = ViewModels.Preferences.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), parent, false);
-            ViewModels.Welcome.Instance.Refresh();
-
-            var launcher = this.FindAncestorOfType<Launcher>()?.DataContext as ViewModels.Launcher;
-            launcher?.OpenRepositoryInTab(node, launcher.ActivePage);
-        }
     }
 }