b.setTreeId(batch.get(0).getTree()); b.setParentIds(parents); b.setAuthor(tmpAuthor(batch));
/** * Create a new commit by explicitly specifying the content tree and the * parents. The commit message is not set and author/committer are set to * the current user. * * @param tree * the tree this commit should capture * @param parents * the list of parent commits * @return a new commit visible only within this merger's RevWalk. * @throws IOException */ private RevCommit createCommitForTree(ObjectId tree, List<RevCommit> parents) throws IOException { CommitBuilder c = new CommitBuilder(); c.setTreeId(tree); c.setParentIds(parents); c.setAuthor(mockAuthor(parents)); c.setCommitter(c.getAuthor()); return RevCommit.parse(walk, c.build()); }
cb.setAuthor(pc.ident); cb.setCommitter(pc.ident); cb.setTreeId(dc.writeTree(inserter)); if (curr != null) { cb.setParentId(curr);
private ObjectId insertSingleProposal(Repository git, ProposedTimestamp ts, ObjectInserter inserter) throws IOException, NoOp { // Fast path: tree is passed in with all proposals applied. ObjectId treeId = queuedTree.writeTree(inserter); queuedTree = null; leader.roundHoldsReferenceToRefTree = false; if (!ObjectId.zeroId().equals(acceptedOldIndex)) { try (RevWalk rw = new RevWalk(git)) { RevCommit c = rw.parseCommit(acceptedOldIndex); if (treeId.equals(c.getTree())) { throw new NoOp(); } } } Proposal p = todo.get(0); CommitBuilder b = new CommitBuilder(); b.setTreeId(treeId); if (!ObjectId.zeroId().equals(acceptedOldIndex)) { b.setParentId(acceptedOldIndex); } b.setCommitter(leader.getSystem().newCommitter(ts)); b.setAuthor(p.getAuthor() != null ? p.getAuthor() : b.getCommitter()); b.setMessage(message(p)); return inserter.insert(b); }
static void commitNoteMap(Repository r, String ref, RevWalk walk, NoteMap map, RevCommit notesCommit, ObjectInserter inserter, String msg) throws IOException { // commit the note CommitBuilder builder = new CommitBuilder(); builder.setTreeId(map.writeTree(inserter)); builder.setAuthor(new PersonIdent(r)); builder.setCommitter(builder.getAuthor()); builder.setMessage(msg); if (notesCommit != null) builder.setParentIds(notesCommit); ObjectId commit = inserter.insert(builder); inserter.flush(); RefUpdate refUpdate = r.updateRef(ref); if (notesCommit != null) refUpdate.setExpectedOldObjectId(notesCommit); else refUpdate.setExpectedOldObjectId(ObjectId.zeroId()); refUpdate.setNewObjectId(commit); refUpdate.update(walk); }
commit.setTreeId(treeId); if (headId != null) commit.setParentIds(headId);
builder.setTreeId(cache.writeTree(inserter)); builder.setMessage(MessageFormat.format(indexMessage, branch, headCommit.abbreviate(7).name(), builder.setTreeId(untrackedDirCache.writeTree(inserter)); builder.setMessage(MessageFormat.format(MSG_UNTRACKED, branch, headCommit.abbreviate(7).name(), headCommit.abbreviate(7).name(), headCommit.getShortMessage())); builder.setTreeId(cache.writeTree(inserter)); commitId = inserter.insert(builder); inserter.flush();
commit.setTreeId(indexTreeId); ObjectId commitId = odi.insert(commit); odi.flush();
private boolean apply(List<Command> todo) throws IOException { if (!tree.apply(todo)) { // apply set rejection information on commands. return false; } Repository repo = refdb.getRepository(); try (ObjectInserter ins = repo.newObjectInserter()) { CommitBuilder b = new CommitBuilder(); b.setTreeId(tree.writeTree(ins)); if (parentTreeId.equals(b.getTreeId())) { for (Command c : todo) { c.setResult(OK); } return true; } if (!parentCommitId.equals(ObjectId.zeroId())) { b.setParentId(parentCommitId); } author = getRefLogIdent(); if (author == null) { author = new PersonIdent(repo); } b.setAuthor(author); b.setCommitter(author); b.setMessage(getRefLogMessage()); newCommitId = ins.insert(b); ins.flush(); } return true; }
@Nonnull private static AnyObjectId insertCommit(@Nonnull String message, @Nonnull AnyObjectId treeId, @Nonnull PersonIdent author, @Nonnull PersonIdent committer, @Nonnull List<AnyObjectId> parents, @Nonnull ObjectInserter inserter) throws IOException { CommitBuilder builder = new CommitBuilder(); builder.setCommitter(committer); builder.setAuthor(author); builder.setMessage(message); builder.setTreeId(treeId); builder.setParentIds(parents); return inserter.insert(builder); }
b.setTreeId(treeId); if (!ObjectId.zeroId().equals(lastIndex)) { b.setParentId(lastIndex);
@Nonnull private static ObjectId insertCommit(String message, AnyObjectId treeId, PersonIdent author, PersonIdent committer, List<? extends AnyObjectId> parents, ObjectInserter inserter) throws IOException { CommitBuilder builder = new CommitBuilder(); builder.setCommitter(committer); builder.setAuthor(author); builder.setMessage(message); builder.setTreeId(treeId); builder.setParentIds(parents); return inserter.insert(builder); }
@Nonnull private static ObjectId insertCommit(String message, AnyObjectId treeId, PersonIdent author, PersonIdent committer, List<? extends AnyObjectId> parents, ObjectInserter inserter) throws IOException { CommitBuilder builder = new CommitBuilder(); builder.setCommitter(committer); builder.setAuthor(author); builder.setMessage(message); builder.setTreeId(treeId); builder.setParentIds(parents); return inserter.insert(builder); }
@NotNull @Override public ObjectId convert(@NotNull Repository dstRepo, @NotNull ObjectInserter inserter, @NotNull ConvertResolver resolver, @Nullable Uploader uploader) throws IOException { final CommitBuilder builder = new CommitBuilder(); builder.setAuthor(revObject.getAuthorIdent()); builder.setCommitter(revObject.getCommitterIdent()); builder.setEncoding(revObject.getEncoding()); builder.setMessage(revObject.getFullMessage()); // Set parents for (RevCommit oldParent : revObject.getParents()) { builder.addParentId(resolver.resolve(TaskType.Simple, "", oldParent)); } // Set tree builder.setTreeId(resolver.resolve(TaskType.Simple, "", revObject.getTree())); return inserter.insert(builder); } };
public static ObjectId createCacheCommit(@NotNull ObjectInserter inserter, @NotNull ObjectId parent, @NotNull RevCommit commit, int revisionId, @NotNull Map<String, ObjectId> revBranches) throws IOException { final TreeFormatter treeBuilder = new TreeFormatter(); treeBuilder.append(ENTRY_COMMIT_REF, commit); treeBuilder.append("svn", FileMode.TREE, createSvnLayoutTree(inserter, revBranches)); new ObjectChecker().checkTree(treeBuilder.toByteArray()); final ObjectId rootTree = inserter.insert(treeBuilder); final CommitBuilder commitBuilder = new CommitBuilder(); commitBuilder.setAuthor(commit.getAuthorIdent()); commitBuilder.setCommitter(commit.getCommitterIdent()); commitBuilder.setMessage("#" + revisionId + ": " + commit.getFullMessage()); commitBuilder.addParentId(parent); // Add reference to original commit as parent for prevent commit removing by `git gc` (see #118). commitBuilder.addParentId(commit); commitBuilder.setTreeId(rootTree); return inserter.insert(commitBuilder); }
private RevCommit createCommit( NoteMap map, PersonIdent author, String message, RevCommit... parents) throws IOException { CommitBuilder b = new CommitBuilder(); b.setTreeId(map.writeTree(inserter)); b.setAuthor(author); b.setCommitter(author); if (parents.length > 0) { b.setParentIds(parents); } b.setMessage(message); ObjectId commitId = inserter.insert(b); inserter.flush(); return revWalk.parseCommit(commitId); } }
private CommitBuilder generateNewCommit(final Map<ObjectId, ObjectId> commitMap, final RevCommit commit, final ObjectId newCommitTree) { final CommitBuilder commitBuilder = new CommitBuilder(); commitBuilder.setAuthor(commit.getAuthorIdent()); commitBuilder.setCommitter(commit.getCommitterIdent()); commitBuilder.setTreeId(newCommitTree); commitBuilder.setMessage(commit.getFullMessage()); commitBuilder.setEncoding(commit.getEncoding()); final ObjectId[] newParentIds = closestMappedAncestorOrSelf(commitMap, commit.getParents()); if (newParentIds.length > 0) { commitBuilder.setParentIds(newParentIds); } return commitBuilder; }
private ObjectId writeCommit(final ObjectInserter inserter, final ObjectId commitTreeId, final ObjectId... parentIds) throws IOException { final CommitBuilder builder = new CommitBuilder(); builder.setAuthor(new PersonIdent("name", "name@example.com")); builder.setCommitter(new PersonIdent("name", "name@example.com")); builder.setTreeId(commitTreeId); builder.setMessage("merge commit"); builder.setParentIds(parentIds); final ObjectId commitId = inserter.insert(builder); return commitId; }
private ObjectId writeCommit(final ObjectInserter inserter, final ObjectId commitTreeId, final ObjectId... parentIds) throws IOException { final CommitBuilder builder = new CommitBuilder(); builder.setAuthor(new PersonIdent("name", "name@example.com")); builder.setCommitter(new PersonIdent("name", "name@example.com")); builder.setTreeId(commitTreeId); builder.setMessage("merge commit"); builder.setParentIds(parentIds); final ObjectId commitId = inserter.insert(builder); return commitId; }