mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-12-03 15:26:14 +01:00
f90928507a
Git has a cool feature called git notes. It allows adding a text to a commit without changing the commit itself. Forgejo already displays git notes. With this PR you can also now change git notes. <details> <summary>Screenshots</summary> ![grafik](/attachments/53a9546b-c4db-4b07-92ae-eb15b209b21d) ![grafik](/attachments/1bd96f2c-6178-45d2-93d7-d19c7cbe5898) ![grafik](/attachments/9ea73623-25d1-4628-a43f-f5ecbd431788) ![grafik](/attachments/efea0c9e-43c6-4441-bb7e-948177bf9021) </details> ## Checklist The [developer guide](https://forgejo.org/docs/next/developer/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [ ] in their respective `*_test.go` for unit tests. - [x] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] I do not want this change to show in the release notes. - [x] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title. <!--start release-notes-assistant--> ## Release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Features - [PR](https://codeberg.org/forgejo/forgejo/pulls/4753): <!--number 4753 --><!--line 0 --><!--description QWxsb3cgY2hhbmdpbmcgZ2l0IG5vdGVz-->Allow changing git notes<!--description--> <!--end release-notes-assistant--> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4753 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: JakobDev <jakobdev@gmx.de> Co-committed-by: JakobDev <jakobdev@gmx.de>
139 lines
3.4 KiB
Go
139 lines
3.4 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package git
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"os"
|
|
"strings"
|
|
|
|
"code.gitea.io/gitea/modules/log"
|
|
)
|
|
|
|
// NotesRef is the git ref where Gitea will look for git-notes data.
|
|
// The value ("refs/notes/commits") is the default ref used by git-notes.
|
|
const NotesRef = "refs/notes/commits"
|
|
|
|
// Note stores information about a note created using git-notes.
|
|
type Note struct {
|
|
Message []byte
|
|
Commit *Commit
|
|
}
|
|
|
|
// GetNote retrieves the git-notes data for a given commit.
|
|
// FIXME: Add LastCommitCache support
|
|
func GetNote(ctx context.Context, repo *Repository, commitID string, note *Note) error {
|
|
log.Trace("Searching for git note corresponding to the commit %q in the repository %q", commitID, repo.Path)
|
|
notes, err := repo.GetCommit(NotesRef)
|
|
if err != nil {
|
|
if IsErrNotExist(err) {
|
|
return err
|
|
}
|
|
log.Error("Unable to get commit from ref %q. Error: %v", NotesRef, err)
|
|
return err
|
|
}
|
|
|
|
path := ""
|
|
|
|
tree := ¬es.Tree
|
|
log.Trace("Found tree with ID %q while searching for git note corresponding to the commit %q", tree.ID, commitID)
|
|
|
|
var entry *TreeEntry
|
|
originalCommitID := commitID
|
|
for len(commitID) > 2 {
|
|
entry, err = tree.GetTreeEntryByPath(commitID)
|
|
if err == nil {
|
|
path += commitID
|
|
break
|
|
}
|
|
if IsErrNotExist(err) {
|
|
tree, err = tree.SubTree(commitID[0:2])
|
|
path += commitID[0:2] + "/"
|
|
commitID = commitID[2:]
|
|
}
|
|
if err != nil {
|
|
// Err may have been updated by the SubTree we need to recheck if it's again an ErrNotExist
|
|
if !IsErrNotExist(err) {
|
|
log.Error("Unable to find git note corresponding to the commit %q. Error: %v", originalCommitID, err)
|
|
}
|
|
return err
|
|
}
|
|
}
|
|
|
|
blob := entry.Blob()
|
|
dataRc, err := blob.DataAsync()
|
|
if err != nil {
|
|
log.Error("Unable to read blob with ID %q. Error: %v", blob.ID, err)
|
|
return err
|
|
}
|
|
closed := false
|
|
defer func() {
|
|
if !closed {
|
|
_ = dataRc.Close()
|
|
}
|
|
}()
|
|
d, err := io.ReadAll(dataRc)
|
|
if err != nil {
|
|
log.Error("Unable to read blob with ID %q. Error: %v", blob.ID, err)
|
|
return err
|
|
}
|
|
_ = dataRc.Close()
|
|
closed = true
|
|
note.Message = d
|
|
|
|
treePath := ""
|
|
if idx := strings.LastIndex(path, "/"); idx > -1 {
|
|
treePath = path[:idx]
|
|
path = path[idx+1:]
|
|
}
|
|
|
|
lastCommits, err := GetLastCommitForPaths(ctx, notes, treePath, []string{path})
|
|
if err != nil {
|
|
log.Error("Unable to get the commit for the path %q. Error: %v", treePath, err)
|
|
return err
|
|
}
|
|
note.Commit = lastCommits[path]
|
|
|
|
return nil
|
|
}
|
|
|
|
func SetNote(ctx context.Context, repo *Repository, commitID, notes, doerName, doerEmail string) error {
|
|
_, err := repo.GetCommit(commitID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
env := append(os.Environ(),
|
|
"GIT_AUTHOR_NAME="+doerName,
|
|
"GIT_AUTHOR_EMAIL="+doerEmail,
|
|
"GIT_COMMITTER_NAME="+doerName,
|
|
"GIT_COMMITTER_EMAIL="+doerEmail,
|
|
)
|
|
|
|
cmd := NewCommand(ctx, "notes", "add", "-f", "-m")
|
|
cmd.AddDynamicArguments(notes, commitID)
|
|
|
|
_, stderr, err := cmd.RunStdString(&RunOpts{Dir: repo.Path, Env: env})
|
|
if err != nil {
|
|
log.Error("Error while running git notes add: %s", stderr)
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func RemoveNote(ctx context.Context, repo *Repository, commitID string) error {
|
|
cmd := NewCommand(ctx, "notes", "remove")
|
|
cmd.AddDynamicArguments(commitID)
|
|
|
|
_, stderr, err := cmd.RunStdString(&RunOpts{Dir: repo.Path})
|
|
if err != nil {
|
|
log.Error("Error while running git notes remove: %s", stderr)
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|