Use information from previous blame parts #28572

KN4CK3R · 2023-12-21T12:05:20Z

git blame output can contain blocks without commit information if it was outputted before (the 0dafa97ea3f6d9662299579e5be1875cd28baaae 48 26 1 line):

fec25436488499df7231f63b857f66457c193d5c 24 25 1
author Bastien Montagne
author-mail <[email protected]>
author-time 1660731031
author-tz +0200
committer Bastien Montagne
committer-mail <[email protected]>
committer-time 1660731031
committer-tz +0200
summary LibOverride: Add Make/Reset/Clear entries to IDTemplate contextual menu.
previous 839ece6477203382b7a7483062961540180ff1cd source/blender/editors/interface/interface_ops.c
filename source/blender/editors/interface/interface_ops.c
        #include "BLT_translation.h"
0dafa97ea3f6d9662299579e5be1875cd28baaae 48 26 1

3d57bc4397fca53bc9702a27bbf50102827829b0 27 27 1
author Hans Goudey
author-mail <[email protected]>
author-time 1700131315
author-tz +0100
committer Hans Goudey
committer-mail <[email protected]>
committer-time 1700131315
committer-tz +0100
summary Cleanup: Move several blenkernel headers to C++
previous 451c054d9b7d3148a646caa5a72fb127a5b5c408 source/blender/editors/interface/interface_ops.cc
filename source/blender/editors/interface/interface_ops.cc
        #include "BKE_context.hh"

This PR reuses data from the previous blame part to fill these gaps.

Fixes go-gitea#28545 `git blame` output can contain blocks without commit information if it was outputted before (the `0dafa97ea3f6d9662299579e5be1875cd28baaae 48 26 1` line): ``` fec25436488499df7231f63b857f66457c193d5c 24 25 1 author Bastien Montagne author-mail <[email protected]> author-time 1660731031 author-tz +0200 committer Bastien Montagne committer-mail <[email protected]> committer-time 1660731031 committer-tz +0200 summary LibOverride: Add Make/Reset/Clear entries to IDTemplate contextual menu. previous 839ece6477203382b7a7483062961540180ff1cd source/blender/editors/interface/interface_ops.c filename source/blender/editors/interface/interface_ops.c #include "BLT_translation.h" 0dafa97ea3f6d9662299579e5be1875cd28baaae 48 26 1 3d57bc4397fca53bc9702a27bbf50102827829b0 27 27 1 author Hans Goudey author-mail <[email protected]> author-time 1700131315 author-tz +0100 committer Hans Goudey committer-mail <[email protected]> committer-time 1700131315 committer-tz +0100 summary Cleanup: Move several blenkernel headers to C++ previous 451c054d9b7d3148a646caa5a72fb127a5b5c408 source/blender/editors/interface/interface_ops.cc filename source/blender/editors/interface/interface_ops.cc #include "BKE_context.hh" ``` This PR reuses data from the previous blame part to fill these gaps.

@KN4CK3R

Backport #28572 by @KN4CK3R Fixes #28545 `git blame` output can contain blocks without commit information if it was outputted before (the `0dafa97ea3f6d9662299579e5be1875cd28baaae 48 26 1` line): ``` fec25436488499df7231f63b857f66457c193d5c 24 25 1 author Bastien Montagne author-mail <[email protected]> author-time 1660731031 author-tz +0200 committer Bastien Montagne committer-mail <[email protected]> committer-time 1660731031 committer-tz +0200 summary LibOverride: Add Make/Reset/Clear entries to IDTemplate contextual menu. previous 839ece6477203382b7a7483062961540180ff1cd source/blender/editors/interface/interface_ops.c filename source/blender/editors/interface/interface_ops.c #include "BLT_translation.h" 0dafa97ea3f6d9662299579e5be1875cd28baaae 48 26 1 3d57bc4397fca53bc9702a27bbf50102827829b0 27 27 1 author Hans Goudey author-mail <[email protected]> author-time 1700131315 author-tz +0100 committer Hans Goudey committer-mail <[email protected]> committer-time 1700131315 committer-tz +0100 summary Cleanup: Move several blenkernel headers to C++ previous 451c054d9b7d3148a646caa5a72fb127a5b5c408 source/blender/editors/interface/interface_ops.cc filename source/blender/editors/interface/interface_ops.cc #include "BKE_context.hh" ``` This PR reuses data from the previous blame part to fill these gaps. Co-authored-by: KN4CK3R <[email protected]>

