try { for (int i = 0; args != null && i < args.size(); i++) { reset.addPattern(args.get(i));
try { for (int i = 0; args != null && i < args.size(); i++) { reset.addPattern(args.get(i));
try { for (int i = 0; args != null && i < args.size(); i++) { reset.addPattern(args.get(i));
@Test public void testResetModePlusPatterns() throws Exception { ObjectId oId1 = insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); assertEquals(oId1, repo.index().findStaged(appendChild(pointsName, idP1)).get().getObjectId()); ObjectId oId1_modified = insertAndAdd(points1_modified); ObjectId oId2 = insertAndAdd(points2); ObjectId oId3 = insertAndAdd(points3); assertEquals(oId1_modified, repo.index().findStaged(appendChild(pointsName, idP1)).get().getObjectId()); assertEquals(oId2, repo.index().findStaged(appendChild(pointsName, idP2)).get().getObjectId()); assertEquals(oId3, repo.index().findStaged(appendChild(pointsName, idP3)).get().getObjectId()); exception.expect(IllegalArgumentException.class); geogig.command(ResetOp.class).addPattern(pointsName).setMode(ResetMode.SOFT).call(); }
@Test public void testResetModePlusPatterns() throws Exception { ObjectId oId1 = insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); assertEquals(oId1, repo.index().findStaged(appendChild(pointsName, idP1)).get().getObjectId()); ObjectId oId1_modified = insertAndAdd(points1_modified); ObjectId oId2 = insertAndAdd(points2); ObjectId oId3 = insertAndAdd(points3); assertEquals(oId1_modified, repo.index().findStaged(appendChild(pointsName, idP1)).get().getObjectId()); assertEquals(oId2, repo.index().findStaged(appendChild(pointsName, idP2)).get().getObjectId()); assertEquals(oId3, repo.index().findStaged(appendChild(pointsName, idP3)).get().getObjectId()); exception.expect(IllegalArgumentException.class); geogig.command(ResetOp.class).addPattern(pointsName).setMode(ResetMode.SOFT).call(); }
@Test public void testResetSingle() throws Exception { ObjectId oId1 = insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); assertEquals(oId1, repo.index().findStaged(appendChild(pointsName, idP1)).get().getObjectId()); ObjectId oId1_modified = insertAndAdd(points1_modified); ObjectId oId2 = insertAndAdd(points2); ObjectId oId3 = insertAndAdd(points3); assertEquals(oId1_modified, repo.index().findStaged(appendChild(pointsName, idP1)).get().getObjectId()); assertEquals(oId2, repo.index().findStaged(appendChild(pointsName, idP2)).get().getObjectId()); assertEquals(oId3, repo.index().findStaged(appendChild(pointsName, idP3)).get().getObjectId()); geogig.command(ResetOp.class).addPattern(appendChild(pointsName, idP2)).call(); assertEquals(oId1_modified, repo.index().findStaged(appendChild(pointsName, idP1)).get().getObjectId()); assertFalse(repo.index().findStaged(appendChild(pointsName, idP2)).isPresent()); assertTrue(repo.index().findStaged(appendChild(pointsName, idP3)).isPresent()); assertEquals(oId1_modified, repo.workingTree().findUnstaged(appendChild(pointsName, idP1)).get().getObjectId()); assertEquals(oId2, repo.workingTree().findUnstaged(appendChild(pointsName, idP2)).get().getObjectId()); assertEquals(oId3, repo.workingTree().findUnstaged(appendChild(pointsName, idP3)).get().getObjectId()); }
@Test public void testResetSingle() throws Exception { ObjectId oId1 = insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); assertEquals(oId1, repo.index().findStaged(appendChild(pointsName, idP1)).get().getObjectId()); ObjectId oId1_modified = insertAndAdd(points1_modified); ObjectId oId2 = insertAndAdd(points2); ObjectId oId3 = insertAndAdd(points3); assertEquals(oId1_modified, repo.index().findStaged(appendChild(pointsName, idP1)).get().getObjectId()); assertEquals(oId2, repo.index().findStaged(appendChild(pointsName, idP2)).get().getObjectId()); assertEquals(oId3, repo.index().findStaged(appendChild(pointsName, idP3)).get().getObjectId()); geogig.command(ResetOp.class).addPattern(appendChild(pointsName, idP2)).call(); assertEquals(oId1_modified, repo.index().findStaged(appendChild(pointsName, idP1)).get().getObjectId()); assertFalse(repo.index().findStaged(appendChild(pointsName, idP2)).isPresent()); assertTrue(repo.index().findStaged(appendChild(pointsName, idP3)).isPresent()); assertEquals(oId1_modified, repo.workingTree().findUnstaged(appendChild(pointsName, idP1)).get().getObjectId()); assertEquals(oId2, repo.workingTree().findUnstaged(appendChild(pointsName, idP2)).get().getObjectId()); assertEquals(oId3, repo.workingTree().findUnstaged(appendChild(pointsName, idP3)).get().getObjectId()); }
repo.index().findStaged(appendChild(linesName, idL1)).get().getObjectId()); geogig.command(ResetOp.class).addPattern(pointsName).call();
repo.index().findStaged(appendChild(linesName, idL1)).get().getObjectId()); geogig.command(ResetOp.class).addPattern(pointsName).call();
@Test public void testResetPathFixesConflict() throws Exception { Feature points1Modified = feature(pointsType, idP1, "StringProp1_2", new Integer(1000), "POINT(1 1)"); Feature points1ModifiedB = feature(pointsType, idP1, "StringProp1_3", new Integer(2000), "POINT(1 1)"); insertAndAdd(points1); RevCommit resetCommit = geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); insertAndAdd(points1Modified); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); insertAndAdd(points1ModifiedB); insertAndAdd(points2); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("master").call(); Ref branch = geogig.command(RefParse.class).setName("TestBranch").call().get(); try { geogig.command(MergeOp.class).addCommit(branch.getObjectId()).call(); fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict")); } geogig.command(ResetOp.class).addPattern(pointsName + "/" + idP1) .setCommit(Suppliers.ofInstance(resetCommit.getId())).call(); Repository repository = geogig.getRepository(); ConflictsDatabase conflicts = repository.conflictsDatabase(); assertEquals(0, conflicts.getCountByPrefix(null, null)); }
@Test public void testResetPathFixesConflict() throws Exception { Feature points1Modified = feature(pointsType, idP1, "StringProp1_2", new Integer(1000), "POINT(1 1)"); Feature points1ModifiedB = feature(pointsType, idP1, "StringProp1_3", new Integer(2000), "POINT(1 1)"); insertAndAdd(points1); RevCommit resetCommit = geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); insertAndAdd(points1Modified); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); insertAndAdd(points1ModifiedB); insertAndAdd(points2); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("master").call(); Ref branch = geogig.command(RefParse.class).setName("TestBranch").call().get(); try { geogig.command(MergeOp.class).addCommit(branch.getObjectId()).call(); fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict")); } geogig.command(ResetOp.class).addPattern(pointsName + "/" + idP1) .setCommit(Suppliers.ofInstance(resetCommit.getId())).call(); Repository repository = geogig.getRepository(); ConflictsDatabase conflicts = repository.conflictsDatabase(); assertEquals(0, conflicts.getCountByPrefix(null, null)); }
geogig.command(ResetOp.class).addPattern(pointsName + "/" + idP1).call(); Repository repository = geogig.getRepository(); ConflictsDatabase conflicts = repository.conflictsDatabase();
geogig.command(ResetOp.class).addPattern(pointsName + "/" + idP1).call(); Repository repository = geogig.getRepository(); ConflictsDatabase conflicts = repository.conflictsDatabase();