/** * @param left the left {@link RevCommit} */ public FindCommonAncestor setLeft(RevCommit left) { this.left = left.getId(); return this; }
@Override public String toString() { return new StringBuilder().append(value.orNull()).append('/').append(commit.getId()) .toString(); } }
private String fmt(RevCommit c) { String msg = c.getMessage(); if (msg.length() > 30) { msg = msg.substring(0, 30) + "..."; } return String.format("%s (%s)", c.getId().toString().substring(0, 8), msg); }
protected String fmt(RevCommit c) { String msg = c.getMessage(); if (msg.length() > 30) { msg = msg.substring(0, 30) + "..."; } return String.format("%s (%s)", c.getId().toString().substring(0, 8), msg); }
private List<RevCommit> getCommitsAfterUntil() { Iterator<RevCommit> commitIterator = command(LogOp.class).setSince(until.getId()).call(); List<RevCommit> commits = Lists.newArrayList(commitIterator); Collections.reverse(commits); return commits; }
public static String toString(@NonNull RevCommit c) { return String.format("%s(%s)[tree:%s, parents:%s, msg:%s, author:%s, committer:%s]", c.getClass().getSimpleName(), // toShortString(c.getId()), // toShortString(c.getTreeId()), // c.getParentIds().stream().map(RevObjects::toShortString) .collect(Collectors.toList()), // c.getMessage(), // toShortString(c.getAuthor()), // toShortString(c.getCommitter())); }
@Override public void print(RevCommit commit) throws IOException { Ansi ansi = newAnsi(console); ansi.fg(Color.YELLOW).a(getIdAsString(commit.getId())).reset(); String message = Strings.nullToEmpty(commit.getMessage()); String title = Splitter.on('\n').split(message).iterator().next(); ansi.a(" ").a(title); console.println(ansi.toString()); }
@Override protected FilteredDiffIterator getFilteredChanges(final Repository local, RevCommit commit) { ObjectId parent = ObjectId.NULL; if (commit.getParentIds().size() > 0) { parent = commit.getParentIds().get(0); } AutoCloseableIterator<DiffEntry> changes = remoteRepo.command(DiffOp.class) .setNewVersion(commit.getId()).setOldVersion(parent).setReportTrees(true).call(); Optional<RepositoryFilter> filter = RepositoryImpl.getFilter(local); checkState(filter.isPresent(), "No filter found for sparse clone."); return new LocalFilteredDiffIterator(changes, remoteRepo, local, filter.get()); }
private void testCommit(RevCommit commit) throws IOException { ByteArrayOutputStream out = new ByteArrayOutputStream(); serializer.write(commit, out); RevObject read = serializer.read(commit.getId(), new ByteArrayInputStream(out.toByteArray())); assertEquals(commit, read); }
/** * Overrides to add graphdb commit to parents mappings on commits */ public @Override boolean put(final RevObject object) { final boolean added = super.put(object); if (added && TYPE.COMMIT.equals(object.getType())) { RevCommit c = (RevCommit) object; graph.put(c.getId(), c.getParentIds()); } return added; }
public @Test void testAllVersionsVsParent() throws IOException { final List<RevCommit> commits = this.branch1Commits; // latest commit is the lates on the list for (int i = commits.size() - 1; i > 0; i--) { String head = commits.get(i).getId().toString(); String oldHead = head + "~1"; testLayerDiff(pointsName, oldHead, head); testLayerDiff(linesName, oldHead, head); } }
@Test public void testParseCommitIds() { assertParsed(masterCommit1, revParse(masterCommit1.getId().toString())); assertParsed(masterCommit2, revParse(masterCommit2.getId().toString())); assertParsed(masterCommit3, revParse(masterCommit3.getId().toString())); assertParsed(masterCommit4, revParse(masterCommit4.getId().toString())); assertParsed(branchCommit1, revParse(branchCommit1.getId().toString())); assertParsed(branchCommit2, revParse(branchCommit2.getId().toString())); assertParsed(mergeCommit.getId(), revParse(mergeCommit.getId().toString())); }
@Test public void testCherryPickExistingCommit() throws Exception { insertAndAdd(points1); final RevCommit c1 = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); CherryPickOp cherryPick = geogig.command(CherryPickOp.class); cherryPick.setCommit(Suppliers.ofInstance(c1.getId())); exception.expect(NothingToCommitException.class); cherryPick.call(); } }
@Test public void testTagCreation() throws Exception { insertAndAdd(points1); RevCommit commit = geogig.command(CommitOp.class).call(); RevTag tag = geogig.command(TagCreateOp.class).setCommitId(commit.getId()).setName("Tag1") .call(); Optional<RevTag> databaseTag = geogig.command(RevObjectParse.class).setRefSpec("Tag1") .call(RevTag.class); assertTrue(databaseTag.isPresent()); assertEquals(tag, databaseTag.get()); }
@Test public void testUncleanWorkingTree() throws Exception { insertAndAdd(points1); RevCommit c1 = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); insert(points2); exception.expect(IllegalStateException.class); geogig.command(RevertOp.class).addCommit(c1.getId()).call(); }
@Test public void testUncleanIndex() throws Exception { insertAndAdd(points1); RevCommit c1 = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); insertAndAdd(points2); exception.expect(IllegalStateException.class); geogig.command(RevertOp.class).addCommit(c1.getId()).call(); }
@Test public void testCreateBranchWithTheSameNameAsExistingBranchAndForce() throws Exception { insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("Commit1").call(); geogig.command(BranchCreateOp.class).setName("branch1").call(); insertAndAdd(points2); RevCommit newCommit = geogig.command(CommitOp.class).setMessage("Commit2").call(); geogig.command(BranchCreateOp.class).setName("branch1").setForce(true).call(); Optional<Ref> branch1 = geogig.command(RefParse.class).setName("branch1").call(); assertTrue(branch1.isPresent()); assertEquals(branch1.get().getObjectId(), newCommit.getId()); }
@Test public void testNoUserNameForResolveCommiter() throws Exception { insertAndAdd(points1); RevCommit c1 = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); repo.command(ConfigOp.class).setAction(ConfigAction.CONFIG_SET).setName("user.name") .setValue(null).call(); exception.expect(IllegalStateException.class); geogig.command(RevertOp.class).addCommit(c1.getId()).call(); }
@Test public void testNoUserEmailForResolveCommiterEmail() throws Exception { insertAndAdd(points1); RevCommit c1 = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); repo.command(ConfigOp.class).setAction(ConfigAction.CONFIG_SET).setName("user.email") .setValue(null).call(); exception.expect(IllegalStateException.class); geogig.command(RevertOp.class).addCommit(c1.getId()).call(); }