Being sure to fire the RepositoryCommitted event

StanleyGoldman · StanleyGoldman · commit ac085ea3b46e · 2017-11-14T16:37:16.000-05:00
diff --git a/src/GitHub.Api/Events/RepositoryWatcher.cs b/src/GitHub.Api/Events/RepositoryWatcher.cs
@@ -197,6 +197,10 @@ private int ProcessEvents(Event[] fileEvents)
                     {
                         events.Add(EventType.LocalBranchesChanged, null);
                     }
+                    else if (!events.ContainsKey(EventType.RepositoryCommitted) && fileA.IsChildOf(paths.DotGitCommitEditMsg))
+                    {
+                        events.Add(EventType.RepositoryCommitted, null);
+                    }
                 }
                 else
                 {
@@ -256,6 +260,13 @@ private int FireEvents(Dictionary<EventType, List<EventData>> events)
                 eventsProcessed++;
             }
 
+            if (events.ContainsKey(EventType.RepositoryCommitted))
+            {
+                Logger.Trace("RepositoryCommitted");
+                RepositoryCommitted?.Invoke();
+                eventsProcessed++;
+            }
+
             return eventsProcessed;
         }
 
@@ -293,6 +304,7 @@ private enum EventType
             LocalBranchesChanged,
             RemoteBranchesChanged,
             RepositoryChanged,
+            RepositoryCommitted
         }
 
         private class EventData
diff --git a/src/GitHub.Api/Git/RepositoryManager.cs b/src/GitHub.Api/Git/RepositoryManager.cs
@@ -72,6 +72,7 @@ public RepositoryPathConfiguration(NPath repositoryPath)
             DotGitIndex = DotGitPath.Combine("index");
             DotGitHead = DotGitPath.Combine("HEAD");
             DotGitConfig = DotGitPath.Combine("config");
+            DotGitCommitEditMsg = DotGitPath.Combine("COMMIT_EDITMSG");
         }
 
         public NPath RepositoryPath { get; }
@@ -81,6 +82,7 @@ public RepositoryPathConfiguration(NPath repositoryPath)
         public NPath DotGitIndex { get; }
         public NPath DotGitHead { get; }
         public NPath DotGitConfig { get; }
+        public NPath DotGitCommitEditMsg { get; }
     }
 
     class RepositoryManager : IRepositoryManager
