diff options
| author | Markus Duft | 2012-03-09 12:40:15 +0000 |
|---|---|---|
| committer | Stefan Lay | 2012-03-09 13:08:41 +0000 |
| commit | 9dcb21678cb223d64a292874390decc2fa5e29bd (patch) | |
| tree | 89610bed14ef2ed8715dcf39a6093a7c9058ccce | |
| parent | fff71d586bb438009b0bced4150cea3fa6326649 (diff) | |
| download | egit-9dcb21678cb223d64a292874390decc2fa5e29bd.tar.gz egit-9dcb21678cb223d64a292874390decc2fa5e29bd.tar.xz egit-9dcb21678cb223d64a292874390decc2fa5e29bd.zip | |
Fix rebase > continue when nothing left to commit.
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
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 9dc02dfa93..c8c52a9ca3 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 618f8c9066..07c871025c 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 b3d6ddb60e..147505b441 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> |