Migrate reviews when migrating repository from github #9463

lunny · 2019-12-22T15:15:46Z

This PR will migrate review and review comments when migrating repository from github.
TODO:

Need tests.
Replace OriginalAuthorID
Don't think migrator is the author if it's a migrated review or comment.
Don't think reviewers as the same person on reviewers summary.
Create action comment for reviews
Migrate review comment reactions

A pull request migrated from go-gitea/test_repo#4 screenshot as below:

codecov-io · 2019-12-22T15:49:04Z

Codecov Report

Merging #9463 into master will decrease coverage by 0.13%.
The diff coverage is 29.29%.

@@            Coverage Diff             @@
##           master    #9463      +/-   ##
==========================================
- Coverage   42.35%   42.22%   -0.14%     
==========================================
  Files         608      609       +1     
  Lines       79411    79692     +281     
==========================================
+ Hits        33633    33648      +15     
- Misses      41617    41899     +282     
+ Partials     4161     4145      -16

Impacted Files	Coverage Δ
models/migrations/migrations.go	`1.3% <ø> (ø)`	⬆️
modules/migrations/base/downloader.go	`26.66% <ø> (ø)`	⬆️
models/review.go	`41.26% <0%> (-5.38%)`	⬇️
modules/migrations/git.go	`53.33% <0%> (-3.81%)`	⬇️
models/migrate.go	`0% <0%> (ø)`	⬆️
models/pull.go	`41.99% <0%> (-0.84%)`	⬇️
models/migrations/v125.go	`0% <0%> (ø)`
models/external_login_user.go	`20.72% <0%> (-0.58%)`	⬇️
modules/migrations/gitea.go	`6.16% <1.02%> (-1.65%)`	⬇️
modules/migrations/migrate.go	`20.95% <19.04%> (-3.26%)`	⬇️
... and 14 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 bfdfa9a...f37545b. Read the comment docs.

6543 · 2020-01-02T07:29:29Z

migration has conflicts

lunny · 2020-01-04T11:31:17Z

It's ready for review.

6543 · 2020-01-04T12:31:47Z

models/migrations/v118.go

@@ -0,0 +1,24 @@
+// Copyright 2019 The Gitea Authors. All rights reserved.


Suggested change

// Copyright 2019 The Gitea Authors. All rights reserved.

// Copyright 2020 The Gitea Authors. All rights reserved.

6543 · 2020-01-04T12:49:34Z

models/review.go

