Allow canceling the commit operation after save-during-commit
commit297c622a44a5b4fa1ac6d2a120d6f2fa47ab1554
authorKonrad Kügler <swamblumat-eclipsebugs@yahoo.de>
Thu, 13 Mar 2014 23:53:34 +0000 (14 00:53 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 17 Mar 2014 20:56:43 +0000 (17 21:56 +0100)
treeea237df6ec0f1054798ff7aab36c48acc9d08799
parent51702a1bfc17441373d80a69fce4d04107419e09
Allow canceling the commit operation after save-during-commit

When a commit is performed, the user is asked to save all dirty editors.
Even if she does save some or all of them, the commit continues. The
changes that are saved, are not staged and thus not part of the commit.

If the user actually saved a file, we now ask her whether she wants to
cancel committing, to be able to stage the freshly saved files.

This only applies to commits via the staging view. The commit dialog
already allows the user to stage saved files without needing to cancel.

Change-Id: Iec972afd5494019717d15a1d828e8569f5e40188
Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java
org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/RepositorySaveableFilter.java
org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties