Fixes 4762 - Content API for Creating, Updating, Deleting Files (#6314)

3 files changed, 46 insertions, 2 deletions

diff --git a/modules/git/blob.go b/modules/git/blob.go
index a6e392eeb5..e194b973db 100644
--- a/modules/git/blob.go
+++ b/modules/git/blob.go
@@ -6,6 +6,7 @@ package git
 
 import (
 	"bytes"
+	"encoding/base64"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -71,3 +72,32 @@ func (b *Blob) DataAsync() (io.ReadCloser, error) {
 
 	return cmdReadCloser{stdout: stdout, cmd: cmd}, nil
 }
+
+// GetBlobContentBase64 Reads the content of the blob with a base64 encode and returns the encoded string
+func (b *Blob) GetBlobContentBase64() (string, error) {
+	dataRc, err := b.DataAsync()
+	if err != nil {
+		return "", err
+	}
+	defer dataRc.Close()
+
+	pr, pw := io.Pipe()
+	encoder := base64.NewEncoder(base64.StdEncoding, pw)
+
+	go func() {
+		_, err := io.Copy(encoder, dataRc)
+		encoder.Close()
+
+		if err != nil {
+			pw.CloseWithError(err)
+		} else {
+			pw.Close()
+		}
+	}()
+
+	out, err := ioutil.ReadAll(pr)
+	if err != nil {
+		return "", err
+	}
+	return string(out), nil
+}
diff --git a/modules/git/commit.go b/modules/git/commit.go
index 85c9554bb5..dad67dada6 100644
--- a/modules/git/commit.go
+++ b/modules/git/commit.go
@@ -263,6 +263,11 @@ func (c *Commit) GetFilesChangedSinceCommit(pastCommit string) ([]string, error)
 	return c.repo.getFilesChanged(pastCommit, c.ID.String())
 }
 
+// FileChangedSinceCommit Returns true if the file given has changed since the the past commit
+func (c *Commit) FileChangedSinceCommit(filename, pastCommit string) (bool, error) {
+	return c.repo.FileChangedBetweenCommits(filename, pastCommit, c.ID.String())
+}
+
 // GetSubModules get all the sub modules of current revision git tree
 func (c *Commit) GetSubModules() (*ObjectCache, error) {
 	if c.submoduleCache != nil {
diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
index 1ecd1f8891..7c65d6e921 100644
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	version "github.com/mcuadros/go-version"
+	"github.com/mcuadros/go-version"
 )
 
 // GetRefCommitID returns the last commit ID string of given reference (branch or tag).
@@ -270,7 +270,7 @@ func (repo *Repository) searchCommits(id SHA1, opts SearchCommitsOptions) (*list
 	return repo.parsePrettyFormatLogToList(stdout)
 }
 
-func (repo *Repository) getFilesChanged(id1 string, id2 string) ([]string, error) {
+func (repo *Repository) getFilesChanged(id1, id2 string) ([]string, error) {
 	stdout, err := NewCommand("diff", "--name-only", id1, id2).RunInDirBytes(repo.Path)
 	if err != nil {
 		return nil, err
@@ -278,6 +278,15 @@ func (repo *Repository) getFilesChanged(id1 string, id2 string) ([]string, error
 	return strings.Split(string(stdout), "\n"), nil
 }
 
+// FileChangedBetweenCommits Returns true if the file changed between commit IDs id1 and id2
+func (repo *Repository) FileChangedBetweenCommits(filename, id1, id2 string) (bool, error) {
+	stdout, err := NewCommand("diff", "--name-only", "-z", id1, id2, "--", filename).RunInDirBytes(repo.Path)
+	if err != nil {
+		return false, err
+	}
+	return len(strings.TrimSpace(string(stdout))) > 0, nil
+}
+
 // FileCommitsCount return the number of files at a revison
 func (repo *Repository) FileCommitsCount(revision, file string) (int64, error) {
 	return commitsCount(repo.Path, revision, file)