+	}
+	sess.Close()
+
+	for _, review := range reviews {


Why is this out of xorm session?

why is line 408 not behind line 404

lunny · 2020-01-04T13:25:25Z

@6543 All done.

6543 · 2020-01-04T19:16:54Z

current state if I test i get this error:
Migrate repository from https://github.com/6543/remaster failed: pull request does not exist [id: 128, issue_id: 0, head_repo_id: 0, base_repo_id: 0, head_branch: , base_branch: ]

6543 · 2020-01-04T20:32:46Z

@lunny found the error source: https://github.com/go-gitea/gitea/pull/9463/files#diff-2557bcc0dfec751b3834722f0d5477f0R694 return the error!

lunny · 2020-01-05T03:16:39Z

@6543 Thanks! I have fixed that.

guillep2k · 2020-01-07T22:16:50Z

It's ready for review.

Maybe remove the wip label? 😁

models/migrate.go

modules/migrations/gitea.go

guillep2k · 2020-01-07T22:37:54Z

modules/migrations/gitea.go

+		for _, comment := range review.Comments {
+			headCommitID, err := g.gitRepo.GetRefCommitID(pr.GetGitRefName())
+			if err != nil {
+				return fmt.Errorf("GetRefCommitID[%s]: %v", pr.GetGitRefName(), err)


Maybe if the ref can't be found we should add the comment anyway (e.g. as a normal comment)?

It should be correct since we have migrated all pullrequest patches.

modules/migrations/migrate.go

lunny · 2020-01-08T00:28:55Z

It's ready for review.

Maybe remove the wip label? 😁

Currently github stored position related the patch head but gitea stored line of treepath. I will resolve that.

guillep2k · 2020-01-08T22:26:36Z

Fixes #9443

6543 · 2020-01-09T06:31:52Z

pleace resolve confilct

lunny · 2020-01-10T03:12:57Z

@6543 @guillep2k It's ready to review again.

lunny · 2020-01-10T03:52:17Z

~~depends on #9688~~

lunny · 2020-01-23T15:57:54Z

Please review again.

lunny added the type/enhancement An improvement of existing functionality label Dec 22, 2019

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

lunny force-pushed the lunny/migrate_review branch 2 times, most recently from 6501af7 to 754962a Compare January 4, 2020 02:57

lunny added this to the 1.12.0 milestone Jan 4, 2020

lunny changed the title ~~WIP: Migrate reviews when migrating repository from github~~ Migrate reviews when migrating repository from github Jan 4, 2020

6543 reviewed Jan 4, 2020

View reviewed changes

lunny mentioned this pull request Jan 4, 2020

Migrate reactions when migrating repository from github #9599

Merged

3 tasks

6543 reviewed Jan 4, 2020

View reviewed changes

lunny added the pr/wip This PR is not ready for review label Jan 4, 2020

lunny force-pushed the lunny/migrate_review branch from 43ba9e3 to 4c1386c Compare January 5, 2020 03:16

guillep2k reviewed Jan 7, 2020

View reviewed changes

lunny force-pushed the lunny/migrate_review branch from 4c1386c to b444457 Compare January 10, 2020 02:58

lunny removed the pr/wip This PR is not ready for review label Jan 10, 2020

guillep2k approved these changes Jan 10, 2020

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 Jan 10, 2020

lunny mentioned this pull request Jan 19, 2020

Add support for migrating from Gitlab #9084

Merged

lunny force-pushed the lunny/migrate_review branch from 126c131 to 3e1c810 Compare January 21, 2020 07:54

lunny added 17 commits January 23, 2020 15:19

fix typo

ce2c4ed

fix lint

8ae3e2d

Migrate reviews when migrating repository from github

2263c5a

Added test and migration when external user login

abe4e22

fix test

d200081

fix commented state

beea95e

Some improvements

9824001

fix bug when get pull request and ref original author on code comments

e7ff3be

Fix migrated line; Added comment for review

6a1e7d4

Don't load all pull requests attributes

8a9c2d2

Fix typo

1ec2c77

wrong change copy head

16f183e

fix tests

579ef41

fix reactions

3461e21

Fix test

948b8a6

fix fmt

89af332

fix review comment reactions

f37545b

lunny force-pushed the lunny/migrate_review branch from 3e1c810 to f37545b Compare January 23, 2020 07:20

6543 approved these changes Jan 23, 2020

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 Jan 23, 2020

lafriks merged commit f6067a8 into go-gitea:master Jan 23, 2020

lunny deleted the lunny/migrate_review branch January 24, 2020 01:14

This was referenced Jan 28, 2020

Migration Summary #8689

Open

[Docs] Update Migration Docs #10030

Closed

lafriks mentioned this pull request Mar 9, 2020

Migrating code reviews on pull requests #9443

Closed

go-gitea locked and limited conversation to collaborators Nov 24, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate reviews when migrating repository from github #9463

Migrate reviews when migrating repository from github #9463

lunny commented Dec 22, 2019 •

edited

Loading

codecov-io commented Dec 22, 2019 •

edited

Loading

6543 commented Jan 2, 2020

lunny commented Jan 4, 2020

6543 Jan 4, 2020

6543 Jan 4, 2020

6543 Jan 4, 2020

lunny commented Jan 4, 2020

6543 commented Jan 4, 2020

6543 commented Jan 4, 2020

lunny commented Jan 5, 2020

guillep2k commented Jan 7, 2020

guillep2k Jan 7, 2020

lunny Jan 10, 2020 •

edited

Loading

lunny commented Jan 8, 2020

guillep2k commented Jan 8, 2020

6543 commented Jan 9, 2020

lunny commented Jan 10, 2020

lunny commented Jan 10, 2020 •

edited

Loading

lunny commented Jan 23, 2020

		@@ -0,0 +1,24 @@
		// Copyright 2019 The Gitea Authors. All rights reserved.

	// Copyright 2019 The Gitea Authors. All rights reserved.
	// Copyright 2020 The Gitea Authors. All rights reserved.

Migrate reviews when migrating repository from github #9463

Migrate reviews when migrating repository from github #9463

Conversation

lunny commented Dec 22, 2019 • edited Loading

codecov-io commented Dec 22, 2019 • edited Loading

Codecov Report

6543 commented Jan 2, 2020

lunny commented Jan 4, 2020

6543 Jan 4, 2020

Choose a reason for hiding this comment

6543 Jan 4, 2020

Choose a reason for hiding this comment

6543 Jan 4, 2020

Choose a reason for hiding this comment

lunny commented Jan 4, 2020

6543 commented Jan 4, 2020

6543 commented Jan 4, 2020

lunny commented Jan 5, 2020

guillep2k commented Jan 7, 2020

guillep2k Jan 7, 2020

Choose a reason for hiding this comment

lunny Jan 10, 2020 • edited Loading

Choose a reason for hiding this comment

lunny commented Jan 8, 2020

guillep2k commented Jan 8, 2020

6543 commented Jan 9, 2020

lunny commented Jan 10, 2020

lunny commented Jan 10, 2020 • edited Loading

lunny commented Jan 23, 2020

lunny commented Dec 22, 2019 •

edited

Loading

codecov-io commented Dec 22, 2019 •

edited

Loading

lunny Jan 10, 2020 •

edited

Loading

lunny commented Jan 10, 2020 •

edited

Loading