Fix dump and restore respository #16698

lunny · 2021-08-15T04:07:07Z

This PR fixed a bug when dumping repositories' PRs which were created from the forked repositories.

When migrating, all PRs from forked repositories at original site should be as non-forked PR. And Gitea will create a local branch as head branch of the PR. But we haven't change it correctly before.
Fix missing delete release attachments database records when deleting repositories

codecov-commenter · 2021-08-15T04:26:07Z

Codecov Report

Merging #16698 (42f4b99) into main (f7a302c) will increase coverage by 0.01%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##             main   #16698      +/-   ##
==========================================
+ Coverage   45.38%   45.39%   +0.01%     
==========================================
  Files         758      758              
  Lines       85306    85311       +5     
==========================================
+ Hits        38714    38729      +15     
+ Misses      40311    40305       -6     
+ Partials     6281     6277       -4

Impacted Files	Coverage Δ
modules/migrations/dump.go	`0.00% <0.00%> (ø)`
modules/private/restore_repo.go	`0.00% <0.00%> (ø)`
models/unit.go	`41.09% <0.00%> (-2.74%)`	⬇️
modules/git/blame.go	`65.71% <0.00%> (-1.43%)`	⬇️
routers/web/repo/view.go	`40.95% <0.00%> (-0.58%)`	⬇️
services/pull/pull.go	`41.78% <0.00%> (-0.41%)`	⬇️
routers/api/v1/repo/pull.go	`29.63% <0.00%> (+0.51%)`	⬆️
models/repo_list.go	`78.43% <0.00%> (+0.78%)`	⬆️
modules/log/event.go	`62.50% <0.00%> (+1.85%)`	⬆️
modules/queue/workerpool.go	`54.96% <0.00%> (+1.90%)`	⬆️
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f7a302c...42f4b99. Read the comment docs.

models/repo.go

* Fix dump and restore * return different error message for get commit * Fix missing delete release attachment when deleting repository * Fix ci and add some comments Co-authored-by: zeripath <art27@cantab.net>

* Fix dump and restore * return different error message for get commit * Fix missing delete release attachment when deleting repository * Fix ci and add some comments back port #16698 Co-authored-by: zeripath <art27@cantab.net>

## [1.15.1](https://github.com/go-gitea/gitea/releases/tag/v1.15.1) - 2021-09-02 * BUGFIXES * Allow BASIC authentication access to /:owner/:repo/releases/download/* (go-gitea#16916) (go-gitea#16923) * Prevent leave changes dialogs due to autofill fields (go-gitea#16912) (go-gitea#16920) * Ignore review comment when ref commit is missed (go-gitea#16905) (go-gitea#16919) * Fix wrong attachment removal (go-gitea#16915) (go-gitea#16917) * Gitlab Migrator: dont ignore reactions of last request (go-gitea#16903) (go-gitea#16913) * Correctly return the number of Repositories for Organizations (go-gitea#16807) (go-gitea#16911) * Test if LFS object is accessible (go-gitea#16865) (go-gitea#16904) * Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (go-gitea#16899) (go-gitea#16900) * Fix dump and restore respository (go-gitea#16698) (go-gitea#16898) * Repare and Improve GetDiffRangeWithWhitespaceBehavior (go-gitea#16894) (go-gitea#16895) * Fix wiki raw commit diff/patch view (go-gitea#16891) (go-gitea#16892) * Ensure wiki repos are all closed (go-gitea#16886) (go-gitea#16888) * List limited and private orgs if authenticated on API (go-gitea#16866) (go-gitea#16879) * Simplify split diff view generation and remove JS dependency (go-gitea#16775) (go-gitea#16863) * Ensure that the default visibility is set on the user create page (go-gitea#16845) (go-gitea#16862) * In Render tolerate not being passed a context (go-gitea#16842) (go-gitea#16858) * Upgrade xorm to v1.2.2 (go-gitea#16663) & Add test to ensure that dumping of login sources remains correct (go-gitea#16847) (go-gitea#16848) * Report the correct number of pushes on the feeds (go-gitea#16811) (go-gitea#16822) * Add primary_key to issue_index (go-gitea#16813) (go-gitea#16820) * Prevent NPE on empty commit (go-gitea#16812) (go-gitea#16819) * Fix branch pagination error (go-gitea#16805) (go-gitea#16816) * Add missing return to handleSettingRemoteAddrError (go-gitea#16794) (go-gitea#16795) * Remove spurious / from issues.opened_by (go-gitea#16793) * Ensure that template compilation panics are sent to the logs (go-gitea#16788) (go-gitea#16792) * Update caddyserver/certmagic (go-gitea#16789) (go-gitea#16790) Signed-off-by: Andrew Thornton <art27@cantab.net>

