Fixed cred spam

Fixed git / git-lfs fail links

Author: Andrew

GitItGUI.Core/AppManager.cs

@@ -304,6 +304,22 @@ private static bool IsValidVersion(string currentVersion, string requiredVersion
 			return false;
 		}
 
+		private static void DownloadGit()
+		{
+			using (var process = Process.Start("https://git-scm.com/downloads"))
+			{
+				process.WaitForExit();
+			}
+		}
+
+		private static void DownloadGitLFS()
+		{
+			using (var process = Process.Start("https://git-lfs.github.com/"))
+			{
+				process.WaitForExit();
+			}
+		}
+
 		private static void Client_DownloadStringCompleted(object sender, DownloadStringCompletedEventArgs e)
 		{
 			if (e.Error != null)
@@ -337,6 +353,7 @@ private static void Client_DownloadStringCompleted(object sender, DownloadString
 					Debug.LogError("git is not installed correctly. (Make sure git is usable in the cmd/terminal)", true);
 					client.Dispose();
 					if (checkForUpdatesCallback != null) checkForUpdatesCallback(false, true);
+					DownloadGit();
 					return;
 				}
 
@@ -349,6 +366,7 @@ private static void Client_DownloadStringCompleted(object sender, DownloadString
 					Debug.LogError("git-lfs is not installed correctly. (Make sure git-lfs is usable in the cmd/terminal)", true);
 					client.Dispose();
 					if (checkForUpdatesCallback != null) checkForUpdatesCallback(false, true);
+					DownloadGitLFS();
 					return;
 				}
 
@@ -382,6 +400,8 @@ private static void Client_DownloadStringCompleted(object sender, DownloadString
 					Debug.LogError(string.Format("'git-lfs' version is not compatible with 'git' version installed!"), true);
 					client.Dispose();
 					if (checkForUpdatesCallback != null) checkForUpdatesCallback(false, true);
+					DownloadGit();
+					DownloadGitLFS();
 					return;
 				}
 
@@ -413,10 +433,7 @@ private static void Client_DownloadStringCompleted(object sender, DownloadString
 									if (!IsValidVersion(gitVersion, xmlReader.ReadInnerXml()))
 									{
 										Debug.LogError("Your 'git' version is out of date.\nDownload and install with defaults!", true);
-										using (var process = Process.Start("https://git-scm.com/downloads"))
-										{
-											process.WaitForExit();
-										}
+										DownloadGit();
 									}
 								}
 
@@ -432,10 +449,7 @@ private static void Client_DownloadStringCompleted(object sender, DownloadString
 									if (!IsValidVersion(gitlfsVersion, xmlReader.ReadInnerXml()))
 									{
 										Debug.LogError("Your 'git-lfs' version is out of date.\nDownload and install with defaults!", true);
-										using (var process = Process.Start("https://git-lfs.github.com/"))
-										{
-											process.WaitForExit();
-										}
+										DownloadGitLFS();
 									}
 								}
 

GitItGUI.Core/RepoManager.cs

@@ -55,7 +55,7 @@ public static class RepoManager
 		/// </summary>
 		/// <param name="path">Path to git repo</param>
 		/// <returns>True if succeeded</returns>
-		public static bool OpenRepo(string path)
+		public static bool OpenRepo(string path, bool checkForSettingErros = false)
 		{
 			// unload repo
 			if (string.IsNullOrEmpty(path))
@@ -122,9 +122,12 @@ public static bool OpenRepo(string path)
 				AppManager.AddActiveRepoToHistory();
 
 				// warnings
-				if (userSettings.signatureName.Contains("TODO: ") || userSettings.signatureEmail.Contains("TODO: ") || userSettings.username.Contains("TODO: "))
+				if (checkForSettingErros)
 				{
-					Debug.LogWarning("Credentials not set, please go to the settings tab!", true);
+					if (userSettings.signatureName.Contains("TODO: ") || userSettings.signatureEmail.Contains("TODO: ") || userSettings.username.Contains("TODO: "))
+					{
+						Debug.LogWarning("Credentials not set, please go to the settings tab!", true);
+					}
 				}
 			}
 			catch (Exception e)

GitItGUI/ChangesPage.xaml.cs

@@ -406,20 +406,31 @@ private bool ChangesManager_AskUserIfTheyAcceptMergedFileCallback(FileState file
 			return true;
 		}
 
+		private void CheckLocalBranchSyncErrors()
+		{
+			if (BranchManager.IsTracking()) return;
+
+
+		}
+
 		private void PushChangesButton_Advanced_Click(object sender, RoutedEventArgs e)
 		{
+			CheckLocalBranchSyncErrors();
 			ProcessingPage.singleton.mode = ProcessingPageModes.Push;
 			MainWindow.LoadPage(PageTypes.Processing);
 		}
 
 		private void PullChangesButton_Advanced_Click(object sender, RoutedEventArgs e)
 		{
+			CheckLocalBranchSyncErrors();
 			ProcessingPage.singleton.mode = ProcessingPageModes.Pull;
 			MainWindow.LoadPage(PageTypes.Processing);
 		}
 
 		private void SyncChangesButton_Click(object sender, RoutedEventArgs e)
 		{
+			CheckLocalBranchSyncErrors();
+
 			// check if files need to be staged
 			if (ChangesManager.FilesAreUnstaged())
 			{

GitItGUI/MainContent.xaml.cs

@@ -62,7 +62,7 @@ private void RepoManager_RepoRefreshedCallback()
 		private void RepoManager_RepoRefreshedCallback_UIThread()
 		{
 			string name = RepoManager.repoPath;
-			if (!string.IsNullOrEmpty(name)) repoName.Text = name.Substring(Path.GetDirectoryName(name).Length + 1);
+			if (!string.IsNullOrEmpty(name)) repoName.Text = string.Format("{0} ({1})", name.Substring(Path.GetDirectoryName(name).Length + 1), BranchManager.activeBranch.FriendlyName);
 			else repoName.Text = "";
 		}
 

GitItGUI/ProcessingPage.xaml.cs

@@ -160,7 +160,7 @@ private void Process()
 				RepoManager.SaveSettings(clonePath);
 
 				// open repo
-				if (!RepoManager.OpenRepo(clonePath))
+				if (!RepoManager.OpenRepo(clonePath, true))
 				{
 					MessageBox.Show("Failed to open repo: " + clonePath);
 					MainWindow.LoadPage(PageTypes.Start);

GitItGUI/StartPage.xaml.cs

@@ -77,7 +77,7 @@ private async void OpenButton_Click(object sender, RoutedEventArgs e)
 			}
 
 			// open repo
-			if (!RepoManager.OpenRepo(path))
+			if (!RepoManager.OpenRepo(path, true))
 			{
 				MessageBox.Show("Failed to open repo: " + path);
 				grid.IsVisible = true;
@@ -96,7 +96,7 @@ private void RecentButton_Click(object sender, RoutedEventArgs e)
 			string path = (string)button.Content;
 
 			// open repo
-			if (!RepoManager.OpenRepo(path))
+			if (!RepoManager.OpenRepo(path, true))
 			{
 				// remove bad repo from list
 				MessageBox.Show("Failed to open repo: " + path);