Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2013-03-16 22:40:07 +0000
committerRobin Stocker2013-03-20 22:26:33 +0000
commite7240dac5aa9ff4c3d9088e635ccfb085bb7ab25 (patch)
tree851ef67452f63c690376cdbfc07b9ce7c19efb2a /org.eclipse.egit.ui
parent5c4b5d3038457b02cc826eb2cd092027c66d327b (diff)
downloadegit-e7240dac5aa9ff4c3d9088e635ccfb085bb7ab25.tar.gz
egit-e7240dac5aa9ff4c3d9088e635ccfb085bb7ab25.tar.xz
egit-e7240dac5aa9ff4c3d9088e635ccfb085bb7ab25.zip
[repoView] Enable rebase menu to abort/skip non-interactive rebase
In the Repositories View the rebase menu was hidden when non-interactive rebase using native git stopped due to a conflict. Bug: 336820 Change-Id: Ibe204eb9547a99a7ced124475452703130768c9b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Robin Stocker <robin@nibor.org>
Diffstat (limited to 'org.eclipse.egit.ui')
-rw-r--r--org.eclipse.egit.ui/plugin.xml4
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoriesViewPropertyTester.java12
2 files changed, 13 insertions, 3 deletions
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml
index 7fe35f8720..5c8f229707 100644
--- a/org.eclipse.egit.ui/plugin.xml
+++ b/org.eclipse.egit.ui/plugin.xml
@@ -3083,7 +3083,7 @@
value="org.eclipse.egit.ui.internal.repository.tree.RepositoryNode">
</instanceof>
<test
- property="GitRepository.canAbortRebase">
+ property="GitRepository.canContinueRebase">
</test>
</and>
</iterate>
@@ -4441,7 +4441,7 @@
class="org.eclipse.egit.ui.internal.repository.tree.RepositoriesViewPropertyTester"
id="org.eclipse.egit.ui.RepositoryTester"
namespace="GitRepository"
- properties="isBare,isSafe,canCommit,canAmend,canResetHead,isRefCheckedOut,isLocalBranch,fetchExists,pushExists,canMerge,canAbortRebase,isSubmodule,containsHead"
+ properties="isBare,isSafe,canCommit,canAmend,canResetHead,isRefCheckedOut,isLocalBranch,fetchExists,pushExists,canMerge,canAbortRebase,canContinueRebase,isSubmodule,containsHead"
type="org.eclipse.egit.ui.internal.repository.tree.RepositoryTreeNode">
</propertyTester>
<propertyTester
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoriesViewPropertyTester.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoriesViewPropertyTester.java
index 63225bcb34..245deb0212 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoriesViewPropertyTester.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoriesViewPropertyTester.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 SAP AG.
+ * Copyright (c) 2010, 2013 SAP AG.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -136,6 +136,16 @@ public class RepositoriesViewPropertyTester extends PropertyTester {
switch (node.getRepository().getRepositoryState()) {
case REBASING_INTERACTIVE:
return true;
+ case REBASING_REBASING:
+ return true;
+ default:
+ return false;
+ }
+
+ if (property.equals("canContinueRebase")) //$NON-NLS-1$
+ switch (node.getRepository().getRepositoryState()) {
+ case REBASING_INTERACTIVE:
+ return true;
default:
return false;
}

Back to the top