## [1.15.1](https://github.com/go-gitea/gitea/releases/tag/v1.15.1) - 2021-09-02 * BUGFIXES * Allow BASIC authentication access to /:owner/:repo/releases/download/* (#16916) (#16923) * Prevent leave changes dialogs due to autofill fields (#16912) (#16920) * Ignore review comment when ref commit is missed (#16905) (#16919) * Fix wrong attachment removal (#16915) (#16917) * Gitlab Migrator: dont ignore reactions of last request (#16903) (#16913) * Correctly return the number of Repositories for Organizations (#16807) (#16911) * Test if LFS object is accessible (#16865) (#16904) * Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (#16899) (#16900) * Fix dump and restore respository (#16698) (#16898) * Repare and Improve GetDiffRangeWithWhitespaceBehavior (#16894) (#16895) * Fix wiki raw commit diff/patch view (#16891) (#16892) * Ensure wiki repos are all closed (#16886) (#16888) * List limited and private orgs if authenticated on API (#16866) (#16879) * Simplify split diff view generation and remove JS dependency (#16775) (#16863) * Ensure that the default visibility is set on the user create page (#16845) (#16862) * In Render tolerate not being passed a context (#16842) (#16858) * Upgrade xorm to v1.2.2 (#16663) & Add test to ensure that dumping of login sources remains correct (#16847) (#16848) * Report the correct number of pushes on the feeds (#16811) (#16822) * Add primary_key to issue_index (#16813) (#16820) * Prevent NPE on empty commit (#16812) (#16819) * Fix branch pagination error (#16805) (#16816) * Add missing return to handleSettingRemoteAddrError (#16794) (#16795) * Remove spurious / from issues.opened_by (#16793) * Ensure that template compilation panics are sent to the logs (#16788) (#16792) * Update caddyserver/certmagic (#16789) (#16790) Signed-off-by: Andrew Thornton <art27@cantab.net>

## [1.15.1](https://github.com/go-gitea/gitea/releases/tag/v1.15.1) - 2021-09-02 * BUGFIXES * Allow BASIC authentication access to /:owner/:repo/releases/download/* (go-gitea#16916) (go-gitea#16923) * Prevent leave changes dialogs due to autofill fields (go-gitea#16912) (go-gitea#16920) * Ignore review comment when ref commit is missed (go-gitea#16905) (go-gitea#16919) * Fix wrong attachment removal (go-gitea#16915) (go-gitea#16917) * Gitlab Migrator: dont ignore reactions of last request (go-gitea#16903) (go-gitea#16913) * Correctly return the number of Repositories for Organizations (go-gitea#16807) (go-gitea#16911) * Test if LFS object is accessible (go-gitea#16865) (go-gitea#16904) * Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (go-gitea#16899) (go-gitea#16900) * Fix dump and restore respository (go-gitea#16698) (go-gitea#16898) * Repare and Improve GetDiffRangeWithWhitespaceBehavior (go-gitea#16894) (go-gitea#16895) * Fix wiki raw commit diff/patch view (go-gitea#16891) (go-gitea#16892) * Ensure wiki repos are all closed (go-gitea#16886) (go-gitea#16888) * List limited and private orgs if authenticated on API (go-gitea#16866) (go-gitea#16879) * Simplify split diff view generation and remove JS dependency (go-gitea#16775) (go-gitea#16863) * Ensure that the default visibility is set on the user create page (go-gitea#16845) (go-gitea#16862) * In Render tolerate not being passed a context (go-gitea#16842) (go-gitea#16858) * Upgrade xorm to v1.2.2 (go-gitea#16663) & Add test to ensure that dumping of login sources remains correct (go-gitea#16847) (go-gitea#16848) * Report the correct number of pushes on the feeds (go-gitea#16811) (go-gitea#16822) * Add primary_key to issue_index (go-gitea#16813) (go-gitea#16820) * Prevent NPE on empty commit (go-gitea#16812) (go-gitea#16819) * Fix branch pagination error (go-gitea#16805) (go-gitea#16816) * Add missing return to handleSettingRemoteAddrError (go-gitea#16794) (go-gitea#16795) * Remove spurious / from issues.opened_by (go-gitea#16793) * Ensure that template compilation panics are sent to the logs (go-gitea#16788) (go-gitea#16792) * Update caddyserver/certmagic (go-gitea#16789) (go-gitea#16790) Signed-off-by: Andrew Thornton <art27@cantab.net>

