Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 74c8358

Browse files
StanleyGoldmanStanleyGoldman
committed
Merge branch 'master' into fixes/refactor-tree-view
2 parents 4ce2aa7 + 723abc1 commit 74c8358

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

‎src/GitHub.Api/Git/RepositoryManager.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@ private void WatcherOnLocalBranchesChanged()
446446
{
447447
Logger.Trace("WatcherOnLocalBranchesChanged");
448448
UpdateLocalBranches();
449+
UpdateGitLog();
449450
}
450451

451452
private void WatcherOnRepositoryCommitted()

‎src/tests/IntegrationTests/Events/RepositoryManagerTests.cs‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace IntegrationTests
1515
class RepositoryManagerTests : BaseGitEnvironmentTest
1616
{
1717
private RepositoryManagerEvents repositoryManagerEvents;
18-
private TimeSpan Timeout = TimeSpan.FromSeconds(20);
18+
private TimeSpan Timeout = TimeSpan.FromSeconds(5);
1919

2020
public override void OnSetup()
2121
{
@@ -350,13 +350,15 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
350350
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
351351
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
352352
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
353+
repositoryManagerEvents.GitAheadBehindStatusUpdated.WaitOne(Timeout).Should().BeTrue();
354+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
353355

354356
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
355357
repositoryManagerListener.Received().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
356-
repositoryManagerListener.DidNotReceive().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
358+
repositoryManagerListener.Received().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
357359
repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus);
358360
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
359-
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
361+
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
360362
repositoryManagerListener.Received().LocalBranchesUpdated(Args.LocalBranchDictionary);
361363
repositoryManagerListener.Received().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
362364
}
@@ -418,13 +420,14 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
418420
repositoryManagerEvents.WaitForNotBusy();
419421

420422
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
423+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
421424

422425
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
423426
repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
424427
repositoryManagerListener.DidNotReceive().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
425428
repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus);
426429
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
427-
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
430+
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
428431
repositoryManagerListener.Received().LocalBranchesUpdated(Args.LocalBranchDictionary);
429432
repositoryManagerListener.DidNotReceive().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
430433
}
@@ -569,6 +572,7 @@ await RepositoryManager.SwitchBranch("branch2")
569572

570573
repositoryManagerEvents.CurrentBranchUpdated.WaitOne(Timeout).Should().BeTrue();
571574
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
575+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
572576

573577
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
574578
repositoryManagerListener.Received().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
@@ -616,13 +620,15 @@ await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false,
616620
repositoryManagerEvents.WaitForNotBusy();
617621

618622
repositoryManagerEvents.LocalBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
623+
repositoryManagerEvents.GitStatusUpdated.WaitOne(Timeout).Should().BeTrue();
624+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
619625

620626
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
621627
repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
622628
repositoryManagerListener.DidNotReceive().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
623-
repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus);
629+
repositoryManagerListener.Received().GitStatusUpdated(Args.GitStatus);
624630
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
625-
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
631+
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
626632
repositoryManagerListener.Received().LocalBranchesUpdated(Args.LocalBranchDictionary);
627633
repositoryManagerListener.DidNotReceive().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
628634
}
@@ -664,14 +670,15 @@ await Initialize(TestRepoMasterCleanUnsynchronized, initializeRepository: false,
664670
repositoryManagerEvents.WaitForNotBusy();
665671

666672
repositoryManagerEvents.RemoteBranchesUpdated.WaitOne(Timeout).Should().BeTrue();
673+
repositoryManagerEvents.GitLogUpdated.WaitOne(Timeout).Should().BeTrue();
667674
repositoryManagerEvents.GitAheadBehindStatusUpdated.WaitOne(Timeout).Should().BeTrue();
668675

669676
repositoryManagerListener.Received().OnIsBusyChanged(Args.Bool);
670677
repositoryManagerListener.DidNotReceive().CurrentBranchUpdated(Args.NullableConfigBranch, Args.NullableConfigRemote);
671678
repositoryManagerListener.Received().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus);
672679
repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus);
673680
repositoryManagerListener.DidNotReceive().GitLocksUpdated(Args.GitLocks);
674-
repositoryManagerListener.DidNotReceive().GitLogUpdated(Args.GitLogs);
681+
repositoryManagerListener.Received().GitLogUpdated(Args.GitLogs);
675682
repositoryManagerListener.DidNotReceive().LocalBranchesUpdated(Args.LocalBranchDictionary);
676683
repositoryManagerListener.Received().RemoteBranchesUpdated(Args.RemoteDictionary, Args.RemoteBranchDictionary);
677684
}

0 commit comments

Comments
 (0)