diff --git a/modules/git/notes.go b/modules/git/notes.go index aea54ab2021..e8259236825 100644 --- a/modules/git/notes.go +++ b/modules/git/notes.go @@ -6,6 +6,8 @@ package git import ( "io/ioutil" + + "gopkg.in/src-d/go-git.v4/plumbing/object" ) // NotesRef is the git ref where Gitea will look for git-notes data. @@ -25,13 +27,28 @@ func GetNote(repo *Repository, commitID string, note *Note) error { return err } - entry, err := notes.GetTreeEntryByPath(commitID) - if err != nil { - return err + remainingCommitID := commitID + path := "" + currentTree := notes.Tree.gogitTree + var file *object.File + for len(remainingCommitID) > 2 { + file, err = currentTree.File(remainingCommitID) + if err == nil { + path += remainingCommitID + break + } + if err == object.ErrFileNotFound { + currentTree, err = currentTree.Tree(remainingCommitID[0:2]) + path += remainingCommitID[0:2] + "/" + remainingCommitID = remainingCommitID[2:] + } + if err != nil { + return err + } } - blob := entry.Blob() - dataRc, err := blob.DataAsync() + blob := file.Blob + dataRc, err := blob.Reader() if err != nil { return err } @@ -43,26 +60,21 @@ func GetNote(repo *Repository, commitID string, note *Note) error { } note.Message = d - commit, err := repo.gogitRepo.CommitObject(notes.ID) - if err != nil { - return err - } - commitNodeIndex, commitGraphFile := repo.CommitNodeIndex() if commitGraphFile != nil { defer commitGraphFile.Close() } - commitNode, err := commitNodeIndex.Get(commit.Hash) - if err != nil { - return nil - } - - lastCommits, err := getLastCommitForPaths(commitNode, "", []string{commitID}) + commitNode, err := commitNodeIndex.Get(notes.ID) if err != nil { return err } - note.Commit = convertCommit(lastCommits[commitID]) + + lastCommits, err := getLastCommitForPaths(commitNode, "", []string{path}) + if err != nil { + return err + } + note.Commit = convertCommit(lastCommits[path]) return nil } diff --git a/modules/git/notes_test.go b/modules/git/notes_test.go index a954377f543..bf010b9a712 100644 --- a/modules/git/notes_test.go +++ b/modules/git/notes_test.go @@ -22,3 +22,17 @@ func TestGetNotes(t *testing.T) { assert.Equal(t, []byte("Note contents\n"), note.Message) assert.Equal(t, "Vladimir Panteleev", note.Commit.Author.Name) } + +func TestGetNestedNotes(t *testing.T) { + repoPath := filepath.Join(testReposDir, "repo3_notes") + repo, err := OpenRepository(repoPath) + assert.NoError(t, err) + + note := Note{} + err = GetNote(repo, "3e668dbfac39cbc80a9ff9c61eb565d944453ba4", ¬e) + assert.NoError(t, err) + assert.Equal(t, []byte("Note 2"), note.Message) + err = GetNote(repo, "ba0a96fa63532d6c5087ecef070b0250ed72fa47", ¬e) + assert.NoError(t, err) + assert.Equal(t, []byte("Note 1"), note.Message) +} diff --git a/modules/git/tests/repos/repo3_notes/COMMIT_EDITMSG b/modules/git/tests/repos/repo3_notes/COMMIT_EDITMSG new file mode 100644 index 00000000000..0cfbf08886f --- /dev/null +++ b/modules/git/tests/repos/repo3_notes/COMMIT_EDITMSG @@ -0,0 +1 @@ +2 diff --git a/modules/git/tests/repos/repo3_notes/HEAD b/modules/git/tests/repos/repo3_notes/HEAD new file mode 100644 index 00000000000..cb089cd89a7 --- /dev/null +++ b/modules/git/tests/repos/repo3_notes/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/modules/git/tests/repos/repo3_notes/config b/modules/git/tests/repos/repo3_notes/config new file mode 100644 index 00000000000..d545cdabdbd --- /dev/null +++ b/modules/git/tests/repos/repo3_notes/config @@ -0,0 +1,7 @@ +[core] + repositoryformatversion = 0 + filemode = false + bare = false + logallrefupdates = true + symlinks = false + ignorecase = true diff --git a/modules/git/tests/repos/repo3_notes/description b/modules/git/tests/repos/repo3_notes/description new file mode 100644 index 00000000000..498b267a8c7 --- /dev/null +++ b/modules/git/tests/repos/repo3_notes/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/modules/git/tests/repos/repo3_notes/index b/modules/git/tests/repos/repo3_notes/index new file mode 100644 index 00000000000..783158b9287 Binary files /dev/null and b/modules/git/tests/repos/repo3_notes/index differ diff --git a/modules/git/tests/repos/repo3_notes/logs/HEAD b/modules/git/tests/repos/repo3_notes/logs/HEAD new file mode 100644 index 00000000000..4bd0a61ea68 --- /dev/null +++ b/modules/git/tests/repos/repo3_notes/logs/HEAD @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 ba0a96fa63532d6c5087ecef070b0250ed72fa47 Filip Navara 1567767895 +0200 commit (initial): 1 +ba0a96fa63532d6c5087ecef070b0250ed72fa47 3e668dbfac39cbc80a9ff9c61eb565d944453ba4 Filip Navara 1567767909 +0200 commit: 2 diff --git a/modules/git/tests/repos/repo3_notes/logs/refs/heads/master b/modules/git/tests/repos/repo3_notes/logs/refs/heads/master new file mode 100644 index 00000000000..4bd0a61ea68 --- /dev/null +++ b/modules/git/tests/repos/repo3_notes/logs/refs/heads/master @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 ba0a96fa63532d6c5087ecef070b0250ed72fa47 Filip Navara 1567767895 +0200 commit (initial): 1 +ba0a96fa63532d6c5087ecef070b0250ed72fa47 3e668dbfac39cbc80a9ff9c61eb565d944453ba4 Filip Navara 1567767909 +0200 commit: 2 diff --git a/modules/git/tests/repos/repo3_notes/objects/29/7128d6553180486c780e2f747cb6d0014bf1f6 b/modules/git/tests/repos/repo3_notes/objects/29/7128d6553180486c780e2f747cb6d0014bf1f6 new file mode 100644 index 00000000000..96fb7495211 Binary files /dev/null and b/modules/git/tests/repos/repo3_notes/objects/29/7128d6553180486c780e2f747cb6d0014bf1f6 differ diff --git a/modules/git/tests/repos/repo3_notes/objects/2f/7e2ea1e905c14c8a98e7ce47b395592834b9ef b/modules/git/tests/repos/repo3_notes/objects/2f/7e2ea1e905c14c8a98e7ce47b395592834b9ef new file mode 100644 index 00000000000..71cff177b24 Binary files /dev/null and b/modules/git/tests/repos/repo3_notes/objects/2f/7e2ea1e905c14c8a98e7ce47b395592834b9ef differ diff --git a/modules/git/tests/repos/repo3_notes/objects/3e/668dbfac39cbc80a9ff9c61eb565d944453ba4 b/modules/git/tests/repos/repo3_notes/objects/3e/668dbfac39cbc80a9ff9c61eb565d944453ba4 new file mode 100644 index 00000000000..8f13b31d714 --- /dev/null +++ b/modules/git/tests/repos/repo3_notes/objects/3e/668dbfac39cbc80a9ff9c61eb565d944453ba4 @@ -0,0 +1,3 @@ +x;0 @s +H&v*!4J(p~ +G`|oxzi;3 6 $`"NRѺXlaiK4r$\P0"ỵPQ'F_VNi*ʗGӳK|YeHff Em \ No newline at end of file diff --git a/modules/git/tests/repos/repo3_notes/objects/42/716fdb6f261867472899d785123e6ecaa5ca02 b/modules/git/tests/repos/repo3_notes/objects/42/716fdb6f261867472899d785123e6ecaa5ca02 new file mode 100644 index 00000000000..3d522eb2981 Binary files /dev/null and b/modules/git/tests/repos/repo3_notes/objects/42/716fdb6f261867472899d785123e6ecaa5ca02 differ diff --git a/modules/git/tests/repos/repo3_notes/objects/56/a6051ca2b02b04ef92d5150c9ef600403cb1de b/modules/git/tests/repos/repo3_notes/objects/56/a6051ca2b02b04ef92d5150c9ef600403cb1de new file mode 100644 index 00000000000..b17dfe30e64 Binary files /dev/null and b/modules/git/tests/repos/repo3_notes/objects/56/a6051ca2b02b04ef92d5150c9ef600403cb1de differ diff --git a/modules/git/tests/repos/repo3_notes/objects/61/6c62e75fce60d806f4afe993211705a00a2544 b/modules/git/tests/repos/repo3_notes/objects/61/6c62e75fce60d806f4afe993211705a00a2544 new file mode 100644 index 00000000000..b09d3a2d2cb Binary files /dev/null and b/modules/git/tests/repos/repo3_notes/objects/61/6c62e75fce60d806f4afe993211705a00a2544 differ diff --git a/modules/git/tests/repos/repo3_notes/objects/65/4c8b6b63c08bf37f638d3f521626b7fbbd4d37 b/modules/git/tests/repos/repo3_notes/objects/65/4c8b6b63c08bf37f638d3f521626b7fbbd4d37 new file mode 100644 index 00000000000..0d317cb80ea --- /dev/null +++ b/modules/git/tests/repos/repo3_notes/objects/65/4c8b6b63c08bf37f638d3f521626b7fbbd4d37 @@ -0,0 +1 @@ +x;0}"ǿu$RQrK1F1nfR-%wzc{%7h#xQfXѻ?jK S#8צ{M3> 6ZQm8 \ No newline at end of file diff --git a/modules/git/tests/repos/repo3_notes/objects/ba/0a96fa63532d6c5087ecef070b0250ed72fa47 b/modules/git/tests/repos/repo3_notes/objects/ba/0a96fa63532d6c5087ecef070b0250ed72fa47 new file mode 100644 index 00000000000..c21f2b2a222 Binary files /dev/null and b/modules/git/tests/repos/repo3_notes/objects/ba/0a96fa63532d6c5087ecef070b0250ed72fa47 differ diff --git a/modules/git/tests/repos/repo3_notes/objects/c9/34d51cee361fdee21a3f3bb1a285f5ea9bc225 b/modules/git/tests/repos/repo3_notes/objects/c9/34d51cee361fdee21a3f3bb1a285f5ea9bc225 new file mode 100644 index 00000000000..f5a8caa7595 Binary files /dev/null and b/modules/git/tests/repos/repo3_notes/objects/c9/34d51cee361fdee21a3f3bb1a285f5ea9bc225 differ diff --git a/modules/git/tests/repos/repo3_notes/objects/d8/263ee9860594d2806b0dfd1bfd17528b0ba2a4 b/modules/git/tests/repos/repo3_notes/objects/d8/263ee9860594d2806b0dfd1bfd17528b0ba2a4 new file mode 100644 index 00000000000..4b1baefffb3 Binary files /dev/null and b/modules/git/tests/repos/repo3_notes/objects/d8/263ee9860594d2806b0dfd1bfd17528b0ba2a4 differ diff --git a/modules/git/tests/repos/repo3_notes/objects/f3/6ad903e408cb8f4ed90bda02e3a1fd2fab7907 b/modules/git/tests/repos/repo3_notes/objects/f3/6ad903e408cb8f4ed90bda02e3a1fd2fab7907 new file mode 100644 index 00000000000..dc2af772ede Binary files /dev/null and b/modules/git/tests/repos/repo3_notes/objects/f3/6ad903e408cb8f4ed90bda02e3a1fd2fab7907 differ diff --git a/modules/git/tests/repos/repo3_notes/objects/fe/c9fe57e9864fe537f02f825e377c4a8a65ad2e b/modules/git/tests/repos/repo3_notes/objects/fe/c9fe57e9864fe537f02f825e377c4a8a65ad2e new file mode 100644 index 00000000000..6372ff10abc Binary files /dev/null and b/modules/git/tests/repos/repo3_notes/objects/fe/c9fe57e9864fe537f02f825e377c4a8a65ad2e differ diff --git a/modules/git/tests/repos/repo3_notes/refs/heads/master b/modules/git/tests/repos/repo3_notes/refs/heads/master new file mode 100644 index 00000000000..e96af8d801a --- /dev/null +++ b/modules/git/tests/repos/repo3_notes/refs/heads/master @@ -0,0 +1 @@ +3e668dbfac39cbc80a9ff9c61eb565d944453ba4 \ No newline at end of file diff --git a/modules/git/tests/repos/repo3_notes/refs/notes/commits b/modules/git/tests/repos/repo3_notes/refs/notes/commits new file mode 100644 index 00000000000..74e3d3ad8d5 --- /dev/null +++ b/modules/git/tests/repos/repo3_notes/refs/notes/commits @@ -0,0 +1 @@ +654c8b6b63c08bf37f638d3f521626b7fbbd4d37 \ No newline at end of file