Fixed bug that would cause multiple of the same files to be shown.

repo title now shows branch you're on
app logs get saved in Windows ProgramData
can now create new branches the push to remotes
auto refresh wont get stuck if creds arn't set up

Author: zezba9000

GitItGUI.Core/AppManager.cs

@@ -215,6 +215,7 @@ public static void SaveSettings()
 		public static void Dispose()
 		{
 			RepoManager.Dispose();
+			Debug.Dispose();
 		}
 
 		public static bool CheckForUpdates(string url, string outOfDateURL, CheckForUpdatesCallbackMethod checkForUpdatesCallback)

GitItGUI.Core/BranchManager.cs

@@ -9,6 +9,16 @@
 
 namespace GitItGUI.Core
 {
+	public class Remote
+	{
+		public string name, url;
+
+		public override string ToString()
+		{
+			return name;
+		}
+	}
+
 	public class BranchState
 	{
 		public Branch branch;
@@ -27,6 +37,7 @@ public static class BranchManager
 	{
 		public static Branch activeBranch;
 		private static List<BranchState> allBranches;
+		private static List<Remote> remotes;
 
 		internal static void OpenRepo(Repository repo)
 		{
@@ -67,8 +78,14 @@ public static string GetTrackedBranchName()
 			return activeBranch.TrackedBranch.FriendlyName;
 		}
 
+		public static Remote[] GetRemotes()
+		{
+			return remotes.ToArray();
+		}
+
 		internal static bool Refresh()
 		{
+			// gather branches
 			if (allBranches == null) allBranches = new List<BranchState>();
 			else allBranches.Clear();
 
@@ -85,6 +102,22 @@ internal static bool Refresh()
 				allBranches.Add(b);
 			}
 
+			// gather remotes
+			if (remotes == null) remotes = new List<Remote>();
+			else remotes.Clear();
+
+			var allRemotes = RepoManager.repo.Network.Remotes;
+			foreach (var remote in allRemotes)
+			{
+				var newRemote = new Remote()
+				{
+					name = remote.Name,
+					url = remote.Url
+				};
+
+				remotes.Add(newRemote);
+			}
+
 			return true;
 		}
 
@@ -202,13 +235,37 @@ public static MergeResults MergeBranchIntoActive(BranchState srcBranch, StatusUp
 			return mergeResult;
 		}
 
-		public static bool AddNewBranch(string branchName)
+		public static bool AddNewBranch(string branchName, string remoteName = null)
 		{
+			bool success = true;
+
 			try
 			{
+				// create branch
 				var branch = RepoManager.repo.CreateBranch(branchName);
 				Commands.Checkout(RepoManager.repo, branch);
 				activeBranch = branch;
+
+				// push branch to remote
+				if (!string.IsNullOrEmpty(remoteName))
+				{
+					// add remote
+					RepoManager.repo.Branches.Update(activeBranch, b =>
+					{
+						b.Remote = remoteName;
+						b.TrackedBranch = string.Format("refs/remotes/{0}/{1}", remoteName, branchName);
+						b.UpstreamBranch = "refs/heads/" + branchName;
+					});
+
+					// push remote
+					string errors;
+					string result = Tools.RunExeOutputErrors("git", string.Format("push -u {0} {1}", remoteName, branch.FriendlyName), null, out errors);
+					if (!string.IsNullOrEmpty(errors) && !errors.Contains("To create a merge request for"))//NOTE: this ignores false positive noise errors that come from GitLab
+					{
+						Debug.LogError("Push remote failed: " + errors, true);
+						success = false;
+					}
+				}
 			}
 			catch (Exception e)
 			{
@@ -217,7 +274,7 @@ public static bool AddNewBranch(string branchName)
 			}
 
 			RepoManager.Refresh();
-			return true;
+			return success;
 		}
 
 		public static bool DeleteNonActiveBranch(BranchState branch)
@@ -257,12 +314,12 @@ public static bool RenameActiveBranch(string newBranchName)
 			return true;
 		}
 
-		public static bool AddUpdateTracking(BranchState srcRemoteBranch)
+		public static bool CopyTracking(BranchState srcRemoteBranch)
 		{
-			return AddUpdateTracking(srcRemoteBranch.fullName);
+			return CopyTracking(srcRemoteBranch.fullName);
 		}
 
-		public static bool AddUpdateTracking(string srcRemoteBranch)
+		public static bool CopyTracking(string srcRemoteBranch)
 		{
 			try
 			{

GitItGUI.Core/Tools/Debug.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 
 namespace GitItGUI.Core
 {
@@ -16,21 +17,56 @@ public static class Debug
 		/// </summary>
 		public static event DebugLogCallbackMethod debugLogCallback, debugLogWarningCallback, debugLogErrorCallback;
 
+		private static Stream stream;
+		private static StreamWriter writer;
+
+		static Debug()
+		{
+			try
+			{
+				string logFileName = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
+				logFileName += "\\" + Settings.appSettingsFolderName + "\\" + "logs.txt";
+				stream = new FileStream(logFileName, FileMode.Create, FileAccess.Write, FileShare.None);
+				writer = new StreamWriter(stream);
+			}
+			catch (Exception e)
+			{
+				LogError("Failed to init debug log file: " + e.Message);
+			}
+		}
+
+		internal static void Dispose()
+		{
+			if (stream != null)
+			{
+				writer.Flush();
+				stream.Flush();
+				stream.Dispose();
+				stream = null;
+			}
+		}
+
 		public static void Log(object value, bool alert = false)
 		{
-			Console.WriteLine("GitItGUI.Core Log: " + value.ToString());
+			string msg = value.ToString();
+			Console.WriteLine(msg);
+			if (writer != null) writer.WriteLine(msg);
 			if (debugLogCallback != null) debugLogCallback(value, alert);
 		}
 
 		public static void LogWarning(object value, bool alert = false)
 		{
-			Console.WriteLine("GitItGUI.Core Log WARNING: " + value.ToString());
+			string msg = "WARNING: " + value.ToString();
+			Console.WriteLine(msg);
+			if (writer != null) writer.WriteLine(msg);
 			if (debugLogWarningCallback != null) debugLogWarningCallback(value, alert);
 		}
 
 		public static void LogError(object value, bool alert = false)
 		{
-			Console.WriteLine("GitItGUI.Core Log ERROR: " + value.ToString());
+			string msg = "ERROR: " + value.ToString();
+			Console.WriteLine(msg);
+			if (writer != null) writer.WriteLine(msg);
 			if (debugLogErrorCallback != null) debugLogErrorCallback(value, alert);
 		}
 	}

GitItGUI/BranchesPage.xaml

@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui" Design.Width="800" Design.Height="400" xmlns:self="clr-namespace:GitItGUI;assembly=GitItGUI">
+<UserControl xmlns="https://github.com/avaloniaui" Design.Width="1280" Design.Height="800" xmlns:self="clr-namespace:GitItGUI;assembly=GitItGUI">
 	<Grid>
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition Width="50*" />
@@ -9,17 +9,20 @@
 			<TextBlock FontSize="24" Margin="0,10,0,0" HorizontalAlignment="Center" VerticalAlignment="Top">Active Branch</TextBlock>
 			<TextBlock Height="32" Margin="10,50,10,-50" TextAlignment="Right" HorizontalAlignment="Left" VerticalAlignment="Top">Branch Name:</TextBlock>
 			<TextBox Name="activeBranchTextBox" Height="32" Margin="100,50,0,-50" VerticalAlignment="Top" Background="White" IsReadOnly="True" ToolTip.Tip="Current 'Active' branch name"/>
-			<Button Name="addBranchButton" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="100,85,-100,10" Width="75" ToolTip.Tip="Add new branch based off 'Active'?">Add</Button>
-			<Button Name="renameBranchButton" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="180,85,-180,10" Width="75" ToolTip.Tip="Rename 'Active' branch?">Rename</Button>
+			<Button Name="renameBranchButton" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="100,85,-100,10" Width="75" ToolTip.Tip="Rename 'Active' branch?">Rename</Button>
 
 			<TextBlock Name="trackingLabel" FontSize="18" Margin="0,150,0,0" HorizontalAlignment="Center" VerticalAlignment="Top">--- Tracking ---</TextBlock>
 			<TextBlock Name="trackedBranchLabel" Width="82" Height="32" Margin="10,180,10,-180" TextAlignment="Right" HorizontalAlignment="Left" VerticalAlignment="Top">Tracked Branch:</TextBlock>
 			<TextBox Name="trackingOriginTextBox" Height="32" Margin="100,180,0,-50" VerticalAlignment="Top" Background="White" IsReadOnly="True" ToolTip.Tip="Active branch tracking origin"/>
 			<TextBlock Name="remoteURLLabel" Width="82" Height="32" Margin="10,215,10,-215" TextAlignment="Right" HorizontalAlignment="Left" VerticalAlignment="Top">Remote URL:</TextBlock>
 			<TextBox Name="remoteURLTextBox" Height="32" Margin="100,215,0,-50" VerticalAlignment="Top" Background="White" IsReadOnly="True" ToolTip.Tip="Active branch tracking origin"/>
-			<Button Name="addTrackingButton" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="100,250,-100,-250" Width="75" ToolTip.Tip="Copy tracking from 'Other' remote branch into 'Active'">*Add</Button>
+			<Button Name="copyTrackingButton" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="100,250,-100,-250" Width="75" ToolTip.Tip="Copy tracking from 'Other' remote branch into 'Active' branch">Copy</Button>
 			<Button Name="removeTrackingButton" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="180,250,-180,-250" Width="75" ToolTip.Tip="Remove tracking from 'Active' branch">Remove</Button>
 
+			<TextBlock Name="newBranchLabel" FontSize="18" Margin="0,320,0,0" HorizontalAlignment="Center" VerticalAlignment="Top">--- Create New Branch ---</TextBlock>
+			<Button Name="addBranchButton" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="100,360,-100,-360" Width="75" ToolTip.Tip="Add new branch based off 'Active'?">Add</Button>
+			<DropDown Name="remotesDropDown" VerticalAlignment="Top" Margin="180,360,0,-360" Height="28" ToolTip.Tip="Rename 'Active' branch?"/>
+
 			<CheckBox Name="advancedModeCheckBox" Margin="10" HorizontalContentAlignment="Left" VerticalAlignment="Bottom">Advanced Mode</CheckBox>
 		</Grid>
 

GitItGUI/BranchesPage.xaml.cs

@@ -17,11 +17,12 @@ public class BranchesPage : UserControl
 		public static BranchesPage singleton;
 
 		// ui objects
-		TextBlock trackingLabel, trackedBranchLabel, remoteURLLabel;
+		TextBlock trackingLabel, trackedBranchLabel, remoteURLLabel, newBranchLabel;
 		TextBox activeBranchTextBox, trackingOriginTextBox, remoteURLTextBox;
 		ListBox otherBranchListView;
-		Button addBranchButton, renameBranchButton, addTrackingButton, removeTrackingButton, switchBranchButton, mergeBranchButton, deleteBranchButton;
+		Button addBranchButton, renameBranchButton, copyTrackingButton, removeTrackingButton, switchBranchButton, mergeBranchButton, deleteBranchButton;
 		CheckBox advancedModeCheckBox;
+		DropDown remotesDropDown;
 
 		List<string> otherBranchListViewItems;
 
@@ -37,7 +38,7 @@ public BranchesPage()
 			otherBranchListView = this.Find<ListBox>("otherBranchListView");
 			addBranchButton = this.Find<Button>("addBranchButton");
 			renameBranchButton = this.Find<Button>("renameBranchButton");
-			addTrackingButton = this.Find<Button>("addTrackingButton");
+			copyTrackingButton = this.Find<Button>("copyTrackingButton");
 			removeTrackingButton = this.Find<Button>("removeTrackingButton");
 			switchBranchButton = this.Find<Button>("switchBranchButton");
 			mergeBranchButton = this.Find<Button>("mergeBranchButton");
@@ -46,13 +47,15 @@ public BranchesPage()
 			trackingLabel = this.Find<TextBlock>("trackingLabel");
 			trackedBranchLabel = this.Find<TextBlock>("trackedBranchLabel");
 			remoteURLLabel = this.Find<TextBlock>("remoteURLLabel");
+			newBranchLabel = this.Find<TextBlock>("newBranchLabel");
+			remotesDropDown = this.Find<DropDown>("remotesDropDown");
 
 			// apply bindings
 			otherBranchListViewItems = new List<string>();
 			otherBranchListView.Items = otherBranchListViewItems;
 			addBranchButton.Click += AddBranchButton_Click;
 			renameBranchButton.Click += RenameBranchButton_Click;
-			addTrackingButton.Click += AddTrackingButton_Click;
+			copyTrackingButton.Click += CopyTrackingButton_Click;
 			removeTrackingButton.Click += RemoveTrackingButton_Click;
 			switchBranchButton.Click += SwitchBranchButton_Click;
 			mergeBranchButton.Click += MergeBranchButton_Click;
@@ -65,7 +68,7 @@ public BranchesPage()
 
 		private void AdvancedModeCheckBox_Click(object sender, RoutedEventArgs e)
 		{
-			RepoManager_RepoRefreshedCallback();
+			RepoManager_RepoRefreshedCallback_UIThread();
 		}
 
 		private void RepoManager_RepoRefreshedCallback()
@@ -96,11 +99,24 @@ private void RepoManager_RepoRefreshedCallback_UIThread()
 			renameBranchButton.IsVisible = isAdvancedMode;
 			trackingOriginTextBox.IsVisible = isAdvancedMode;
 			remoteURLTextBox.IsVisible = isAdvancedMode;
-			addTrackingButton.IsVisible = isAdvancedMode;
+			copyTrackingButton.IsVisible = isAdvancedMode;
 			removeTrackingButton.IsVisible = isAdvancedMode;
 			trackingLabel.IsVisible = isAdvancedMode;
 			trackedBranchLabel.IsVisible = isAdvancedMode;
 			remoteURLLabel.IsVisible = isAdvancedMode;
+			newBranchLabel.IsVisible = isAdvancedMode;
+			remotesDropDown.IsVisible = isAdvancedMode;
+
+			// fill remotes drop down
+			if (isAdvancedMode)
+			{
+				var remotes = new List<Core.Remote>();
+				var localRemote = new Core.Remote() {name = "N/A - LOCAL ONLY"};
+				remotes.Add(localRemote);
+				remotes.AddRange(BranchManager.GetRemotes());
+				remotesDropDown.Items = remotes;
+				remotesDropDown.SelectedIndex = 0;
+			}
 
 			// fill other branches list
 			var branches = BranchManager.GetOtherBranches(isAdvancedMode);
@@ -130,8 +146,18 @@ private void RepoManager_RepoRefreshedCallback_UIThread()
 
 		private void AddBranchButton_Click(object sender, RoutedEventArgs e)
 		{
+			if (remotesDropDown.SelectedItem == null)
+			{
+				Debug.LogError("Must select remote!", true);
+				return;
+			}
+
+			var remote = (Core.Remote)remotesDropDown.SelectedItem;
+			string remoteName = remote.name;
+			if (remote.url == null) remoteName = null;
+
 			string result;
-			if (CoreApps.LaunchNameEntry("Enter branch name", out result)) BranchManager.AddNewBranch(result);
+			if (CoreApps.LaunchNameEntry("Enter branch name", out result)) BranchManager.AddNewBranch(result, remoteName);
 		}
 
 		private void RenameBranchButton_Click(object sender, RoutedEventArgs e)
@@ -140,7 +166,7 @@ private void RenameBranchButton_Click(object sender, RoutedEventArgs e)
 			if (CoreApps.LaunchNameEntry("Enter branch name", out result)) BranchManager.RenameActiveBranch(result);
 		}
 
-		private void AddTrackingButton_Click(object sender, RoutedEventArgs e)
+		private void CopyTrackingButton_Click(object sender, RoutedEventArgs e)
 		{
 			if (otherBranchListView.SelectedIndex == -1)
 			{
@@ -155,7 +181,7 @@ private void AddTrackingButton_Click(object sender, RoutedEventArgs e)
 				return;
 			}
 
-			BranchManager.AddUpdateTracking(branch);
+			BranchManager.CopyTracking(branch);
 		}
 
 		private void RemoveTrackingButton_Click(object sender, RoutedEventArgs e)

GitItGUI/ChangesPage.xaml.cs

@@ -406,30 +406,31 @@ private bool ChangesManager_AskUserIfTheyAcceptMergedFileCallback(FileState file
 			return true;
 		}
 
-		private void CheckLocalBranchSyncErrors()
+		private bool CheckLocalBranchSyncErrors()
 		{
-			if (BranchManager.IsTracking()) return;
-
+			if (BranchManager.IsTracking()) return true;
 
+			MessageBox.Show("Local Branch is not tracking a remote!\nPlease use 'advanced' features in the Branch tab to fix.");
+			return false;
 		}
 
 		private void PushChangesButton_Advanced_Click(object sender, RoutedEventArgs e)
 		{
-			CheckLocalBranchSyncErrors();
+			if (!CheckLocalBranchSyncErrors()) return;
 			ProcessingPage.singleton.mode = ProcessingPageModes.Push;
 			MainWindow.LoadPage(PageTypes.Processing);
 		}
 
 		private void PullChangesButton_Advanced_Click(object sender, RoutedEventArgs e)
 		{
-			CheckLocalBranchSyncErrors();
+			if (!CheckLocalBranchSyncErrors()) return;
 			ProcessingPage.singleton.mode = ProcessingPageModes.Pull;
 			MainWindow.LoadPage(PageTypes.Processing);
 		}
 
 		private void SyncChangesButton_Click(object sender, RoutedEventArgs e)
 		{
-			CheckLocalBranchSyncErrors();
+			if (!CheckLocalBranchSyncErrors()) return;
 
 			// check if files need to be staged
 			if (ChangesManager.FilesAreUnstaged())

GitItGUI/MainWindow.xaml.cs

@@ -30,6 +30,7 @@ public MainWindow()
 			AvaloniaXamlLoader.Load(this);
 			App.AttachDevTools(this);
 			Title = "Git-It-GUI v" + VersionInfo.version;
+			Debug.Log(Title);
 
 			// load resources
 			ResourceManager.Init();