mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-04-20 13:30:19 +00:00
9fe0cbee02
When a review comment is placed on a PR in Forgejo, Forgejo performs a `git blame` to identify which commit originated the line, and records that commit and line number in the comment's database record. Later when the review is viewed, Forgejo currently makes no effort to place that comment in the correct *current* location, which may vary -- for example, if a PR had two commits and the comment was made on a line in the first commit, but the second commit changes line numbers in that file, the comment will appear in the incorrect location. This PR adds the usage of `git blame --reverse` to calculate the correct location to display the comment in the current view (whether reviewing the PR commit-by-commit, or "Files changed"). It certainly does not fix all problems with comment placement (see comments). Another major addition in this PR is a test harness for making relatively complex PRs and reviewing the diffs on the per-commit view and PR-diff views. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. All work and communication must conform to Forgejo's [AI Agreement](https://codeberg.org/forgejo/governance/src/branch/main/AIAgreement.md). 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 for Go changes - I added test coverage for Go changes... - [x] in their respective `*_test.go` for unit tests. - [x] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I ran... - [ ] `make pr-go` before pushing ### 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 - [x] This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change. - [ ] This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change. <!--start release-notes-assistant--> ## Release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Bug fixes - [PR](https://codeberg.org/forgejo/forgejo/pulls/12015): <!--number 12015 --><!--line 0 --><!--description cmVsb2NhdGUgUFIgcmV2aWV3IGNvbW1lbnRzIHVzaW5nIGBnaXQgYmxhbWUgLS1yZXZlcnNlYCwgaW1wcm92aW5nIGNvbW1lbnQgcGxhY2VtZW50-->relocate PR review comments using `git blame --reverse`, improving comment placement<!--description--> <!--end release-notes-assistant--> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/12015 Reviewed-by: Andreas Ahlenstorf <aahlenst@noreply.codeberg.org> Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net> Co-committed-by: Mathieu Fenniak <mathieu@fenniak.net> |
||
|---|---|---|
| .. | ||
| foreachref | ||
| internal | ||
| pipeline | ||
| pushoptions | ||
| tests/repos | ||
| url | ||
| batch.go | ||
| batch_reader.go | ||
| blame.go | ||
| blame_sha256_test.go | ||
| blame_test.go | ||
| blob.go | ||
| blob_test.go | ||
| command.go | ||
| command_race_test.go | ||
| command_test.go | ||
| commit.go | ||
| commit_info.go | ||
| commit_info_test.go | ||
| commit_reader.go | ||
| commit_sha256_test.go | ||
| commit_test.go | ||
| diff.go | ||
| diff_compare.go | ||
| diff_compare_test.go | ||
| diff_test.go | ||
| error.go | ||
| fetch.go | ||
| fetch_test.go | ||
| git.go | ||
| git_test.go | ||
| grep.go | ||
| grep_test.go | ||
| hook.go | ||
| last_commit_cache.go | ||
| log_name_status.go | ||
| notes.go | ||
| notes_test.go | ||
| object_format.go | ||
| object_id.go | ||
| object_id_test.go | ||
| object_signature.go | ||
| parse.go | ||
| parse_test.go | ||
| README.md | ||
| ref.go | ||
| ref_test.go | ||
| remote.go | ||
| repo.go | ||
| repo_archive.go | ||
| repo_attribute.go | ||
| repo_attribute_test.go | ||
| repo_base.go | ||
| repo_base_test.go | ||
| repo_blame.go | ||
| repo_blame_test.go | ||
| repo_blob_test.go | ||
| repo_branch.go | ||
| repo_branch_test.go | ||
| repo_commit.go | ||
| repo_commit_test.go | ||
| repo_commitgraph.go | ||
| repo_compare.go | ||
| repo_compare_test.go | ||
| repo_gpg.go | ||
| repo_hook.go | ||
| repo_index.go | ||
| repo_language_stats.go | ||
| repo_language_stats_test.go | ||
| repo_object.go | ||
| repo_ref.go | ||
| repo_ref_test.go | ||
| repo_stats.go | ||
| repo_stats_test.go | ||
| repo_tag.go | ||
| repo_tag_test.go | ||
| repo_test.go | ||
| repo_tree.go | ||
| signature.go | ||
| signature_test.go | ||
| submodule.go | ||
| submodule_test.go | ||
| tag.go | ||
| tag_test.go | ||
| tree.go | ||
| tree_blob.go | ||
| tree_entry.go | ||
| tree_entry_mode.go | ||
| tree_test.go | ||
| utils.go | ||
| utils_test.go | ||
Git Module
This module is merged from https://github.com/go-gitea/git which is a Go module to access Git through shell commands. Now it's a part of gitea's main repository for easier pull request.