1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
/*******************************************************************************
* Copyright (C) 2015, 2016 Max Hohenegger <eclipse@hohenegger.eu> and others
*
* 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
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
package org.eclipse.egit.gitflow.op;
import static org.eclipse.jgit.lib.Constants.DEFAULT_REMOTE_NAME;
import static org.eclipse.jgit.lib.Constants.R_REMOTES;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.URISyntaxException;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.egit.core.op.BranchOperation;
import org.eclipse.egit.core.op.CreateLocalBranchOperation;
import static org.eclipse.egit.gitflow.Activator.error;
import org.eclipse.egit.gitflow.GitFlowRepository;
import org.eclipse.egit.gitflow.internal.CoreText;
import org.eclipse.jgit.api.CheckoutResult;
import org.eclipse.jgit.api.CheckoutResult.Status;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.BranchConfig.BranchRebaseMode;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.transport.FetchResult;
/**
* git flow feature track
*/
public final class FeatureTrackOperation extends AbstractFeatureOperation {
private static final String REMOTE_ORIGIN_FEATURE_PREFIX = R_REMOTES
+ DEFAULT_REMOTE_NAME + SEP;
private Ref remoteFeature;
private FetchResult operationResult;
private int timeout;
/**
* Track given ref, referencing a feature branch.
*
* @param repository
* @param ref
* @deprecated Use
* {@link FeatureTrackOperation#FeatureTrackOperation(GitFlowRepository, Ref, int)}
* instead.
*/
@Deprecated
public FeatureTrackOperation(GitFlowRepository repository, Ref ref) {
this(repository, ref, 0);
}
/**
* Track given ref, referencing a feature branch.
*
* @param repository
* @param ref
* @param timeout
* timeout in seconds for remote operations
* @since 4.2
*/
public FeatureTrackOperation(GitFlowRepository repository, Ref ref,
int timeout) {
this(repository, ref, ref.getName().substring(
(REMOTE_ORIGIN_FEATURE_PREFIX + repository.getConfig()
.getFeaturePrefix()).length()));
this.timeout = timeout;
}
/**
* Track given feature branch locally as newLocalBranch.
*
* @param repository
* @param ref
* @param newLocalBranch
*/
public FeatureTrackOperation(GitFlowRepository repository, Ref ref,
String newLocalBranch) {
super(repository, newLocalBranch);
this.remoteFeature = ref;
}
@Override
public void execute(IProgressMonitor monitor) throws CoreException {
SubMonitor progress = SubMonitor.convert(monitor, 3);
try {
String newLocalBranch = repository
.getConfig().getFeatureBranchName(featureName);
operationResult = fetch(progress.newChild(1), timeout);
if (repository.hasBranch(newLocalBranch)) {
String errorMessage = String.format(
CoreText.FeatureTrackOperation_localBranchExists,
newLocalBranch);
throw new CoreException(error(errorMessage));
}
CreateLocalBranchOperation createLocalBranchOperation = new CreateLocalBranchOperation(
repository.getRepository(), newLocalBranch, remoteFeature,
BranchRebaseMode.NONE);
createLocalBranchOperation.execute(progress.newChild(1));
BranchOperation branchOperation = new BranchOperation(
repository.getRepository(), newLocalBranch);
branchOperation.execute(progress.newChild(1));
CheckoutResult result = branchOperation.getResult();
if (!Status.OK.equals(result.getStatus())) {
String errorMessage = String.format(
CoreText.FeatureTrackOperation_checkoutReturned,
newLocalBranch, result.getStatus().name());
throw new CoreException(error(errorMessage));
}
try {
repository.setRemote(newLocalBranch, DEFAULT_REMOTE_NAME);
repository.setUpstreamBranchName(newLocalBranch,
repository.getConfig().getFullFeatureBranchName(featureName));
} catch (IOException e) {
throw new CoreException(error(
CoreText.FeatureTrackOperation_unableToStoreGitConfig,
e));
}
} catch (URISyntaxException e) {
throw new CoreException(error(e.getMessage(), e));
} catch (InvocationTargetException e) {
Throwable targetException = e.getTargetException();
throw new CoreException(error(targetException.getMessage(),
targetException));
} catch (GitAPIException e) {
throw new CoreException(error(e.getMessage(), e));
}
}
/**
* @return result set after operation was executed
*/
public FetchResult getOperationResult() {
return operationResult;
}
}
|