diff --git a/src/tests/IntegrationTests/Events/RepositoryWatcherTests.cs b/src/tests/IntegrationTests/Events/RepositoryWatcherTests.cs
@@ -13,7 +13,7 @@ namespace IntegrationTests
     class RepositoryWatcherTests : BaseGitEnvironmentTest
     {
         [Test, Category("TimeSensitive")]
-        public async Task ShouldDetectFileChanges()
+        public async Task ShouldDetectFileChangesAndCommit()
         {
             await Initialize(TestRepoMasterCleanSynchronized, initializeRepository: false);
 
@@ -26,6 +26,8 @@ public async Task ShouldDetectFileChanges()
 
                 repositoryWatcher.Initialize();
                 repositoryWatcher.Start();
+                repositoryWatcher.Stop();
+
                 try
                 {
                     var foobarTxt = TestRepoMasterCleanSynchronized.Combine("foobar.txt");
@@ -35,17 +37,62 @@ public async Task ShouldDetectFileChanges()
                     foobarTxt.WriteAllText("foobar");
                     await TaskManager.Wait();
 
-                    watcherAutoResetEvent.RepositoryChanged.WaitOne(TimeSpan.FromSeconds(2)).Should().BeTrue();
-
                     Logger.Trace("Continue test");
 
+                    repositoryWatcher.Start();
+
+                    watcherAutoResetEvent.RepositoryChanged.WaitOne(TimeSpan.FromSeconds(2)).Should().BeTrue();
+                    watcherAutoResetEvent.Reset();
+
                     repositoryWatcherListener.DidNotReceive().HeadChanged();
                     repositoryWatcherListener.DidNotReceive().ConfigChanged();
                     repositoryWatcherListener.DidNotReceive().RepositoryCommitted();
                     repositoryWatcherListener.DidNotReceive().IndexChanged();
                     repositoryWatcherListener.Received().RepositoryChanged();
                     repositoryWatcherListener.DidNotReceive().LocalBranchesChanged();
                     repositoryWatcherListener.DidNotReceive().RemoteBranchesChanged();
+                    repositoryWatcherListener.ClearReceivedCalls();
+
+                    repositoryWatcher.Stop();
+                    Logger.Trace("Issuing Command");
+
+                    await GitClient.AddAll().StartAsAsync();
+
+                    Logger.Trace("Completed Command");
+                    repositoryWatcher.Start();
+
+                    watcherAutoResetEvent.IndexChanged.WaitOne(TimeSpan.FromSeconds(2)).Should().BeTrue();
+                    watcherAutoResetEvent.Reset();
+
+                    repositoryWatcherListener.DidNotReceive().HeadChanged();
+                    repositoryWatcherListener.DidNotReceive().ConfigChanged();
+                    repositoryWatcherListener.DidNotReceive().RepositoryCommitted();
+                    repositoryWatcherListener.Received(1).IndexChanged();
+                    repositoryWatcherListener.DidNotReceive().RepositoryChanged();
+                    repositoryWatcherListener.DidNotReceive().LocalBranchesChanged();
+                    repositoryWatcherListener.DidNotReceive().RemoteBranchesChanged();
+                    repositoryWatcherListener.ClearReceivedCalls();
+
+                    repositoryWatcher.Stop();
+                    Logger.Trace("Issuing Command");
+
+                    await GitClient.Commit("Test Commit", string.Empty).StartAsAsync();
+
+                    Logger.Trace("Completed Command");
+                    repositoryWatcher.Start();
+
+                    watcherAutoResetEvent.RepositoryCommitted.WaitOne(TimeSpan.FromSeconds(2)).Should().BeTrue();
+                    watcherAutoResetEvent.IndexChanged.WaitOne(TimeSpan.FromSeconds(2)).Should().BeTrue();
+                    watcherAutoResetEvent.Reset();
+
+                    repositoryWatcherListener.DidNotReceive().HeadChanged();
+                    repositoryWatcherListener.DidNotReceive().ConfigChanged();
+                    repositoryWatcherListener.Received(1).RepositoryCommitted();
+                    repositoryWatcherListener.Received(1).IndexChanged();
+                    repositoryWatcherListener.DidNotReceive().RepositoryChanged();
+                    repositoryWatcherListener.Received(1).LocalBranchesChanged();
+                    repositoryWatcherListener.DidNotReceive().RemoteBranchesChanged();
+                    repositoryWatcherListener.ClearReceivedCalls();
                 }
                 finally
                 {
@@ -176,6 +223,7 @@ public async Task ShouldDetectBranchCreate()
                     repositoryWatcher.Start();
 
                     watcherAutoResetEvent.LocalBranchesChanged.WaitOne(TimeSpan.FromSeconds(2)).Should().BeTrue();
+                    watcherAutoResetEvent.Reset();
 
                     repositoryWatcherListener.DidNotReceive().HeadChanged();
                     repositoryWatcherListener.DidNotReceive().ConfigChanged();
@@ -206,7 +254,6 @@ public async Task ShouldDetectBranchCreate()
                     repositoryWatcherListener.DidNotReceive().RepositoryChanged();
                     repositoryWatcherListener.Received(1).LocalBranchesChanged();
                     repositoryWatcherListener.DidNotReceive().RemoteBranchesChanged();
-                    repositoryWatcherListener.ClearReceivedCalls();
                 }
                 finally
                 {
@@ -243,6 +290,7 @@ public async Task ShouldDetectChangesToRemotes()
                     repositoryWatcher.Start();
                     watcherAutoResetEvent.ConfigChanged.WaitOne(TimeSpan.FromSeconds(2)).Should().BeTrue();
                     watcherAutoResetEvent.RemoteBranchesChanged.WaitOne(TimeSpan.FromSeconds(2)).Should().BeTrue();
+                    watcherAutoResetEvent.Reset();
 
                     repositoryWatcherListener.DidNotReceive().HeadChanged();
                     repositoryWatcherListener.Received(1).ConfigChanged();
@@ -350,7 +398,13 @@ public async Task ShouldDetectGitFetch()
 
                     Logger.Trace("Continue test");
 
-                    repositoryWatcherListener.AssertDidNotReceiveAnyCalls();
+                    repositoryWatcherListener.DidNotReceive().HeadChanged();
+                    repositoryWatcherListener.DidNotReceive().ConfigChanged();
+                    repositoryWatcherListener.DidNotReceive().RepositoryCommitted();
+                    repositoryWatcherListener.DidNotReceive().IndexChanged();
+                    repositoryWatcherListener.DidNotReceive().RepositoryChanged();
+                    repositoryWatcherListener.DidNotReceive().LocalBranchesChanged();
+                    repositoryWatcherListener.DidNotReceive().RemoteBranchesChanged();
                 }
                 finally
                 {
@@ -454,5 +508,16 @@ class RepositoryWatcherAutoResetEvent
         public AutoResetEvent RepositoryChanged { get; } = new AutoResetEvent(false);
         public AutoResetEvent LocalBranchesChanged { get; } = new AutoResetEvent(false);
         public AutoResetEvent RemoteBranchesChanged { get; } = new AutoResetEvent(false);
+
+        public void Reset()
+        {
+            HeadChanged.Reset();
+            ConfigChanged.Reset();
+            RepositoryCommitted.Reset();
+            IndexChanged.Reset();
+            RepositoryChanged.Reset();
+            LocalBranchesChanged.Reset();
+            RemoteBranchesChanged.Reset();
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,10 @@ private int ProcessEvents(Event[] fileEvents)`
`197`	`197`	`{`
`198`	`198`	`events.Add(EventType.LocalBranchesChanged, null);`
`199`	`199`	`}`
	`200`	`+ else if (!events.ContainsKey(EventType.RepositoryCommitted) && fileA.IsChildOf(paths.DotGitCommitEditMsg))`
	`201`	`+ {`
	`202`	`+ events.Add(EventType.RepositoryCommitted, null);`
	`203`	`+ }`
`200`	`204`	`}`
`201`	`205`	`else`
`202`	`206`	`{`
`@@ -256,6 +260,13 @@ private int FireEvents(Dictionary<EventType, List<EventData>> events)`
`256`	`260`	`eventsProcessed++;`
`257`	`261`	`}`
`258`	`262`
	`263`	`+ if (events.ContainsKey(EventType.RepositoryCommitted))`
	`264`	`+ {`
	`265`	`+ Logger.Trace("RepositoryCommitted");`
	`266`	`+ RepositoryCommitted?.Invoke();`
	`267`	`+ eventsProcessed++;`
	`268`	`+ }`
	`269`	`+`
`259`	`270`	`return eventsProcessed;`
`260`	`271`	`}`
`261`	`272`
`@@ -293,6 +304,7 @@ private enum EventType`
`293`	`304`	`LocalBranchesChanged,`
`294`	`305`	`RemoteBranchesChanged,`
`295`	`306`	`RepositoryChanged,`
	`307`	`+ RepositoryCommitted`
`296`	`308`	`}`
`297`	`309`
`298`	`310`	`private class EventData`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ public RepositoryPathConfiguration(NPath repositoryPath)`
`72`	`72`	`DotGitIndex = DotGitPath.Combine("index");`
`73`	`73`	`DotGitHead = DotGitPath.Combine("HEAD");`
`74`	`74`	`DotGitConfig = DotGitPath.Combine("config");`
	`75`	`+ DotGitCommitEditMsg = DotGitPath.Combine("COMMIT_EDITMSG");`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`public NPath RepositoryPath { get; }`
`@@ -81,6 +82,7 @@ public RepositoryPathConfiguration(NPath repositoryPath)`
`81`	`82`	`public NPath DotGitIndex { get; }`
`82`	`83`	`public NPath DotGitHead { get; }`
`83`	`84`	`public NPath DotGitConfig { get; }`
	`85`	`+ public NPath DotGitCommitEditMsg { get; }`
`84`	`86`	`}`
`85`	`87`
`86`	`88`	`class RepositoryManager : IRepositoryManager`