diff options
author | Max Hohenegger | 2018-09-22 16:08:42 +0000 |
---|---|---|
committer | Michael Keppler | 2018-10-17 08:29:54 +0000 |
commit | 619348652b93c877c69e2c5cf601e5dd247f7871 (patch) | |
tree | 8b8d113ff534ace66128ada01fbc980275b6d607 /org.eclipse.egit.gitflow.ui | |
parent | 84ce36b307b8369a0bfc2363a6134391df79a28a (diff) | |
download | egit-619348652b93c877c69e2c5cf601e5dd247f7871.tar.gz egit-619348652b93c877c69e2c5cf601e5dd247f7871.tar.xz egit-619348652b93c877c69e2c5cf601e5dd247f7871.zip |
[gitflow] Honor gitflow.feature.start.fetch=true
Using this option will cause Gitflow to fetch from the upstream
repository before creating a new feature branch. The main benefit of
this is that the check for diverging develop and origin/develop will
always protect the user from creating a feature branch from an outdated
develop state.
Bug 539755
Change-Id: I84f7ef23db4f137ee710f78cea1d80211db762c0
Diffstat (limited to 'org.eclipse.egit.gitflow.ui')
-rw-r--r-- | org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/FeatureStartHandler.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/FeatureStartHandler.java b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/FeatureStartHandler.java index ee0b1d0b2a..8d41f1884c 100644 --- a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/FeatureStartHandler.java +++ b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/FeatureStartHandler.java @@ -19,6 +19,8 @@ import org.eclipse.egit.gitflow.op.FeatureStartOperation; import org.eclipse.egit.gitflow.ui.internal.JobFamilies; import org.eclipse.egit.gitflow.ui.internal.UIText; import org.eclipse.egit.gitflow.ui.internal.validation.FeatureNameValidator; +import org.eclipse.egit.ui.Activator; +import org.eclipse.egit.ui.UIPreferences; import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.window.Window; import org.eclipse.ui.handlers.HandlerUtil; @@ -44,8 +46,10 @@ public class FeatureStartHandler extends AbstractHandler { } final String featureName = inputDialog.getValue(); + int timeout = Activator.getDefault().getPreferenceStore() + .getInt(UIPreferences.REMOTE_CONNECTION_TIMEOUT); FeatureStartOperation featureStartOperation = new FeatureStartOperation( - gfRepo, featureName); + gfRepo, featureName, timeout); JobUtil.scheduleUserWorkspaceJob(featureStartOperation, UIText.FeatureStartHandler_startingNewFeature, JobFamilies.GITFLOW_FAMILY); |