private boolean combineB(List<Edit> e, int i) { return e.get(i).getBeginB() - e.get(i - 1).getEndB() <= 2 * context; }
HunkHeader(FileHeader fh, EditList editList) { this(fh, fh.buf.length); this.editList = editList; endOffset = startOffset; nContext = 0; if (editList.isEmpty()) { newStartLine = 0; newLineCount = 0; } else { newStartLine = editList.get(0).getBeginB(); Edit last = editList.get(editList.size() - 1); newLineCount = last.getEndB() - newStartLine; } }
int bCur = (int) Math.max(0, (long) curEdit.getBeginB() - context); final int aEnd = (int) Math.min(a.size(), (long) endEdit.getEndA() + context); final int bEnd = (int) Math.min(b.size(), (long) endEdit.getEndB() + context);
private boolean combineB(final List<Edit> e, final int i) { return e.get(i).getBeginB() - e.get(i - 1).getEndB() <= 2 * context; }
private boolean combineB(List<Edit> e, int i) { return e.get(i).getBeginB() - e.get(i - 1).getEndB() <= 2 * context; }
ConflictState.NO_CONFLICT); result.add(1, oursEdit.getBeginB(), oursEdit.getEndB(), ConflictState.NO_CONFLICT); current = oursEdit.getEndA(); ConflictState.NO_CONFLICT); result.add(2, theirsEdit.getBeginB(), theirsEdit.getEndB(), ConflictState.NO_CONFLICT); current = theirsEdit.getEndA(); int oursBeginB = oursEdit.getBeginB(); int theirsBeginB = theirsEdit.getBeginB();
/** Sets the next edit with differences to be used. */ private void nextEdit() { if (baseLineNo >= baseEndLineNo && patchLineNo >= patchEndLineNo) { index++; if (index >= edits.size()) { currentEdit = null; } else { currentEdit = edits.get(index); baseLineNo = Math.max(0, currentEdit.getBeginA()); patchLineNo = Math.max(0, currentEdit.getBeginB()); baseEndLineNo = Math.min(baseFileRaw.size(), currentEdit.getEndA()); patchEndLineNo = Math.min(patchFileRaw.size(), currentEdit.getEndB()); } } } }
HunkHeader(final FileHeader fh, final EditList editList) { this(fh, fh.buf.length); this.editList = editList; endOffset = startOffset; nContext = 0; if (editList.isEmpty()) { newStartLine = 0; newLineCount = 0; } else { newStartLine = editList.get(0).getBeginB(); Edit last = editList.get(editList.size() - 1); newLineCount = last.getEndB() - newStartLine; } }
HunkHeader(FileHeader fh, EditList editList) { this(fh, fh.buf.length); this.editList = editList; endOffset = startOffset; nContext = 0; if (editList.isEmpty()) { newStartLine = 0; newLineCount = 0; } else { newStartLine = editList.get(0).getBeginB(); Edit last = editList.get(editList.size() - 1); newLineCount = last.getEndB() - newStartLine; } }
int linesAdded = 0; int linesDeleted = 0; int filesChanged = 0; try { repo = new FileRepository(new File("repo/.git")); RevWalk rw = new RevWalk(repo); RevCommit commit = rw.parseCommit(repo.resolve("486817d67b")); // Any ref will work here (HEAD, a sha1, tag, branch) RevCommit parent = rw.parseCommit(commit.getParent(0).getId()); DiffFormatter df = new DiffFormatter(DisabledOutputStream.INSTANCE); df.setRepository(repo); df.setDiffComparator(RawTextComparator.DEFAULT); df.setDetectRenames(true); List<DiffEntry> diffs; diffs = df.scan(parent.getTree(), commit.getTree()); filesChanged = diffs.size(); for (DiffEntry diff : diffs) { for (Edit edit : df.toFileHeader(diff).toEditList()) { linesDeleted += edit.getEndA() - edit.getBeginA(); linesAdded += edit.getEndB() - edit.getBeginB(); } } } catch (IOException e1) { throw new RuntimeException(e1); }
int bCur = (int) Math.max(0, (long) curEdit.getBeginB() - context); final int aEnd = (int) Math.min(a.size(), (long) endEdit.getEndA() + context); final int bEnd = (int) Math.min(b.size(), (long) endEdit.getEndB() + context);
int bCur = (int) Math.max(0, (long) curEdit.getBeginB() - context); final int aEnd = (int) Math.min(a.size(), (long) endEdit.getEndA() + context); final int bEnd = (int) Math.min(b.size(), (long) endEdit.getEndB() + context);
final int startA = edit.getBeginA(); final int endA = edit.getEndA(); final int startB = edit.getBeginB(); final int endB = edit.getEndB();
ConflictState.NO_CONFLICT); result.add(1, oursEdit.getBeginB(), oursEdit.getEndB(), ConflictState.NO_CONFLICT); current = oursEdit.getEndA(); ConflictState.NO_CONFLICT); result.add(2, theirsEdit.getBeginB(), theirsEdit.getEndB(), ConflictState.NO_CONFLICT); current = theirsEdit.getEndA(); int oursBeginB = oursEdit.getBeginB(); int theirsBeginB = theirsEdit.getBeginB();
ConflictState.NO_CONFLICT); result.add(1, oursEdit.getBeginB(), oursEdit.getEndB(), ConflictState.NO_CONFLICT); current = oursEdit.getEndA(); ConflictState.NO_CONFLICT); result.add(2, theirsEdit.getBeginB(), theirsEdit.getEndB(), ConflictState.NO_CONFLICT); current = theirsEdit.getEndA(); int oursBeginB = oursEdit.getBeginB(); int theirsBeginB = theirsEdit.getBeginB();
new RawText(openBlob(1))); for (Edit e : edits) addedLines += e.getEndB() - e.getBeginB();