Merge pull request #8980 from mono/master-vsts1001439

Fixes VSTS Bug 1003485: [Feedback] After Commit and Push changes

Author: mkrueger

main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitDialog.cs

@@ -44,15 +44,17 @@ namespace MonoDevelop.VersionControl.Dialogs
 {
 	partial class CommitDialog : Gtk.Dialog
 	{
+		Repository vc;
 		ListStore store;
 		HashSet<FilePath> selected = new HashSet<FilePath> ();
 		List<CommitDialogExtension> extensions = new List<CommitDialogExtension> ();
 		ChangeSet changeSet;
 		string oldMessage;
 		bool responseSensitive;
 
-		public CommitDialog (ChangeSet changeSet)
+		public CommitDialog (Repository vc, ChangeSet changeSet)
 		{
+			this.vc = vc;
 			Build ();
 
 			store = new ListStore(typeof (Xwt.Drawing.Image), typeof (string), typeof (string), typeof(bool), typeof(object));
@@ -205,12 +207,20 @@ void HandleAllowCommitChanged (object sender, EventArgs e)
 
 		protected override void OnResponse (Gtk.ResponseType type)
 		{
+			base.OnResponse (type);
+
 			if (type != Gtk.ResponseType.Ok) {
 				changeSet.GlobalComment = oldMessage;
-			} else if (!ButtonCommitClicked ())
+				EndCommit (false);
+			} else if (!ButtonCommitClicked ()) {
 				return;
+			}
 
-			base.OnResponse (type);
+			if (type == Gtk.ResponseType.Ok) {
+				VersionControlService.NotifyBeforeCommit (vc, changeSet);
+				new CommitWorker (vc, changeSet, this).StartAsync ();
+				return;
+			}
 		}
 
 		CancellationTokenSource destroyTokenSource = new CancellationTokenSource ();
@@ -342,5 +352,60 @@ void OnCommitToggledHandler(object o, ToggledArgs args)
 			else
 				selected.Remove (vinfo.LocalPath);
 		}
+
+		private class CommitWorker : VersionControlTask
+		{
+			Repository vc;
+			ChangeSet changeSet;
+			CommitDialog dlg;
+			bool success;
+
+			public CommitWorker (Repository vc, ChangeSet changeSet, CommitDialog dlg)
+			{
+				this.vc = vc;
+				this.changeSet = changeSet;
+				this.dlg = dlg;
+				OperationType = VersionControlOperationType.Push;
+			}
+
+			protected override string GetDescription ()
+			{
+				return GettextCatalog.GetString ("Committing {0}...", changeSet.BaseLocalPath);
+			}
+
+			protected override async Task RunAsync ()
+			{
+				success = true;
+				try {
+					// store global comment before commit.
+					VersionControlService.SetCommitComment (changeSet.BaseLocalPath, changeSet.GlobalComment, true);
+
+					await vc.CommitAsync (changeSet, Monitor);
+					Monitor.ReportSuccess (GettextCatalog.GetString ("Commit operation completed."));
+
+					// Reset the global comment on successful commit.
+					VersionControlService.SetCommitComment (changeSet.BaseLocalPath, "", true);
+				} catch (Exception ex) {
+					LoggingService.LogError ("Commit operation failed", ex);
+					Monitor.ReportError (ex.Message, null);
+					success = false;
+					throw;
+				}
+			}
+
+			protected override void Finished ()
+			{
+				dlg.EndCommit (success);
+				dlg.Destroy ();
+				FileUpdateEventArgs args = new FileUpdateEventArgs ();
+				foreach (ChangeSetItem it in changeSet.Items)
+					args.Add (new FileUpdateEventInfo (vc, it.LocalPath, it.IsDirectory));
+
+				if (args.Count > 0)
+					VersionControlService.NotifyFileStatusChanged (args);
+
+				VersionControlService.NotifyAfterCommit (vc, changeSet, success);
+			}
+		}
 	}
 }

main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs

@@ -20,14 +20,9 @@ public static async Task CommitAsync (Repository vc, ChangeSet changeSet)
 				VersionControlService.NotifyPrepareCommit (vc, changeSet);
 				if (!await VerifyUnsavedChangesAsync (changeSet))
 					return;
-				CommitDialog dlg = new CommitDialog (changeSet);
+				CommitDialog dlg = new CommitDialog (vc, changeSet);
 				try {
-					if (MessageService.RunCustomDialog (dlg) == (int) Gtk.ResponseType.Ok) {
-						VersionControlService.NotifyBeforeCommit (vc, changeSet);
-							new CommitWorker (vc, changeSet, dlg).StartAsync();
-							return;
-						}
-					dlg.EndCommit (false);
+					MessageService.RunCustomDialog (dlg);
 				} finally {
 					dlg.Destroy ();
 					dlg.Dispose ();
@@ -91,59 +86,6 @@ static async Task<bool> VerifyUnsavedChangesAsync (ChangeSet changeSet)
 			return allowCommit;
 		}
 
-		private class CommitWorker : VersionControlTask
-		{
-			Repository vc;
-			ChangeSet changeSet;
-			CommitDialog dlg;
-			bool success;
-
-			public CommitWorker (Repository vc, ChangeSet changeSet, CommitDialog dlg)
-			{
-				this.vc = vc;
-				this.changeSet = changeSet;
-				this.dlg = dlg;
-				OperationType = VersionControlOperationType.Push;
-			}
-
-			protected override string GetDescription()
-			{
-				return GettextCatalog.GetString ("Committing {0}...", changeSet.BaseLocalPath);
-			}
-
-			protected override async Task RunAsync ()
-			{
-				success = true;
-				try {
-					// store global comment before commit.
-					VersionControlService.SetCommitComment (changeSet.BaseLocalPath, changeSet.GlobalComment, true);
-
-					await vc.CommitAsync (changeSet, Monitor);
-					Monitor.ReportSuccess (GettextCatalog.GetString ("Commit operation completed."));
-
-					// Reset the global comment on successful commit.
-					VersionControlService.SetCommitComment (changeSet.BaseLocalPath, "", true);
-				} catch (Exception ex) {
-					LoggingService.LogError ("Commit operation failed", ex);
-					Monitor.ReportError (ex.Message, null);
-					success = false;
-					throw;
-				}
-			}
-
-			protected override void Finished ()
-			{
-				dlg.EndCommit (success);
-				dlg.Destroy ();
-				FileUpdateEventArgs args = new FileUpdateEventArgs ();
-				foreach (ChangeSetItem it in changeSet.Items)
-					args.Add (new FileUpdateEventInfo (vc, it.LocalPath, it.IsDirectory));
-
-				if (args.Count > 0)
-					VersionControlService.NotifyFileStatusChanged (args);
-
-				VersionControlService.NotifyAfterCommit (vc, changeSet, success);
-			}
-		}
+		
 	}
 }