Skip to content

Commit 37bbf2c

Browse files
Fix restore repo bug, clarify the problem of ForeignIndex (#22776) (#22794)
Backport #22776 Fix #22581 TLDR: #18446 made a mess with ForeignIndex and triggered a design flaw/bug of #16356, then a quick patch #21271 helped #18446, then the the bug was re-triggered by #21721 . Related: * #16356 * BasicIssueContext https://github.com/go-gitea/gitea/pull/16356/files#diff-7938eb670d42a5ead6b08121e16aa4537a4d716c1cf37923c70470020fb9d036R16-R27 * #18446 * If some issues were dumped without ForeignIndex, then they would be imported as ForeignIndex=0 https://github.com/go-gitea/gitea/pull/18446/files#diff-1624a3e715d8fc70edf2db1630642b7d6517f8c359cc69d58c3958b34ba4ce5eR38-R39 * #21271 * It patched the above bug (somewhat), made the issues without ForeignIndex could have the same value as LocalIndex * #21721 * It re-triggered the zero-ForeignIndex bug. ps: I am not sure whether the changes in `GetForeignIndex` are ideal (at least, now it has almost the same behavior as BasicIssueContext in #16356), it's just a quick fix. Feel free to edit on this PR directly or replace it. Co-authored-by: wxiaoguang <[email protected]>
1 parent a239d6c commit 37bbf2c

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

modules/migration/comment.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import "time"
99

1010
// Commentable can be commented upon
1111
type Commentable interface {
12-
GetLocalIndex() int64
13-
GetForeignIndex() int64
12+
Reviewable
1413
GetContext() DownloaderContext
1514
}
1615

modules/migration/issue.go

+11-2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@ func (issue *Issue) GetExternalName() string { return issue.PosterName }
3535
// GetExternalID ExternalUserMigrated interface
3636
func (issue *Issue) GetExternalID() int64 { return issue.PosterID }
3737

38-
func (issue *Issue) GetLocalIndex() int64 { return issue.Number }
39-
func (issue *Issue) GetForeignIndex() int64 { return issue.ForeignIndex }
38+
func (issue *Issue) GetLocalIndex() int64 { return issue.Number }
39+
40+
func (issue *Issue) GetForeignIndex() int64 {
41+
// see the comment of Reviewable.GetForeignIndex
42+
// if there is no ForeignIndex, then use LocalIndex
43+
if issue.ForeignIndex == 0 {
44+
return issue.Number
45+
}
46+
return issue.ForeignIndex
47+
}
48+
4049
func (issue *Issue) GetContext() DownloaderContext { return issue.Context }

modules/migration/review.go

+11-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@ import "time"
99
// Reviewable can be reviewed
1010
type Reviewable interface {
1111
GetLocalIndex() int64
12+
13+
// GetForeignIndex presents the foreign index, which could be misused:
14+
// For example, if there are 2 Gitea sites: site-A exports a dataset, then site-B imports it:
15+
// * if site-A exports files by using its LocalIndex
16+
// * from site-A's view, LocalIndex is site-A's IssueIndex while ForeignIndex is site-B's IssueIndex
17+
// * but from site-B's view, LocalIndex is site-B's IssueIndex while ForeignIndex is site-A's IssueIndex
18+
//
19+
// So the exporting/importing must be paired, but the meaning of them looks confusing then:
20+
// * either site-A and site-B both use LocalIndex during dumping/restoring
21+
// * or site-A and site-B both use ForeignIndex
1222
GetForeignIndex() int64
1323
}
1424

@@ -38,7 +48,7 @@ type Review struct {
3848
// GetExternalName ExternalUserMigrated interface
3949
func (r *Review) GetExternalName() string { return r.ReviewerName }
4050

41-
// ExternalID ExternalUserMigrated interface
51+
// GetExternalID ExternalUserMigrated interface
4252
func (r *Review) GetExternalID() int64 { return r.ReviewerID }
4353

4454
// ReviewComment represents a review comment

0 commit comments

Comments
 (0)