private static boolean end(Edit edit, int a, int b) { return edit.getEndA() <= a && edit.getEndB() <= b; } }
private boolean combineA(List<Edit> e, int i) { return e.get(i).getBeginA() - e.get(i - 1).getEndA() <= 2 * context; }
if (oursEdit.getEndA() < theirsEdit.getBeginA()) { current = oursEdit.getEndA(); oursEdit = nextEdit(baseToOurs); } else if (theirsEdit.getEndA() < oursEdit.getBeginA()) { current = theirsEdit.getEndA(); theirsEdit = nextEdit(baseToTheirs); } else { Edit nextTheirsEdit = nextEdit(baseToTheirs); for (;;) { if (oursEdit.getEndA() >= nextTheirsEdit.getBeginA()) { theirsEdit = nextTheirsEdit; nextTheirsEdit = nextEdit(baseToTheirs); } else if (theirsEdit.getEndA() >= nextOursEdit.getBeginA()) { oursEdit = nextOursEdit; nextOursEdit = nextEdit(baseToOurs); if (oursEdit.getEndA() < theirsEdit.getEndA()) { oursEndB += theirsEdit.getEndA() - oursEdit.getEndA(); } else { theirsEndB += oursEdit.getEndA() - theirsEdit.getEndA(); current = Math.max(oursEdit.getEndA(), theirsEdit.getEndA()); oursEdit = nextOursEdit; theirsEdit = nextTheirsEdit;
private static boolean end(final Edit edit, final int a, final int b) { return edit.getEndA() <= a && edit.getEndB() <= b; } }
private static boolean end(Edit edit, int a, int b) { return edit.getEndA() <= a && edit.getEndB() <= b; } }
private boolean combineA(final List<Edit> e, final int i) { return e.get(i).getBeginA() - e.get(i - 1).getEndA() <= 2 * context; }
private boolean combineA(List<Edit> e, int i) { return e.get(i).getBeginA() - e.get(i - 1).getEndA() <= 2 * context; }
int d = endB - e.getEndA(); if (aTail == null) a.regionList = r;
/** 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()); } } } }
/** Populates the value for {@link #next} to be returned. */ private void populateNext() { if (next == null) { nextEdit(); if (currentEdit != null) { if (baseLineNo < currentEdit.getEndA()) { next = new JgitDifference(CheckstyleTextParser.BASE_REPORT_INDEX, baseLineNo, baseFileRaw.getString(baseLineNo)); baseLineNo++; } else if (patchLineNo < currentEdit.getEndB()) { next = new JgitDifference(CheckstyleTextParser.PATCH_REPORT_INDEX, patchLineNo, patchFileRaw.getString(patchLineNo)); patchLineNo++; } } } }
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); }
if (oursEdit.getEndA() < theirsEdit.getBeginA()) { current = oursEdit.getEndA(); oursEdit = nextEdit(baseToOurs); } else if (theirsEdit.getEndA() < oursEdit.getBeginA()) { current = theirsEdit.getEndA(); theirsEdit = nextEdit(baseToTheirs); } else { Edit nextTheirsEdit = nextEdit(baseToTheirs); for (;;) { if (oursEdit.getEndA() >= nextTheirsEdit.getBeginA()) { theirsEdit = nextTheirsEdit; nextTheirsEdit = nextEdit(baseToTheirs); } else if (theirsEdit.getEndA() >= nextOursEdit.getBeginA()) { oursEdit = nextOursEdit; nextOursEdit = nextEdit(baseToOurs); if (oursEdit.getEndA() < theirsEdit.getEndA()) { oursEndB += theirsEdit.getEndA() - oursEdit.getEndA(); } else { theirsEndB += oursEdit.getEndA() - theirsEdit.getEndA(); current = Math.max(oursEdit.getEndA(), theirsEdit.getEndA()); oursEdit = nextOursEdit; theirsEdit = nextTheirsEdit;
if (oursEdit.getEndA() < theirsEdit.getBeginA()) { current = oursEdit.getEndA(); oursEdit = nextEdit(baseToOurs); } else if (theirsEdit.getEndA() < oursEdit.getBeginA()) { current = theirsEdit.getEndA(); theirsEdit = nextEdit(baseToTheirs); } else { Edit nextTheirsEdit = nextEdit(baseToTheirs); for (;;) { if (oursEdit.getEndA() >= nextTheirsEdit.getBeginA()) { theirsEdit = nextTheirsEdit; nextTheirsEdit = nextEdit(baseToTheirs); } else if (theirsEdit.getEndA() >= nextOursEdit.getBeginA()) { oursEdit = nextOursEdit; nextOursEdit = nextEdit(baseToOurs); if (oursEdit.getEndA() < theirsEdit.getEndA()) { oursEndB += theirsEdit.getEndA() - oursEdit.getEndA(); } else { theirsEndB += oursEdit.getEndA() - theirsEdit.getEndA(); current = Math.max(oursEdit.getEndA(), theirsEdit.getEndA()); oursEdit = nextOursEdit; theirsEdit = nextTheirsEdit;
final String changeType = header.getChangeType().toString(); final int startA = edit.getBeginA(); final int endA = edit.getEndA(); final int startB = edit.getBeginB(); final int endB = edit.getEndB();
int d = endB - e.getEndA(); if (aTail == null) a.regionList = r;
int d = endB - e.getEndA(); if (aTail == null) a.regionList = r;