fixed lots of refresh / file state bugs

Author: Andrew Witte

GitCommander/Changes.cs

@@ -37,19 +37,59 @@ public class FileState
 		public string filename {get; internal set;}
 		public FileStates state {get; internal set;}
 
-		public bool IsState(FileStates state)
+		public static bool IsAllStates(FileStates stateFlag, FileStates[] states)
+		{
+			foreach (var state in states)
+			{
+				if ((stateFlag & state) == 0) return false;
+			}
+
+			return true;
+		}
+
+		public static bool IsAnyStates(FileStates stateFlag, FileStates[] states)
+		{
+			foreach (var state in states)
+			{
+				if ((stateFlag & state) != 0) return true;
+			}
+
+			return false;
+		}
+
+		public bool IsAllStates(FileStates[] states)
+		{
+			return IsAllStates(state, states);
+		}
+
+		public bool IsAnyStates(FileStates[] states)
+		{
+			return IsAnyStates(state, states);
+		}
+
+		public bool HasState(FileStates state)
 		{
 			return (this.state & state) != 0;
 		}
 
+		public bool IsUnstaged()
+		{
+			return
+				HasState(FileStates.NewInWorkdir) ||
+				HasState(FileStates.DeletedFromWorkdir) ||
+				HasState(FileStates.ModifiedInWorkdir) ||
+				HasState(FileStates.RenamedInWorkdir) ||
+				HasState(FileStates.TypeChangeInWorkdir);
+		}
+
 		public bool IsStaged()
 		{
 			return
-				IsState(FileStates.NewInIndex) ||
-				IsState(FileStates.DeletedFromIndex) ||
-				IsState(FileStates.ModifiedInIndex) ||
-				IsState(FileStates.RenamedInIndex) ||
-				IsState(FileStates.TypeChangeInIndex);
+				HasState(FileStates.NewInIndex) ||
+				HasState(FileStates.DeletedFromIndex) ||
+				HasState(FileStates.ModifiedInIndex) ||
+				HasState(FileStates.RenamedInIndex) ||
+				HasState(FileStates.TypeChangeInIndex);
 		}
 
 		public override string ToString()

GitItGUI.Core/BranchManager.cs

@@ -72,6 +72,7 @@ public static BranchState[] GetNonActiveBranches(bool getRemotes)
 
 		public static bool Checkout(BranchState branch)
 		{
+			bool success = true;
 			try
 			{
 				if (activeBranch.name != branch.name)
@@ -81,17 +82,17 @@ public static bool Checkout(BranchState branch)
 				else
 				{
 					Debug.LogError("Already on branch: " + branch.name, true);
-					return false;
+					success = false;
 				}
 			}
 			catch (Exception e)
 			{
 				Debug.LogError("BranchManager.Checkout Failed: " + e.Message, true);
-				return false;
+				success = false;
 			}
 
 			RepoManager.Refresh();
-			return true;
+			return success;
 		}
 
 		public static MergeResults MergeBranchIntoActive(BranchState srcBranch)
@@ -108,7 +109,7 @@ public static MergeResults MergeBranchIntoActive(BranchState srcBranch)
 			catch (Exception e)
 			{
 				Debug.LogError("BranchManager.Merge Failed: " + e.Message, true);
-				return MergeResults.Error;
+				mergeResult = MergeResults.Error;
 			}
 
 			RepoManager.Refresh();
@@ -117,6 +118,7 @@ public static MergeResults MergeBranchIntoActive(BranchState srcBranch)
 
 		public static bool CheckoutNewBranch(string branchName, string remoteName = null)
 		{
+			bool success = true;
 			try
 			{
 				// create branch
@@ -138,77 +140,81 @@ public static bool CheckoutNewBranch(string branchName, string remoteName = null
 			catch (Exception e)
 			{
 				Debug.LogError("Add new Branch Error: " + e.Message, true);
-				return false;
+				success = false;
 			}
 
 			RepoManager.Refresh();
-			return true;
+			return success;
 		}
 
 		public static bool DeleteNonActiveBranch(BranchState branch)
 		{
+			bool success = true;
 			try
 			{
 				if (!Repository.DeleteBranch(branch.name)) throw new Exception(Repository.lastError);
 			}
 			catch (Exception e)
 			{
 				Debug.LogError("Delete new Branch Error: " + e.Message, true);
-				return false;
+				success = false;
 			}
 
 			RepoManager.Refresh();
-			return true;
+			return success;
 		}
 
 		public static bool RenameActiveBranch(string newBranchName)
 		{
+			bool success = true;
 			try
 			{
 				if (!Repository.RenameActiveBranch(newBranchName)) throw new Exception(Repository.lastError);
 			}
 			catch (Exception e)
 			{
 				Debug.LogError("Rename new Branch Error: " + e.Message, true);
-				return false;
+				success = false;
 			}
 
 			RepoManager.Refresh();
-			return true;
+			return success;
 		}
 
 		public static bool CopyTracking(BranchState srcRemoteBranch)
 		{
+			bool success = true;
 			try
 			{
 				if (!Repository.SetActiveBranchTracking(srcRemoteBranch.fullname)) throw new Exception(Repository.lastError);
 			}
 			catch (Exception e)
 			{
 				Debug.LogError("Add/Update tracking Branch Error: " + e.Message, true);
-				return false;
+				success = false;
 			}
 
 			RepoManager.Refresh();
-			return true;
+			return success;
 		}
 
 		public static bool RemoveTracking()
 		{
 			if (!activeBranch.isTracking) return true;
 
+			bool success = true;
 			try
 			{
 				if (!Repository.RemoveActiveBranchTracking()) throw new Exception(Repository.lastError);
 			}
 			catch (Exception e)
 			{
 				Debug.LogError("Remove Branch Error: " + e.Message, true);
-				return false;
+				success = false;
 			}
 
 			RepoManager.Refresh();
-			return true;
+			return success;
 		}
 
 		public static bool IsUpToDateWithRemote(out bool yes)