* giteaofficial/main: Add more ways to try (go-gitea#28581) Convert to url auth to header auth in tests (go-gitea#28484) Fix 500 error of searching commits (go-gitea#28576) improve possible performance bottleneck (go-gitea#28547) Use information from previous blame parts (go-gitea#28572) Make offline mode as default to no connect external avatar service by default (go-gitea#28548) Fix merging artifact chunks error when minio storage basepath is set (go-gitea#28555) feat: bump `dessant/lock-threads` and `actions/setup-go` to use nodejs20 runtime (go-gitea#28565) Update actions document about comparsion as Github Actions (go-gitea#28560) Fix inperformant query on retrifing review from database. (go-gitea#28552) Fix the issue ref rendering for wiki (go-gitea#28556) Add missing head of lfs client batch (go-gitea#28550) [skip ci] Updated translations via Crowdin Remove deadcode under models/issues (go-gitea#28536) Always enable caches (go-gitea#28527) Improve ObjectFormat interface (go-gitea#28496)

Fixes go-gitea#28545 `git blame` output can contain blocks without commit information if it was outputted before (the `0dafa97ea3f6d9662299579e5be1875cd28baaae 48 26 1` line): ``` fec25436488499df7231f63b857f66457c193d5c 24 25 1 author Bastien Montagne author-mail <[email protected]> author-time 1660731031 author-tz +0200 committer Bastien Montagne committer-mail <[email protected]> committer-time 1660731031 committer-tz +0200 summary LibOverride: Add Make/Reset/Clear entries to IDTemplate contextual menu. previous 839ece6477203382b7a7483062961540180ff1cd source/blender/editors/interface/interface_ops.c filename source/blender/editors/interface/interface_ops.c #include "BLT_translation.h" 0dafa97ea3f6d9662299579e5be1875cd28baaae 48 26 1 3d57bc4397fca53bc9702a27bbf50102827829b0 27 27 1 author Hans Goudey author-mail <[email protected]> author-time 1700131315 author-tz +0100 committer Hans Goudey committer-mail <[email protected]> committer-time 1700131315 committer-tz +0100 summary Cleanup: Move several blenkernel headers to C++ previous 451c054d9b7d3148a646caa5a72fb127a5b5c408 source/blender/editors/interface/interface_ops.cc filename source/blender/editors/interface/interface_ops.cc #include "BKE_context.hh" ``` This PR reuses data from the previous blame part to fill these gaps.

This PR contains the following updates: | Package | Update | Change | |---|---|---| | [docker.io/gitea/gitea](https://github.com/go-gitea/gitea) | patch | `1.21.3` -> `1.21.4` | --- ### Release Notes <details> <summary>go-gitea/gitea (docker.io/gitea/gitea)</summary> ### [`v1.21.4`](https://github.com/go-gitea/gitea/releases/tag/v1.21.4) [Compare Source](go-gitea/gitea@v1.21.3...v1.21.4) - SECURITY - Update github.com/cloudflare/circl ([#28789](go-gitea/gitea#28789)) ([#28790](go-gitea/gitea#28790)) - Require token for GET subscription endpoint ([#28765](go-gitea/gitea#28765)) ([#28768](go-gitea/gitea#28768)) - BUGFIXES - Use refname:strip-2 instead of refname:short when syncing tags ([#28797](go-gitea/gitea#28797)) ([#28811](go-gitea/gitea#28811)) - Fix links in issue card ([#28806](go-gitea/gitea#28806)) ([#28807](go-gitea/gitea#28807)) - Fix nil pointer panic when exec some gitea cli command ([#28791](go-gitea/gitea#28791)) ([#28795](go-gitea/gitea#28795)) - Require token for GET subscription endpoint ([#28765](go-gitea/gitea#28765)) ([#28778](go-gitea/gitea#28778)) - Fix button size in "attached header right" ([#28770](go-gitea/gitea#28770)) ([#28774](go-gitea/gitea#28774)) - Fix `convert.ToTeams` on empty input ([#28426](go-gitea/gitea#28426)) ([#28767](go-gitea/gitea#28767)) - Hide code related setting options in repository when code unit is disabled ([#28631](go-gitea/gitea#28631)) ([#28749](go-gitea/gitea#28749)) - Fix incorrect URL for "Reference in New Issue" ([#28716](go-gitea/gitea#28716)) ([#28723](go-gitea/gitea#28723)) - Fix panic when parsing empty pgsql host ([#28708](go-gitea/gitea#28708)) ([#28709](go-gitea/gitea#28709)) - Upgrade xorm to new version which supported update join for all supported databases ([#28590](go-gitea/gitea#28590)) ([#28668](go-gitea/gitea#28668)) - Fix alpine package files are not rebuilt ([#28638](go-gitea/gitea#28638)) ([#28665](go-gitea/gitea#28665)) - Avoid cycle-redirecting user/login page ([#28636](go-gitea/gitea#28636)) ([#28658](go-gitea/gitea#28658)) - Fix empty ref for cron workflow runs ([#28640](go-gitea/gitea#28640)) ([#28647](go-gitea/gitea#28647)) - Remove unnecessary syncbranchToDB with tests ([#28624](go-gitea/gitea#28624)) ([#28629](go-gitea/gitea#28629)) - Use known issue IID to generate new PR index number when migrating from GitLab ([#28616](go-gitea/gitea#28616)) ([#28618](go-gitea/gitea#28618)) - Fix flex container width ([#28603](go-gitea/gitea#28603)) ([#28605](go-gitea/gitea#28605)) - Fix the scroll behavior for emoji/mention list ([#28597](go-gitea/gitea#28597)) ([#28601](go-gitea/gitea#28601)) - Fix wrong due date rendering in issue list page ([#28588](go-gitea/gitea#28588)) ([#28591](go-gitea/gitea#28591)) - Fix `status_check_contexts` matching bug ([#28582](go-gitea/gitea#28582)) ([#28589](go-gitea/gitea#28589)) - Fix 500 error of searching commits ([#28576](go-gitea/gitea#28576)) ([#28579](go-gitea/gitea#28579)) - Use information from previous blame parts ([#28572](go-gitea/gitea#28572)) ([#28577](go-gitea/gitea#28577)) - Update mermaid for 1.21 ([#28571](go-gitea/gitea#28571)) - Fix 405 method not allowed CORS / OIDC ([#28583](go-gitea/gitea#28583)) ([#28586](go-gitea/gitea#28586)) ([#28587](go-gitea/gitea#28587)) ([#28611](go-gitea/gitea#28611)) - Fix `GetCommitStatuses` ([#28787](go-gitea/gitea#28787)) ([#28804](go-gitea/gitea#28804)) - Forbid removing the last admin user ([#28337](go-gitea/gitea#28337)) ([#28793](go-gitea/gitea#28793)) - Fix schedule tasks bugs ([#28691](go-gitea/gitea#28691)) ([#28780](go-gitea/gitea#28780)) - Fix issue dependencies ([#27736](go-gitea/gitea#27736)) ([#28776](go-gitea/gitea#28776)) - Fix system webhooks API bug ([#28531](go-gitea/gitea#28531)) ([#28666](go-gitea/gitea#28666)) - Fix when private user following user, private user will not be counted in his own view ([#28037](go-gitea/gitea#28037)) ([#28792](go-gitea/gitea#28792)) - Render code block in activity tab ([#28816](go-gitea/gitea#28816)) ([#28818](go-gitea/gitea#28818)) - ENHANCEMENTS - Rework markup link rendering ([#26745](go-gitea/gitea#26745)) ([#28803](go-gitea/gitea#28803)) - Modernize merge button ([#28140](go-gitea/gitea#28140)) ([#28786](go-gitea/gitea#28786)) - Speed up loading the dashboard on mysql/mariadb ([#28546](go-gitea/gitea#28546)) ([#28784](go-gitea/gitea#28784)) - Assign pull request to project during creation ([#28227](go-gitea/gitea#28227)) ([#28775](go-gitea/gitea#28775)) - Show description as tooltip instead of title for labels ([#28754](go-gitea/gitea#28754)) ([#28766](go-gitea/gitea#28766)) - Make template `DateTime` show proper tooltip ([#28677](go-gitea/gitea#28677)) ([#28683](go-gitea/gitea#28683)) - Switch destination directory for apt signing keys ([#28639](go-gitea/gitea#28639)) ([#28642](go-gitea/gitea#28642)) - Include heap pprof in diagnosis report to help debugging memory leaks ([#28596](go-gitea/gitea#28596)) ([#28599](go-gitea/gitea#28599)) - DOCS - Suggest to use Type=simple for systemd service ([#28717](go-gitea/gitea#28717)) ([#28722](go-gitea/gitea#28722)) - Extend description for ARTIFACT_RETENTION_DAYS ([#28626](go-gitea/gitea#28626)) ([#28630](go-gitea/gitea#28630)) - MISC - Add -F to commit search to treat keywords as strings ([#28744](go-gitea/gitea#28744)) ([#28748](go-gitea/gitea#28748)) - Add download attribute to release attachments ([#28739](go-gitea/gitea#28739)) ([#28740](go-gitea/gitea#28740)) - Concatenate error in `checkIfPRContentChanged` ([#28731](go-gitea/gitea#28731)) ([#28737](go-gitea/gitea#28737)) - Improve 1.21 document for Database Preparation ([#28643](go-gitea/gitea#28643)) ([#28644](go-gitea/gitea#28644)) Instances on **[Gitea Cloud](https://cloud.gitea.com)** will be automatically upgraded to this version during the specified maintenance window. </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://git.home/nrdufour/home-ops/pulls/316 Co-authored-by: Renovate <[email protected]> Co-committed-by: Renovate <[email protected]>

Fixes go-gitea#28545 `git blame` output can contain blocks without commit information if it was outputted before (the `0dafa97ea3f6d9662299579e5be1875cd28baaae 48 26 1` line): ``` fec25436488499df7231f63b857f66457c193d5c 24 25 1 author Bastien Montagne author-mail <[email protected]> author-time 1660731031 author-tz +0200 committer Bastien Montagne committer-mail <[email protected]> committer-time 1660731031 committer-tz +0200 summary LibOverride: Add Make/Reset/Clear entries to IDTemplate contextual menu. previous 839ece6477203382b7a7483062961540180ff1cd source/blender/editors/interface/interface_ops.c filename source/blender/editors/interface/interface_ops.c #include "BLT_translation.h" 0dafa97ea3f6d9662299579e5be1875cd28baaae 48 26 1 3d57bc4397fca53bc9702a27bbf50102827829b0 27 27 1 author Hans Goudey author-mail <[email protected]> author-time 1700131315 author-tz +0100 committer Hans Goudey committer-mail <[email protected]> committer-time 1700131315 committer-tz +0100 summary Cleanup: Move several blenkernel headers to C++ previous 451c054d9b7d3148a646caa5a72fb127a5b5c408 source/blender/editors/interface/interface_ops.cc filename source/blender/editors/interface/interface_ops.cc #include "BKE_context.hh" ``` This PR reuses data from the previous blame part to fill these gaps.

Use information from previous blame parts.

d6ba6c8

KN4CK3R added type/bug backport/v1.21 This PR should be backported to Gitea 1.21 labels Dec 21, 2023

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 21, 2023

pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Dec 21, 2023

KN4CK3R marked this pull request as ready for review December 21, 2023 12:05

KN4CK3R mentioned this pull request Dec 21, 2023

Git blame view still fails to display some "prior to change" markers #28545

Closed

delvh approved these changes Dec 21, 2023

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Dec 21, 2023

wxiaoguang approved these changes Dec 21, 2023

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Dec 21, 2023

KN4CK3R merged commit 3142693 into go-gitea:main Dec 21, 2023
25 checks passed

GiteaBot added this to the 1.22.0 milestone Dec 21, 2023

GiteaBot mentioned this pull request Dec 21, 2023

Use information from previous blame parts (#28572) #28577

Merged

GiteaBot added the backport/done All backports for this PR have been created label Dec 21, 2023

KN4CK3R deleted the fix-blame-28545 branch December 21, 2023 21:58

github-actions bot locked as resolved and limited conversation to collaborators Mar 14, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use information from previous blame parts #28572

Use information from previous blame parts #28572

KN4CK3R commented Dec 21, 2023

Use information from previous blame parts #28572

Use information from previous blame parts #28572

Conversation

KN4CK3R commented Dec 21, 2023