Delete commented code

Leave working examples of using Git
This commit is contained in:
Paul Campbell 2018-05-31 23:38:54 +01:00
parent 5ffdb0f895
commit 1098cd2e21
2 changed files with 108 additions and 201 deletions

View file

@ -27,9 +27,7 @@ import org.eclipse.jgit.api.errors.GitAPIException;
import java.nio.file.Path;
public interface GitDB
// extends Closeable
{
public interface GitDB {
/**
* Initialise a new local gitdb.
@ -43,42 +41,4 @@ public interface GitDB
return new GitDBLocal(git);
}
// /**
// * Open an existing local gitdb.
// *
// * @param dbDir the path to the local repo
// * @return a GitDB instance for the local gitdb
// */
// static GitDB local(final Path dbDir) throws IOException {
// return new GitDBLocal(Git.open(dbDir.toFile()));
// }
// /**
// * Select a branch.
// *
// * @param branch the branch to select
// * @return a branch within the gitdb
// */
// GitDbBranch branch(Branch branch);
// interface GitDbBranch {
// String get(Key key);
//
// <T> T get(Key key, Class<T> type);
//
// Key put(Message message, Document<String> document, Author author);
//
// GitDbBranch delete(Branch branch, Key key, Message message, Author author);
//
// GitDbBranch tag(Reference reference);
//
// Transaction startTransaction(Branch branch);
//
// GitDbBranch fork(Branch branch);
// }
// Stream<Branch> allBranches();
}

View file

@ -29,166 +29,113 @@ class GitDBLocal implements GitDB {
private final Git git;
// @Override
// public void close() {
// git.close();
// }
// @Override
// @SneakyThrows
// public <T> T get(Branch branch, Key key, Class<T> type) {
// //branch
// final RefDatabase refDatabase = repository.getRefDatabase();
// final String branchValue = branch.getValue();
// final Ref refDatabaseRef = refDatabase.getRef(branchValue);
// final ObjectId commitId = refDatabaseRef.getObjectId();
//
// final RevCommit revCommit = repository.parseCommit(commitId);
// final RevTree tree = revCommit.getTree();
// tree.copyTo(System.out);
//
// final ObjectLoader open = repository.getObjectDatabase().open(objectId, Constants.OBJ_TREE);
// final byte[] bytes = open.getBytes();
// final String s = new String(bytes);
// System.out.println("s = " + s);
// //key
// return null;
// }
// @Override
// public GitDbBranch branch(Branch branch) {
// return null;
// }
//
// @Override
// public Stream<Branch> allBranches() {
// return null;
// }
// @Override
// public String get(Branch branch, Key key) {
// return get(branch, key, String.class);
// }
//
// @Override
// @SneakyThrows
// public <T> T get(Branch branch, Key key, Class<T> type) {
//branch
// final RefDatabase refDatabase = repository.getRefDatabase();
// final String branchValue = branch.getValue();
// final Ref refDatabaseRef = refDatabase.getRef(branchValue);
// final ObjectId commitId = refDatabaseRef.getObjectId();
//
// final RevCommit revCommit = repository.parseCommit(commitId);
// final RevTree tree = revCommit.getTree();
// tree.copyTo(System.out);
//
// final ObjectLoader open = repository.getObjectDatabase().open(objectId, Constants.OBJ_TREE);
// final byte[] bytes = open.getBytes();
// final String s = new String(bytes);
// System.out.println("s = " + s);
// //key
// return null;
// }
// @Override
// @SneakyThrows
// public String put(Branch branch, Message message, Document<String> document, Author author) {
//// return document.getValue();
//
// final ObjectInserter objectInserter = repository.newObjectInserter();
// final ObjectReader objectReader = repository.newObjectReader();
// final RevWalk revWalk = new RevWalk(repository);
//
// //blob
// System.out.println("document = " + document.getKey());
// final ObjectId blobId = objectInserter.insert(Constants.OBJ_BLOB, document.getValue().getBytes(UTF_8));
// //tree
// final TreeFormatter treeFormatter = new TreeFormatter();
// treeFormatter.append(document.getKey().getValue(), FileMode.REGULAR_FILE, blobId);
// final ObjectId treeId = objectInserter.insert(treeFormatter);
// //commit
// final CommitBuilder commitBuilder = new CommitBuilder();
// final PersonIdent ident = new PersonIdent(author.getName(), author.getEmail());
// commitBuilder.setCommitter(ident);
// commitBuilder.setAuthor(ident);
// commitBuilder.setTreeId(treeId);
// commitBuilder.setMessage(message.getValue());
// //TODO: setParentId()
// final ObjectId commitId = objectInserter.insert(commitBuilder);
// //branch
// final RevCommit revCommit = revWalk.parseCommit(commitId);
// revCommit.getShortMessage();
// git.branchCreate()
// .setStartPoint(revCommit)
// .setName(branch.getValue())
// .setUpstreamMode(CreateBranchCommand.SetupUpstreamMode.NOTRACK)
// .call();
//
// //READ
//
// //block
// final String readBlob = new String(objectReader.open(blobId).getBytes());
// System.out.println("readBlob = " + readBlob);
// final RevBlob revBlob = revWalk.lookupBlob(blobId);
// System.out.println("revBlob = " + revBlob);
// final String blobName = revBlob.name();
// System.out.println("blobName = " + blobName);
// //tree
// final RevTree revTree = revWalk.lookupTree(treeId);
// System.out.println("revTree = " + revTree);
// final String treeName = revTree.name();
// System.out.println("treeName = " + treeName);
// //commit
// System.out.println("revCommit= " + revCommit);
// final String commitName = revCommit.getName();
// System.out.println("commitName= " + commitName);
// //branch
// final Ref branchRef = repository.getRefDatabase().getRef(branch.getValue());
// System.out.println("branchRef = " + branchRef.getName());
//
//// final TreeWalk treeWalk = new TreeWalk(repository);
//// treeWalk.addTree(treeId);
//// treeWalk.next();
//// final String nameString = treeWalk.getNameString();
//// System.out.println("name = " + nameString);
//// final ObjectId objectId = treeWalk.getObjectId(0);
//// System.out.println("objectId = " + objectId);
//
//// final ObjectLoader openTree = repository.newObjectReader().open(treeId);
//// final int type = openTree.openStream().getType();
//// final long size = openTree.openStream().getSize();
//// final String readTree = new String(openTree.getBytes());
//
////
//// //commit
//// final CommitBuilder commitBuilder = new CommitBuilder();
//// commitBuilder.setAuthor(new PersonIdent(author.getName(), author.getEmail()));
//// commitBuilder.setCommitter(new PersonIdent(author.getName(), author.getEmail()));
//// commitBuilder.setMessage(message.getValue());
//// findParentCommit(branch)
//// .ifPresent(commitBuilder::setParentId);
//// commitBuilder.setTreeId(treeId);
//// final ObjectId commitId = repository.newObjectInserter().insert(commitBuilder);
////
//// //branch
//// repository.updateRef(branch.getValue()).setNewObjectId(commitId);
////
//// //get
//// return get(branch, document.getKey());
// return document.getValue();
// }
// @SneakyThrows
// private Optional<ObjectId> findParentCommit(final Branch branch) {
// return Optional.ofNullable(
// repository.getRefDatabase()
// .getRef(branch.getValue()))
// .map(Ref::getObjectId);
// }
// @Override
// public String delete(Branch branch, Key key, Message message, Author author) {
// return null;
// }
//
// @Override
// public void tag(Reference reference) {
//
// }
//
// @Override
// public void createBranch(Reference reference) {
//
// }
//
// @Override
// public Stream<String> getAllBranches() {
// return null;
// }
//
// @Override
// public Transaction createTransaction(Branch branch) {
// return null;
// }
// @Override
// @SneakyThrows
// public String put(Branch branch, Message message, Document<String> document, Author author) {
//// return document.getValue();
//
// final ObjectInserter objectInserter = repository.newObjectInserter();
// final ObjectReader objectReader = repository.newObjectReader();
// final RevWalk revWalk = new RevWalk(repository);
//
// //blob
// System.out.println("document = " + document.getKey());
// final ObjectId blobId = objectInserter.insert(Constants.OBJ_BLOB, document.getValue().getBytes(UTF_8));
// //tree
// final TreeFormatter treeFormatter = new TreeFormatter();
// treeFormatter.append(document.getKey().getValue(), FileMode.REGULAR_FILE, blobId);
// final ObjectId treeId = objectInserter.insert(treeFormatter);
// //commit
// final CommitBuilder commitBuilder = new CommitBuilder();
// final PersonIdent ident = new PersonIdent(author.getName(), author.getEmail());
// commitBuilder.setCommitter(ident);
// commitBuilder.setAuthor(ident);
// commitBuilder.setTreeId(treeId);
// commitBuilder.setMessage(message.getValue());
// //TODO: setParentId()
// final ObjectId commitId = objectInserter.insert(commitBuilder);
// //branch
// final RevCommit revCommit = revWalk.parseCommit(commitId);
// revCommit.getShortMessage();
// git.branchCreate()
// .setStartPoint(revCommit)
// .setName(branch.getValue())
// .setUpstreamMode(CreateBranchCommand.SetupUpstreamMode.NOTRACK)
// .call();
//
// //READ
//
// //block
// final String readBlob = new String(objectReader.open(blobId).getBytes());
// System.out.println("readBlob = " + readBlob);
// final RevBlob revBlob = revWalk.lookupBlob(blobId);
// System.out.println("revBlob = " + revBlob);
// final String blobName = revBlob.name();
// System.out.println("blobName = " + blobName);
// //tree
// final RevTree revTree = revWalk.lookupTree(treeId);
// System.out.println("revTree = " + revTree);
// final String treeName = revTree.name();
// System.out.println("treeName = " + treeName);
// //commit
// System.out.println("revCommit= " + revCommit);
// final String commitName = revCommit.getName();
// System.out.println("commitName= " + commitName);
// //branch
// final Ref branchRef = repository.getRefDatabase().getRef(branch.getValue());
// System.out.println("branchRef = " + branchRef.getName());
//
//// final TreeWalk treeWalk = new TreeWalk(repository);
//// treeWalk.addTree(treeId);
//// treeWalk.next();
//// final String nameString = treeWalk.getNameString();
//// System.out.println("name = " + nameString);
//// final ObjectId objectId = treeWalk.getObjectId(0);
//// System.out.println("objectId = " + objectId);
//
//// final ObjectLoader openTree = repository.newObjectReader().open(treeId);
//// final int type = openTree.openStream().getType();
//// final long size = openTree.openStream().getSize();
//// final String readTree = new String(openTree.getBytes());
//
////
//// //commit
//// final CommitBuilder commitBuilder = new CommitBuilder();
//// commitBuilder.setAuthor(new PersonIdent(author.getName(), author.getEmail()));
//// commitBuilder.setCommitter(new PersonIdent(author.getName(), author.getEmail()));
//// commitBuilder.setMessage(message.getValue());
//// findParentCommit(branch)
//// .ifPresent(commitBuilder::setParentId);
//// commitBuilder.setTreeId(treeId);
//// final ObjectId commitId = repository.newObjectInserter().insert(commitBuilder);
////
//// //branch
//// repository.updateRef(branch.getValue()).setNewObjectId(commitId);
////
//// //get
//// return get(branch, document.getKey());
// return document.getValue();
// }
}