From ece573c942347af4acffcb944e482bd48a841c0c Mon Sep 17 00:00:00 2001 From: Winston Li Date: Tue, 6 Jan 2015 20:36:56 +0000 Subject: [PATCH] Implemented bare repos. (resolved #5) --- .../src/uk/ac/ic/wlgitbridge/bridge/WLBridgedProject.java | 3 +++ .../ic/wlgitbridge/bridge/WritableRepositoryContents.java | 3 +++ .../writelatex/filestore/GitDirectoryContents.java | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WLBridgedProject.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WLBridgedProject.java index 211401dd37..bda511718b 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WLBridgedProject.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WLBridgedProject.java @@ -8,6 +8,7 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; import uk.ac.ic.wlgitbridge.writelatex.api.request.exception.FailedConnectionException; import uk.ac.ic.wlgitbridge.writelatex.api.request.getdoc.exception.InvalidProjectException; +import uk.ac.ic.wlgitbridge.writelatex.filestore.store.WLFileStore; import java.io.IOException; import java.util.List; @@ -53,6 +54,8 @@ public class WLBridgedProject { git.commit().setAuthor(new PersonIdent(contents.getUserName(), contents.getUserEmail(), contents.getWhen(), TimeZone.getDefault())) .setMessage(contents.getCommitMessage()) .call(); + System.out.println(repository.getDirectory()); + WLFileStore.deleteInDirectoryApartFrom(contents.getDirectory(), ".git"); } } catch (GitAPIException e) { throw new ServiceNotEnabledException(); diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WritableRepositoryContents.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WritableRepositoryContents.java index b5245c5306..40d1df7d72 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WritableRepositoryContents.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WritableRepositoryContents.java @@ -2,6 +2,7 @@ package uk.ac.ic.wlgitbridge.bridge; import uk.ac.ic.wlgitbridge.writelatex.api.request.exception.FailedConnectionException; +import java.io.File; import java.io.IOException; import java.util.Date; @@ -12,6 +13,8 @@ public interface WritableRepositoryContents { public void write() throws IOException, FailedConnectionException; + public File getDirectory(); + public String getUserName(); public String getUserEmail(); public String getCommitMessage(); diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/GitDirectoryContents.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/GitDirectoryContents.java index 23bcaace54..23372ca9d8 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/GitDirectoryContents.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/GitDirectoryContents.java @@ -34,12 +34,17 @@ public class GitDirectoryContents implements WritableRepositoryContents { @Override public void write() throws IOException, FailedConnectionException { - WLFileStore.deleteInDirectoryApartFrom(gitDirectory, ".git", ".wlgb"); + WLFileStore.deleteInDirectoryApartFrom(gitDirectory, ".git"); for (FileNode fileNode : fileNodes) { fileNode.writeToDisk(gitDirectory); } } + @Override + public File getDirectory() { + return gitDirectory; + } + @Override public String getUserName() { return userName;