private DiffObjectInfo<T> toDiffObject(DiffEntry e, Map<ObjectId, T> values) { T oldValue = values.get(e.oldObjectId()); T newValue = values.get(e.newObjectId()); return new DiffObjectInfo<>(e, oldValue, newValue); } }
ObjectId newId = e.newObjectId(); if (!oldId.isNull()) { leftEntriesIds.add(oldId);
sb.append('\t').append(path).append(' ') .append(diffEntry.oldObjectId().toString()).append(' ') .append(diffEntry.newObjectId().toString()).append('\n');
sb.append('\t').append(path).append(' ') .append(diffEntry.oldObjectId().toString()).append(' ') .append(diffEntry.newObjectId().toString()).append('\n');
? RevTree.EMPTY_TREE_ID : treeDiff.oldObjectId(); final ObjectId newCanonical = treeDiff.newObjectId().isNull() ? RevTree.EMPTY_TREE_ID : treeDiff.newObjectId();
sb.append(diffEntry.oldObjectId().toString()); sb.append(' '); sb.append(diffEntry.newObjectId().toString()); cli.getConsole().println(sb.toString());
sb.append(diffEntry.oldObjectId().toString()); sb.append(' '); sb.append(diffEntry.newObjectId().toString()); cli.getConsole().println(sb.toString());
private void assertDiffObjects(List<DiffObjectInfo<RevFeature>> objects) { for (DiffObjectInfo<RevFeature> o : objects) { DiffEntry entry = o.entry(); switch (entry.changeType()) { case ADDED: assertFalse(o.oldValue().isPresent()); assertTrue(o.newValue().isPresent()); assertEquals(entry.newObjectId(), o.newValue().get().getId()); break; case MODIFIED: assertTrue(o.oldValue().isPresent()); assertTrue(o.newValue().isPresent()); assertEquals(entry.oldObjectId(), o.oldValue().get().getId()); assertEquals(entry.newObjectId(), o.newValue().get().getId()); break; case REMOVED: assertTrue(o.oldValue().isPresent()); assertFalse(o.newValue().isPresent()); assertEquals(entry.oldObjectId(), o.oldValue().get().getId()); break; default: throw new IllegalStateException(); } } }
if (diffEntry.changeType() == ChangeType.MODIFIED) { RevObject revObject = command(RevObjectParse.class) .setObjectId(diffEntry.newObjectId()).call().get(); if (revObject instanceof RevFeature) { FeatureDiff diff = command(DiffFeature.class) .setObjectId(diffEntry.newObjectId()).call().get(); if (revObject instanceof RevFeature) { RevFeatureType featureType;
if (!headObj.get().getId().equals(diff.newObjectId())) { consumer.conflicted(new Conflict(path, ObjectId.NULL, diff.newObjectId(), headObj.get().getId())); report.addConflict(path); } else { consumer.conflicted(new Conflict(path, diff.oldObjectId(), diff.newObjectId(), headObj.get().getId())); report.addConflict(path);
.equals(diff2.getNewObject().getMetadataId()); } else { isConflict = !diff1.newObjectId().equals(diff2.newObjectId());
@Test public void testReportRename() throws Exception { insertAndAdd(lines1); final RevCommit commit1 = geogig.command(CommitOp.class).setAll(true).call(); Feature lines1B = feature(linesType, idL2, "StringProp2_1", new Integer(1000), "LINESTRING (1 1, 2 2)"); delete(lines1); // insert(lines2); WorkingTree workTree = repo.workingTree(); Name name = lines1.getType().getName(); String parentPath = name.getLocalPart(); workTree.insert(featureInfo(parentPath, lines1B)); geogig.command(AddOp.class).call(); RevCommit commit2 = geogig.command(CommitOp.class).setAll(true).call(); List<DiffEntry> diffs; diffOp.setOldVersion(commit1.getId()); diffOp.setNewVersion(commit2.getId()); diffs = toList(diffOp.call()); assertEquals(2, diffs.size()); // this is reported as an addition and a removal, with both // nodes pointing to same ObjectId assertEquals(diffs.get(0).newObjectId(), diffs.get(1).oldObjectId()); assertEquals(diffs.get(1).newObjectId(), diffs.get(0).oldObjectId()); }
final ObjectId ours = oursDiff.newObjectId(); final ObjectId theirs = theirsDiff.newObjectId(); } else if (diffMergeFeatureResult.isMerge()) { RevFeature mergedFeature = diffMergeFeatureResult.mergedFeature(); if (mergedFeature.getId().equals(theirsDiff.newObjectId())) {
@Test public void testSingleAdditionReverseOrder() throws Exception { final ObjectId newOid = insertAndAdd(points1); final RevCommit commit = geogig.command(CommitOp.class).setAll(true).call(); List<DiffEntry> difflist = toList( diffOp.setOldVersion(commit.getId()).setNewVersion(ObjectId.NULL).call()); assertNotNull(difflist); assertEquals(1, difflist.size()); DiffEntry de = difflist.get(0); assertNull(de.getNewObject()); assertNotNull(de.getOldObject()); assertEquals(DiffEntry.ChangeType.REMOVED, de.changeType()); assertEquals(ObjectId.NULL, de.newObjectId()); assertEquals(newOid, de.oldObjectId()); assertFalse(de.getOldObject().getMetadataId().isNull()); }
@Test public void testSingleModification() throws Exception { final ObjectId oldOid = insertAndAdd(points1); final RevCommit insertCommit = geogig.command(CommitOp.class).setAll(true).call(); final ObjectId newOid = insertAndAdd(points1_modified); final RevCommit changeCommit = geogig.command(CommitOp.class).setAll(true).call(); List<DiffEntry> difflist = toList(diffOp.setOldVersion(insertCommit.getId()) .setNewVersion(changeCommit.getId()).call()); assertNotNull(difflist); assertEquals(1, difflist.size()); DiffEntry de = difflist.get(0); String expectedPath = NodeRef.appendChild(pointsName, points1.getIdentifier().getID()); assertEquals(expectedPath, de.newPath()); assertEquals(DiffEntry.ChangeType.MODIFIED, de.changeType()); assertEquals(oldOid, de.oldObjectId()); assertEquals(newOid, de.newObjectId()); }
@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()); }
@Test public void testSingleAddition() throws Exception { final ObjectId newOid = insertAndAdd(points1); geogig.command(CommitOp.class).setAll(true).call(); List<DiffEntry> difflist = toList( diffOp.setOldVersion(ObjectId.NULL).setNewVersion(Ref.HEAD).call()); assertNotNull(difflist); assertEquals(1, difflist.size()); DiffEntry de = difflist.get(0); assertNull(de.getOldObject()); assertNotNull(de.getNewObject()); String expectedPath = NodeRef.appendChild(pointsName, points1.getIdentifier().getID()); assertEquals(expectedPath, de.newPath()); assertEquals(DiffEntry.ChangeType.ADDED, de.changeType()); assertEquals(ObjectId.NULL, de.oldObjectId()); assertEquals(newOid, de.newObjectId()); assertFalse(de.getNewObject().getMetadataId().isNull()); }
assertEquals(ChangeType.MODIFIED, diff.changeType()); assertEquals(initialOid, diff.oldObjectId()); assertEquals(modifiedOid, diff.newObjectId()); assertEquals(ChangeType.REMOVED, diff.changeType()); assertEquals(initialOid, diff.oldObjectId()); assertEquals(ObjectId.NULL, diff.newObjectId()); assertEquals(ChangeType.ADDED, diff.changeType()); assertEquals(ObjectId.NULL, diff.oldObjectId()); assertEquals(initialOid, diff.newObjectId()); assertEquals(ChangeType.ADDED, diff.changeType()); assertEquals(ObjectId.NULL, diff.oldObjectId()); assertEquals(modifiedOid, diff.newObjectId());
@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(null, entry.getNewObject()); assertFalse(entry.newObject().isPresent()); assertEquals(ObjectId.NULL, entry.newObjectId()); assertEquals(ObjectId.NULL, entry.newMetadataId()); assertEquals(null, entry.newName()); assertEquals(nodeRef, entry.getNewObject()); assertEquals(nodeRef, entry.newObject().get()); assertEquals(node.getObjectId(), entry.newObjectId()); assertEquals(node.getMetadataId().get(), entry.newMetadataId()); assertEquals(node.getName(), entry.newName()); assertEquals(nodeRef2, entry.getNewObject()); assertEquals(nodeRef2, entry.newObject().get()); assertEquals(node2.getObjectId(), entry.newObjectId()); assertEquals(node2.getMetadataId().get(), entry.newMetadataId()); assertEquals(node2.getName(), entry.newName());