/** * @return the {@code DiffEntry} in the form of a readable {@code String} */ @Override public String toString() { StringBuilder sb = new StringBuilder(changeType().toString()); if (!isAdd()) { sb.append(" [").append(oldObject).append("] "); } if (isChange()) { sb.append("->"); } if (!isDelete()) { sb.append(" [").append(newObject).append("]"); } return sb.toString(); }
public void addUnconflicted(DiffEntry diff) { TreeReport treeReport = parentReport(diff.path()); TYPE type = (diff.isAdd() ? diff.getNewObject() : diff.getOldObject()).getType(); if (TYPE.FEATURE == type) { treeReport.unconflictedFeatures.incrementAndGet(); } else { treeReport.unconflictedTrees.incrementAndGet(); } }
@Override public NodeRef apply(DiffEntry e) { if (e.isAdd()) { return e.getNewObject(); } if (e.isDelete()) { return e.getOldObject(); } return ChangeType.CHANGED_OLD.equals(changeType) ? e.getOldObject() : e.getNewObject(); }};
DiffEntry diff = diffs.next(); if (path.equals(diff.newPath())) { if (diff.isAdd()) { String refSpec = commit.getId().toString() + ":" + path; RevFeature feature = revObjectParse.setRefSpec(refSpec)
assertEquals(ChangeType.REMOVED, entry.changeType()); assertTrue(entry.isDelete()); assertFalse(entry.isAdd()); assertFalse(entry.isChange()); assertEquals(nodeRef.path(), entry.path()); assertEquals(ChangeType.ADDED, entry.changeType()); assertFalse(entry.isDelete()); assertTrue(entry.isAdd()); assertFalse(entry.isChange()); assertEquals(nodeRef.path(), entry.path()); assertEquals(ChangeType.MODIFIED, entry.changeType()); assertFalse(entry.isDelete()); assertFalse(entry.isAdd()); assertTrue(entry.isChange()); assertEquals(nodeRef2.path(), entry.path());