improvements to the GIT status

Hefaistos68 · Sep 6, 2023 · 33c1e3f · 33c1e3f
1 parent bce2ef6
commit 33c1e3f
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 7 deletions.
diff --git a/VSLauncherX/Helpers/ColumnHelper.cs b/VSLauncherX/Helpers/ColumnHelper.cs
@@ -345,11 +345,11 @@ internal static CheckState SetCheckState(object rowObject, CheckState newValue)
 				}
 				if (s.Status == "*")
 				{
-					return Resources.GitDirty;
+					return Resources.GitDirty2;
 				}
 				else if (s.Status == "!")
 				{
-					return Resources.GitClean;
+					return Resources.GitClean2;
 				}
 			}
 

diff --git a/VSLauncherX/MainDialog.cs b/VSLauncherX/MainDialog.cs
@@ -242,8 +242,6 @@ private void MainDialog_Load(object sender, EventArgs e)
 
 			SetupTaskbarTasks();
 
-			FetchGitStatus(this.solutionGroups);
-
 			_ = this.txtFilter.Focus();
 		}
 
@@ -270,8 +268,21 @@ private void FetchGitStatus(VsFolder folder)
 					}
 					catch (RepositoryNotFoundException ex)
 					{
-						// this is not a GIT repository
-						item.Status = "?";
+						// retry with the parent folder
+						try
+						{
+							using (var repo = new Repository(Path.GetDirectoryName(Path.GetDirectoryName(item.Path))))
+							{
+								var stat = repo.RetrieveStatus();
+								item.Status = stat.IsDirty ? "*" : "!";
+							}
+						}
+						catch (RepositoryNotFoundException ex2)
+						{
+							// this is not a GIT repository
+							item.Status = "?";
+
+						}
 					}
 				}
 				else
@@ -548,6 +559,7 @@ private void mainRefresh_Click(object sender, EventArgs e)
 			this.solutionGroups.Items.OnChanged += SolutionData_OnChanged;
 
 			UpdateList();
+			FetchGitStatus(this.solutionGroups);
 		}
 
 		/// <summary>
@@ -1285,7 +1297,7 @@ private void UpdateList()
 			this.olvFiles.SetObjects(this.solutionGroups.Items);
 
 			IterateAndExpandItems();
-			// this.olvFiles.ExpandAll();
+			FetchGitStatus(this.solutionGroups);
 		}
 
 		private void IterateAndExpandItems()

diff --git a/VSLauncherX/Resources.Designer.cs b/VSLauncherX/Resources.Designer.cs
diff --git a/VSLauncherX/Resources.resx b/VSLauncherX/Resources.resx
@@ -250,4 +250,10 @@
   <data name="GitDirty" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\Images\GitDirty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="GitClean2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\Images\GitClean2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="GitDirty2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\Images\GitDirty2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/VSLauncherX/Resources/Images/GitClean2.png b/VSLauncherX/Resources/Images/GitClean2.png
diff --git a/VSLauncherX/Resources/Images/GitDirty2.png b/VSLauncherX/Resources/Images/GitDirty2.png