summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMarkus Duft2012-03-09 07:40:15 (EST)
committer Stefan Lay2012-03-09 08:08:41 (EST)
commit9dcb21678cb223d64a292874390decc2fa5e29bd (patch)
tree89610bed14ef2ed8715dcf39a6093a7c9058ccce
parentfff71d586bb438009b0bced4150cea3fa6326649 (diff)
downloadegit-9dcb21678cb223d64a292874390decc2fa5e29bd.zip
egit-9dcb21678cb223d64a292874390decc2fa5e29bd.tar.gz
egit-9dcb21678cb223d64a292874390decc2fa5e29bd.tar.bz2
Fix rebase > continue when nothing left to commit.refs/changes/60/4960/6
If after resolving all conflicts nothing is left to commit, behave like cgit, and display a nice message informing the user. Currently, EGit displays a "HEAD advanced fast forward" message, which is absolutely not helpful at all. This depends on a change with the same ID in jgit! Bug: 336812 Change-Id: If2665005cf54a5b51c0fe80bad019fa42b0205af
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java3
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java2
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties1
3 files changed, 6 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
index 9dc02df..c8c52a9 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java
@@ -682,6 +682,9 @@ public class UIText extends NLS {
public static String RebaseResultDialog_NextStepsDoNothing;
/** */
+ public static String RebaseResultDialog_NothingToCommit;
+
+ /** */
public static String RebaseResultDialog_notInWorkspace;
/** */
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java
index 618f8c9..07c8710 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java
@@ -134,6 +134,8 @@ public class RebaseResultDialog extends MessageDialog {
return UIText.RebaseResultDialog_UpToDate;
case FAST_FORWARD:
return UIText.RebaseResultDialog_FastForward;
+ case NOTHING_TO_COMMIT:
+ return UIText.RebaseResultDialog_NothingToCommit;
default:
throw new IllegalStateException(status.name());
}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
index b3d6ddb..147505b 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
@@ -282,6 +282,7 @@ RebaseResultDialog_Failed=Rebase failed
RebaseResultDialog_NextSteps=Next steps
RebaseResultDialog_NextStepsAfterResolveConflicts=When you have resolved the conflicts run:\n- "Rebase > Continue"\n- or "Rebase > Abort"
RebaseResultDialog_NextStepsDoNothing=- resolve the conflicts\n- then run "Rebase > Continue"\n- or "Rebase > Abort"
+RebaseResultDialog_NothingToCommit=No changes detected.\n\nIf there is nothing left to stage, chances are that something else\nalready introduced the same changes; you might want to skip this patch using "Rebase > Skip".
RebaseResultDialog_notInWorkspace=<not in workspace>
RebaseResultDialog_notInWorkspaceMessage=Some conflicting files are not part of the workspace. Open Staging View and launch a text editor to edit each conflicting file.
RebaseResultDialog_notShared=<not shared>