diff --git a/modules/git/repo_compare_test.go b/modules/git/repo_compare_test.go index ecd1aa4e6da04..4790170d10cd5 100644 --- a/modules/git/repo_compare_test.go +++ b/modules/git/repo_compare_test.go @@ -8,6 +8,7 @@ import ( "bytes" "io" "path/filepath" + "strings" "testing" "code.gitea.io/gitea/modules/util" @@ -18,11 +19,11 @@ import ( func TestGetFormatPatch(t *testing.T) { bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") clonedPath, err := cloneRepo(bareRepo1Path, testReposDir, "repo1_TestGetFormatPatch") - assert.NoError(t, err) defer util.RemoveAll(clonedPath) - repo, err := OpenRepository(clonedPath) assert.NoError(t, err) + repo, err := OpenRepository(clonedPath) defer repo.Close() + assert.NoError(t, err) rd := &bytes.Buffer{} err = repo.GetPatch("8d92fc95^", "8d92fc95", rd) assert.NoError(t, err) @@ -32,3 +33,49 @@ func TestGetFormatPatch(t *testing.T) { assert.Regexp(t, "^From 8d92fc95", patch) assert.Contains(t, patch, "Subject: [PATCH] Add file2.txt") } + +func TestReadPatch(t *testing.T) { + // Ensure we can read the patch files + bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") + repo, err := OpenRepository(bareRepo1Path) + defer repo.Close() + assert.NoError(t, err) + // This patch doesn't exist + noFile, err := repo.ReadPatchCommit(0) + assert.Error(t, err) + // This patch is an empty one (sometimes it's a 404) + noCommit, err := repo.ReadPatchCommit(1) + assert.Error(t, err) + // This patch is legit and should return a commit + oldCommit, err := repo.ReadPatchCommit(2) + assert.NoError(t, err) + + assert.Empty(t, noFile) + assert.Empty(t, noCommit) + assert.Len(t, oldCommit, 40) + assert.True(t, oldCommit == "6e8e2a6f9efd71dbe6917816343ed8415ad696c3") +} + +func TestReadWritePullHead(t *testing.T) { + // Ensure we can write SHA1 head corresponding to PR and open them + bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") + repo, err := OpenRepository(bareRepo1Path) + assert.NoError(t, err) + defer repo.Close() + // Try to open non-existing Pull + _, err = repo.ReadPullHead(0) + assert.Error(t, err) + // Write a fake sha1 with only 40 zeros + newCommit := strings.Repeat("0", 40) + err = repo.WritePullHead(1, newCommit) + assert.NoError(t, err) + headFile := filepath.Join(repo.Path, "refs/pull/1/head") + // Remove file after the test + defer util.Remove(headFile) + assert.FileExists(t, headFile) + // Read the file created + headContents, err := repo.ReadPullHead(1) + assert.NoError(t, err) + assert.Len(t, string(headContents), 40) + assert.True(t, string(headContents) == newCommit) +} diff --git a/modules/git/tests/repos/repo1_bare/pulls/1.patch b/modules/git/tests/repos/repo1_bare/pulls/1.patch new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/modules/git/tests/repos/repo1_bare/pulls/2.patch b/modules/git/tests/repos/repo1_bare/pulls/2.patch new file mode 100644 index 0000000000000..caab605e9ad45 --- /dev/null +++ b/modules/git/tests/repos/repo1_bare/pulls/2.patch @@ -0,0 +1,39 @@ +From 6e8e2a6f9efd71dbe6917816343ed8415ad696c3 Mon Sep 17 00:00:00 2001 +From: 99rgosse +Date: Fri, 26 Mar 2021 12:44:22 +0000 +Subject: [PATCH] Update gitea_import_actions.py + +--- + gitea_import_actions.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gitea_import_actions.py b/gitea_import_actions.py +index f0d72cd..7b31963 100644 +--- a/gitea_import_actions.py ++++ b/gitea_import_actions.py +@@ -3,14 +3,14 @@ + # git log --pretty=format:'%H,%at,%s' --date=default > /tmp/commit.log + # to get the commits logfile for a repository + +-import mysql.connector as mariadb ++import psycopg2 + + # set the following variables to fit your need... + USERID = 1 + REPOID = 1 + BRANCH = "master" + +-mydb = mariadb.connect( ++mydb = psycopg2.connect( + host="localhost", + user="user", + passwd="password", +@@ -31,4 +31,4 @@ with open("/tmp/commit.log") as f: + + mydb.commit() + +-print("actions inserted.") +\ No newline at end of file ++print("actions inserted.") +-- +GitLab