8000 Prevent Repository objects from being prematurely GCed by jcansdale · Pull Request #1337 · github/VisualStudio · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Prevent Repository objects from being prematurely GCed #1337

Merged
merged 11 commits into from
Nov 28, 2017
Merged

Prevent Repository objects from being prematurely GCed #1337

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e1b5f6a
­Keep­ alive reference to Repository and Dispose
jcansdale Nov 23, 2017
7cfbda3
Test GitService.GetRepository in a consistent way
jcansdale Nov 23, 2017
6f1a890
Dispose after using PullRequestSessionService.GetRepository
jcansdale Nov 23, 2017
8b17782
Use IRepository returned by GetActiveRepo inside using
jcansdale Nov 23, 2017
604a82c
Access GetRepositoryFromSolution from inside using
jcansdale Nov 23, 2017
c1746ae
Check we don't return reference to disposed Repository
jcansdale Nov 23, 2017
7fb09a3
Keep reference to TreeChanges and Dispose
jcansdale Nov 23, 2017
4db51b2
Don't dispose of Repository before it's used
jcansdale Nov 24, 2017
88a753a
Force the enumeration to complete before disposing
jcansdale Nov 24, 2017
b923899
Clean up dead code
jcansdale Nov 27, 2017
c61a75d
Merge branch 'master' into fixes/1315-using-repository
jcansdale Nov 28, 2017
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
Prev Previous commit
Next Next commit
Don't dispose of Repository before it's used
  • Loading branch information
@jcansdale
jcansdale committed Nov 24, 2017
commit 4db51b21487bc478039b2466675a0c72097fb8e7
13 changes: 8 additions & 5 deletions src/GitHub.App/Services/PullRequestService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,13 @@ public IObservable<IReadOnlyList<CommitMessage>> GetMessagesForUniqueCommits(
string compareBranch,
int maxCommits)
{
return Observable.Defer(() =>
return Observable.Defer(async () =>
{
// CommitMessage doesn't keep a reference to Repository
using (var repo = gitService.GetRepository(repository.LocalPath))
{
return gitClient.GetMessagesForUniqueCommits(repo, baseBranch, compareBranch, maxCommits).ToObservable();
var messages = await gitClient.GetMessagesForUniqueCommits(repo, baseBranch, compareBranch, maxCommits);
return Observable.Return(messages);
}
});
}
Expand Down Expand Up @@ -130,11 +131,12 @@ static bool IsFilthy(RepositoryStatus status)

public IObservable<Unit> Pull(ILocalRepositoryModel repository)
{
return Observable.Defer(() =>
return Observable.Defer(async () =>
{
using (var repo = gitService.GetRepository(repository.LocalPath))
{
return gitClient.Pull(repo).ToObservable();
await gitClient.Pull(repo);
return Observable.Return(Unit.Default);
}
});
}
Expand All @@ -147,7 +149,8 @@ public IObservable<Unit> Push(ILocalRepositoryModel repository)
{
var remoteName = repo.Head.RemoteName;
var remote = await gitClient.GetHttpRemote(repo, remoteName);
return gitClient.Push(repo, repo.Head.TrackedBranch.UpstreamBranchCanonicalName, remote.Name).ToObservable();
await gitClient.Push(repo, repo.Head.TrackedBranch.UpstreamBranchCanonicalName, remote.Name);
return Observable.Return(Unit.Default);
}
});
}
Expand Down
0