Skip to content

Add Close() method to gogitRepository #8901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Nov 13, 2019
Merged

Add Close() method to gogitRepository #8901

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6826214
Add close to gitrepo
zeripath Nov 9, 2019
9dbae6e
Close gitRepo if it is open
zeripath Nov 9, 2019
384537c
Check if repo is nil before trying to close
zeripath Nov 9, 2019
a057029
Remember to close ctx.Repo.GitRepo created in context/repo.go
zeripath Nov 10, 2019
2ec2a41
Merge branch 'fix-7947' of github.com:zeripath/gitea into fix-7947
zeripath Nov 10, 2019
2e161f8
Close the GitRepo on rename
zeripath Nov 10, 2019
ae9b4a8
typo in comment
zeripath Nov 10, 2019
0334a1f
Fix more typos
zeripath Nov 10, 2019
813faad
models.Repository.GetTags() and models.GetTagsByPath must die
zeripath Nov 10, 2019
18c3137
Merge branch 'master' into fix-7947
zeripath Nov 10, 2019
c1e6251
Merge branch 'master' into fix-7947
zeripath Nov 11, 2019
623a2e1
Merge branch 'master' into fix-7947
zeripath Nov 13, 2019
521dac1
Merge branch 'master' into fix-7947
lunny Nov 13, 2019
f6ab132
Merge branch 'master' into fix-7947
sapk Nov 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions modules/context/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,9 +427,18 @@ func RepoAssignment() macaron.Handler {
}
ctx.Repo.GitRepo = gitRepo

// We opened it, we should close it
defer func() {
// If it's been set to nil then assume someone else has closed it.
if ctx.Repo.GitRepo != nil {
ctx.Repo.GitRepo.Close()
}
}()

// Stop at this point when the repo is empty.
if ctx.Repo.Repository.IsEmpty {
ctx.Data["BranchName"] = ctx.Repo.Repository.DefaultBranch
ctx.Next()
return
}

Expand Down Expand Up @@ -488,6 +497,7 @@ func RepoAssignment() macaron.Handler {
ctx.Data["GoDocDirectory"] = prefix + "{/dir}"
ctx.Data["GoDocFile"] = prefix + "{/dir}/{file}#L{line}"
}
ctx.Next()
}
}

Expand Down
2 changes: 1 addition & 1 deletion modules/git/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func OpenRepository(repoPath string) (*Repository, error) {

// Close this repository, in particular close the underlying gogitStorage if this is not nil
func (repo *Repository) Close() {
if repo.gogitStorage == nil {
if repo == nil || repo.gogitStorage == nil {
return
}
if err := repo.gogitStorage.Close(); err != nil {
Expand Down
7 changes: 6 additions & 1 deletion routers/repo/setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
// Check if repository name has been changed.
if repo.LowerName != strings.ToLower(newRepoName) {
isNameChanged = true
// Close the GitRepo if open
if ctx.Repo.GitRepo != nil {
ctx.Repo.GitRepo.Close()
ctx.Repo.GitRepo = nil
}
if err := models.ChangeRepositoryName(ctx.Repo.Owner, repo.Name, newRepoName); err != nil {
ctx.Data["Err_RepoName"] = true
switch {
Expand Down Expand Up @@ -378,7 +383,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
}

oldOwnerID := ctx.Repo.Owner.ID
// Close the GitRepo if ope
// Close the GitRepo if open
if ctx.Repo.GitRepo != nil {
ctx.Repo.GitRepo.Close()
ctx.Repo.GitRepo = nil
Expand Down