public void addAlteredTree(DiffEntry diff) { ObjectId oldFeatureType = diff.getOldObject() == null ? null : diff.getOldObject().getMetadataId(); ObjectId newFeatureType = diff.getNewObject() == null ? null : diff.getNewObject().getMetadataId(); String path = diff.oldPath() == null ? diff.newPath() : diff.oldPath(); alteredTrees.add(new FeatureTypeDiff(path, oldFeatureType, newFeatureType)); }
diffEntry = diff.next(); String path = diffEntry.newPath() != null ? diffEntry.newPath() : diffEntry.oldPath(); sb.append('\t').append(path).append(' ') .append(diffEntry.oldObjectId().toString()).append(' ')
diffEntry = diff.next(); String path = diffEntry.newPath() != null ? diffEntry.newPath() : diffEntry.oldPath(); sb.append('\t').append(path).append(' ') .append(diffEntry.oldObjectId().toString()).append(' ')
StringBuilder sb = new StringBuilder(); String path = diffEntry.newPath() != null ? diffEntry.newPath() : diffEntry.oldPath();
StringBuilder sb = new StringBuilder(); String path = diffEntry.newPath() != null ? diffEntry.newPath() : diffEntry.oldPath();
break; case REMOVED: cli.getConsole().println("D\t" + entry.oldPath()); break;
break; case REMOVED: cli.getConsole().println("D\t" + entry.oldPath()); break;
featureTypes.put(oldObject.getMetadataId(), featureType); String name = diffEntry.oldPath(); patch.addRemovedFeature(name, (RevFeature) revObject, featureType); } else if (revObject instanceof RevTree) {
@Test public void testSingleDeletion() throws Exception { final ObjectId featureContentId = insertAndAdd(points1); final RevCommit addCommit = geogig.command(CommitOp.class).setAll(true).call(); assertTrue(deleteAndAdd(points1)); final RevCommit deleteCommit = geogig.command(CommitOp.class).setAll(true).call(); List<DiffEntry> difflist = toList( diffOp.setOldVersion(addCommit.getId()).setNewVersion(deleteCommit.getId()).call()); final String path = NodeRef.appendChild(pointsName, points1.getIdentifier().getID()); assertNotNull(difflist); assertEquals(1, difflist.size()); DiffEntry de = difflist.get(0); assertEquals(path, de.oldPath()); assertEquals(DiffEntry.ChangeType.REMOVED, de.changeType()); assertEquals(featureContentId, de.oldObjectId()); assertEquals(ObjectId.NULL, de.newObjectId()); }
while (diff.hasNext()) { diffEntry = diff.next(); String path = diffEntry.isDelete() ? diffEntry.oldPath() : diffEntry.newPath(); ansi.a("\t" + path).newline();
while (diff.hasNext()) { diffEntry = diff.next(); String path = diffEntry.isDelete() ? diffEntry.oldPath() : diffEntry.newPath(); ansi.a("\t" + path).newline();
@Test public void testSingleDeletionReverseOrder() throws Exception { final ObjectId featureContentId = insertAndAdd(points1); final RevCommit addCommit = geogig.command(CommitOp.class).setAll(true).call(); assertTrue(deleteAndAdd(points1)); final RevCommit deleteCommit = geogig.command(CommitOp.class).setAll(true).call(); // set old/new version in reverse order List<DiffEntry> difflist = toList( diffOp.setOldVersion(deleteCommit.getId()).setNewVersion(addCommit.getId()).call()); final String path = NodeRef.appendChild(pointsName, points1.getIdentifier().getID()); // then the diff should report an ADD instead of a DELETE assertNotNull(difflist); assertEquals(1, difflist.size()); DiffEntry de = difflist.get(0); assertNull(de.oldPath()); assertEquals(path, de.newPath()); assertEquals(DiffEntry.ChangeType.ADDED, de.changeType()); assertEquals(ObjectId.NULL, de.oldObjectId()); assertEquals(featureContentId, de.newObjectId()); }
assertEquals(node.getName(), entry.oldName()); assertEquals(node.getType(), entry.oldObjectType()); assertEquals(nodeRef.path(), entry.oldPath()); assertEquals(null, entry.getNewObject()); assertFalse(entry.newObject().isPresent()); assertEquals(null, entry.oldName()); assertEquals(null, entry.oldObjectType()); assertEquals(null, entry.oldPath()); assertEquals(nodeRef, entry.getNewObject()); assertEquals(nodeRef, entry.newObject().get()); assertEquals(node.getName(), entry.oldName()); assertEquals(node.getType(), entry.oldObjectType()); assertEquals(nodeRef.path(), entry.oldPath()); assertEquals(nodeRef2, entry.getNewObject()); assertEquals(nodeRef2, entry.newObject().get());