Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 008173a

Browse files
committed
fix up merge mistakes
1 parent 79dd24a commit 008173a

File tree

4 files changed

+2
-12
lines changed

4 files changed

+2
-12
lines changed

src/GitHub.App/ViewModels/PullRequestDetailViewModel.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,10 +288,6 @@ public async Task Load(IPullRequestModel pullRequest)
288288
{
289289
Model = pullRequest;
290290
Title = Resources.PullRequestNavigationItemText + " #" + pullRequest.Number;
291-
SourceBranchDisplayName = GetBranchDisplayName(pullRequest.Head?.Label);
292-
TargetBranchDisplayName = GetBranchDisplayName(pullRequest.Base.Label);
293-
IsFromFork = pullRequestsService.IsPullRequestFromFork(repository, pullRequest);
294-
Body = !string.IsNullOrWhiteSpace(pullRequest.Body) ? pullRequest.Body : "*No description provided.*";
295291

296292
IsFromFork = pullRequestsService.IsPullRequestFromFork(repository, Model);
297293
SourceBranchDisplayName = GetBranchDisplayName(IsFromFork, pullRequest.Head?.Label);
@@ -302,7 +298,6 @@ public async Task Load(IPullRequestModel pullRequest)
302298
ChangedFilesTree = CreateChangedFilesTree(pullRequest, changes).Children.ToList();
303299

304300
var localBranches = await pullRequestsService.GetLocalBranches(repository, pullRequest).ToList();
305-
306301
IsCheckedOut = localBranches.Contains(repository.CurrentBranch);
307302

308303
if (IsCheckedOut)

src/GitHub.Exports/Services/IUsageTracker.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public interface IUsageTracker
1919
Task IncrementPullRequestCheckOutCount(bool fork);
2020
Task IncrementPullRequestPullCount(bool fork);
2121
Task IncrementPullRequestPushCount(bool fork);
22+
Task IncrementPullRequestOpened();
2223
Task IncrementWelcomeDocsClicks();
2324
Task IncrementWelcomeTrainingClicks();
2425
Task IncrementGitHubPaneHelpClicks();

src/GitHub.VisualStudio/Services/UsageTracker.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,6 @@ public async Task IncrementPullRequestOpened()
202202
SaveUsage(usage);
203203
}
204204

205-
public async Task IncrementPullRequestCheckedOut()
206-
{
207-
var usage = await LoadUsage();
208-
++usage.Model.NumberOfPullRequestsCheckedOut;
209-
SaveUsage(usage);
210-
}
211-
212205
async Task Initialize()
213206
{
214207
// The services needed by the usage tracker are loaded when they are first needed to

src/GitHub.VisualStudio/Services/UsageTrackerDispatcher.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public UsageTrackerDispatcher([Import(typeof(SVsServiceProvider))] IServiceProvi
2626
public Task IncrementOpenInGitHubCount() => inner.IncrementOpenInGitHubCount();
2727
public Task IncrementPublishCount() => inner.IncrementPublishCount();
2828
public Task IncrementUpstreamPullRequestCount() => inner.IncrementUpstreamPullRequestCount();
29+
public Task IncrementPullRequestOpened() => inner.IncrementPullRequestOpened();
2930
public Task IncrementPullRequestCheckOutCount(bool fork) => inner.IncrementPullRequestCheckOutCount(fork);
3031
public Task IncrementPullRequestPullCount(bool fork) => inner.IncrementPullRequestPullCount(fork);
3132
public Task IncrementPullRequestPushCount(bool fork) => inner.IncrementPullRequestPushCount(fork);

0 commit comments

Comments
 (0)