## [1.15.1](https://github.com/go-gitea/gitea/releases/tag/v1.15.1) - 2021-09-02 * BUGFIXES * Allow BASIC authentication access to /:owner/:repo/releases/download/* (#16916) (#16923) * Prevent leave changes dialogs due to autofill fields (#16912) (#16920) * Ignore review comment when ref commit is missed (#16905) (#16919) * Fix wrong attachment removal (#16915) (#16917) * Gitlab Migrator: dont ignore reactions of last request (#16903) (#16913) * Correctly return the number of Repositories for Organizations (#16807) (#16911) * Test if LFS object is accessible (#16865) (#16904) * Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (#16899) (#16900) * Fix dump and restore respository (#16698) (#16898) * Repare and Improve GetDiffRangeWithWhitespaceBehavior (#16894) (#16895) * Fix wiki raw commit diff/patch view (#16891) (#16892) * Ensure wiki repos are all closed (#16886) (#16888) * List limited and private orgs if authenticated on API (#16866) (#16879) * Simplify split diff view generation and remove JS dependency (#16775) (#16863) * Ensure that the default visibility is set on the user create page (#16845) (#16862) * In Render tolerate not being passed a context (#16842) (#16858) * Upgrade xorm to v1.2.2 (#16663) & Add test to ensure that dumping of login sources remains correct (#16847) (#16848) * Report the correct number of pushes on the feeds (#16811) (#16822) * Add primary_key to issue_index (#16813) (#16820) * Prevent NPE on empty commit (#16812) (#16819) * Fix branch pagination error (#16805) (#16816) * Add missing return to handleSettingRemoteAddrError (#16794) (#16795) * Remove spurious / from issues.opened_by (#16793) * Ensure that template compilation panics are sent to the logs (#16788) (#16792) * Update caddyserver/certmagic (#16789) (#16790) Signed-off-by: Andrew Thornton <art27@cantab.net>

lunny added the pr/wip This PR is not ready for review label Aug 15, 2021

lunny changed the title ~~Fix dump and restore~~ Fix dump and restore respository Aug 15, 2021

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 15, 2021

lunny removed the pr/wip This PR is not ready for review label Aug 30, 2021

lunny added 2 commits August 30, 2021 20:59

Fix dump and restore

28e86b5

return different error message for get commit

05e645c

lunny force-pushed the lunny/fix_dump_restore branch from 42f4b99 to 05e645c Compare August 30, 2021 12:59

lunny added type/bug backport/v1.15 labels Aug 30, 2021

lunny added this to the 1.16.0 milestone Aug 30, 2021

Fix missing delete release attachment when deleting repository

c453f59

zeripath approved these changes Aug 30, 2021

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 Aug 30, 2021

zeripath reviewed Aug 30, 2021

View reviewed changes

models/repo.go Show resolved Hide resolved

lunny and others added 3 commits August 30, 2021 23:17

Fix ci and add some comments

f2c42b9

Merge branch 'main' into lunny/fix_dump_restore

e00d5e9

Merge branch 'main' into lunny/fix_dump_restore

84b346b

6543 approved these changes Aug 31, 2021

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 Aug 31, 2021

techknowlogick merged commit 8d7704b into go-gitea:main Aug 31, 2021

lunny deleted the lunny/fix_dump_restore branch August 31, 2021 02:24

lunny mentioned this pull request Aug 31, 2021

Fix dump and restore respository (#16698) #16898

Merged

6543 added the backport/done All backports for this PR have been created label Aug 31, 2021

zeripath mentioned this pull request Sep 2, 2021

Changelog 1.15.1 #16925

Merged

zeripath mentioned this pull request Sep 2, 2021

Changelog 1.15.1 (#16925) #16929

Merged

go-gitea locked and limited conversation to collaborators Oct 19, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix dump and restore respository #16698

Fix dump and restore respository #16698

lunny commented Aug 15, 2021 •

edited

Loading

codecov-commenter commented Aug 15, 2021 •

edited

Loading

Fix dump and restore respository #16698

Fix dump and restore respository #16698

Conversation

lunny commented Aug 15, 2021 • edited Loading

codecov-commenter commented Aug 15, 2021 • edited Loading

Codecov Report

lunny commented Aug 15, 2021 •

edited

Loading

codecov-commenter commented Aug 15, 2021 •

edited

Loading