blob: 6f16f65086d900521f74f150bf421ebd137866ad [file] [log] [blame]
/*
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package git4idea.rebase;
import com.intellij.openapi.util.Key;
import git4idea.commands.GitLineHandlerAdapter;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* <p>
* Detector of problems during rebase operations, that may need to perform additional steps to handle.
* Such problems are: merge conflicts during applying commit;
* "no changes" error which happens when the change is empty (for instance, a change was introduced in a commit, but then
* discarded while merging. In that case 'git rebase --skip' is used.
* </p>
* <p>
* To use the detector add it as a {@link git4idea.commands.GitLineHandlerListener} to {@link git4idea.commands.GitLineHandler}
* </p>
*/
public class GitRebaseProblemDetector extends GitLineHandlerAdapter {
private final static String[] REBASE_CONFLICT_INDICATORS = {
"Merge conflict in",
"hint: after resolving the conflicts, mark the corrected paths",
"Failed to merge in the changes",
"could not apply"};
private static final String REBASE_NO_CHANGE_INDICATOR = "No changes - did you forget to use 'git add'?";
private AtomicBoolean mergeConflict = new AtomicBoolean(false);
private AtomicBoolean noChangeError = new AtomicBoolean(false);
public boolean isNoChangeError() {
return noChangeError.get();
}
public boolean isMergeConflict() {
return mergeConflict.get();
}
@Override
public void onLineAvailable(String line, Key outputType) {
for (String conflictIndicator : REBASE_CONFLICT_INDICATORS) {
if (line.contains(conflictIndicator)) {
mergeConflict.set(true);
return;
}
}
if (line.contains(REBASE_NO_CHANGE_INDICATOR)) {
noChangeError.set(true);
}
}
}