@Override public void unconflicted(DiffEntry diff) { diffEntryBuffer.add(diff); if (diffEntryBuffer.size() == BUFFER_SIZE) { // Stage it stagingArea().stage(getProgressListener(), diffEntryBuffer.iterator(), 0); diffEntryBuffer.clear(); } }
@Override public void unconflicted(DiffEntry diff) { diffEntryBuffer.add(diff); if (diffEntryBuffer.size() == BUFFER_SIZE) { // Stage it stagingArea().stage(getProgressListener(), diffEntryBuffer.iterator(), 0); diffEntryBuffer.clear(); } }
@Override public void finished() { if (conflictsBuffer.size() > 0) { // Write the conflicts command(ConflictsWriteOp.class).setConflicts(conflictsBuffer) .call(); conflictsBuffer.clear(); } if (diffEntryBuffer.size() > 0) { // Stage it stagingArea().stage(getProgressListener(), diffEntryBuffer.iterator(), 0); diffEntryBuffer.clear(); } }
@Override public void finished() { if (conflictsBuffer.size() > 0) { // Write the conflicts command(ConflictsWriteOp.class).setConflicts(conflictsBuffer) .call(); conflictsBuffer.clear(); } if (diffEntryBuffer.size() > 0) { // Stage it stagingArea().stage(getProgressListener(), diffEntryBuffer.iterator(), 0); diffEntryBuffer.clear(); } }
@Override public void merged(FeatureInfo featureInfo) { // Stage it workingTree().insert(featureInfo); try (AutoCloseableIterator<DiffEntry> unstaged = workingTree() .getUnstaged(null)) { stagingArea().stage(getProgressListener(), unstaged, 0); } }
@Override public void merged(FeatureInfo featureInfo) { // Stage it workingTree().insert(featureInfo); try (AutoCloseableIterator<DiffEntry> unstaged = workingTree() .getUnstaged(null)) { stagingArea().stage(getProgressListener(), unstaged, 0); } }
"You are currently in the middle of a merge or rebase project <ORIG_HEAD is present>."); getProgressListener().started(); workingTree().updateWorkHead(upstream.get()); stagingArea().updateStageHead(upstream.get()); getProgressListener().complete(); return true; getProgressListener().complete(); return true; getProgressListener().complete();
"You are currently in the middle of a merge or rebase project <ORIG_HEAD is present>."); getProgressListener().started(); workingTree().updateWorkHead(upstream.get()); stagingArea().updateStageHead(upstream.get()); getProgressListener().complete(); return true; getProgressListener().complete(); return true; getProgressListener().complete();