Fix argument order, services should come before data.

Also use cancellation tokens

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -128,7 +128,7 @@ public void RestartRepository()
         {
             if (Environment.RepositoryPath != null)
             {
-                repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, ProcessManager, Environment.RepositoryPath, Environment.FileSystem);
+                repositoryManager = Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, ProcessManager, Environment.FileSystem, Environment.RepositoryPath);
                 repositoryManager.Initialize();
                 Environment.Repository.Initialize(repositoryManager);
                 repositoryManager.Start();

src/GitHub.Api/Git/RepositoryManager.cs

@@ -100,6 +100,7 @@ class RepositoryManager : IRepositoryManager
         private readonly IProcessManager processManager;
         private readonly IRepositoryPathConfiguration repositoryPaths;
         private readonly IFileSystem fileSystem;
+        private readonly CancellationToken token;
         private readonly IRepositoryWatcher watcher;
 
         private bool isBusy;
@@ -116,11 +117,13 @@ class RepositoryManager : IRepositoryManager
         public RepositoryManager(IGitConfig gitConfig,
             IRepositoryWatcher repositoryWatcher, IGitClient gitClient,
             IProcessManager processManager,
-            IRepositoryPathConfiguration repositoryPaths,
-            IFileSystem fileSystem)
+            IFileSystem fileSystem,
+            CancellationToken token,
+            IRepositoryPathConfiguration repositoryPaths)
         {
             this.repositoryPaths = repositoryPaths;
             this.fileSystem = fileSystem;
+            this.token = token;
             this.gitClient = gitClient;
             this.processManager = processManager;
             this.watcher = repositoryWatcher;
@@ -129,7 +132,8 @@ public RepositoryManager(IGitConfig gitConfig,
             SetupWatcher();
         }
 
-        public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager, IGitClient gitClient, IProcessManager processManager, NPath repositoryRoot, IFileSystem fileSystem)
+        public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager, IGitClient gitClient,
+            IProcessManager processManager, IFileSystem fileSystem, NPath repositoryRoot)
         {
             var repositoryPathConfiguration = new RepositoryPathConfiguration(repositoryRoot);
             string filePath = repositoryPathConfiguration.DotGitConfig;
@@ -138,7 +142,8 @@ public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager
             var repositoryWatcher = new RepositoryWatcher(platform, repositoryPathConfiguration, taskManager.Token);
 
             return new RepositoryManager(gitConfig, repositoryWatcher,
-                gitClient, processManager, repositoryPathConfiguration, fileSystem);
+                gitClient, processManager, fileSystem,
+                taskManager.Token, repositoryPathConfiguration);
         }
 
         public void Initialize()
@@ -389,7 +394,7 @@ public void UpdateLocks()
 
         private ITask HookupHandlers(ITask task, bool isExclusive, bool filesystemChangesExpected)
         {
-            return new ActionTask(CancellationToken.None, () => {
+            return new ActionTask(token, () => {
                     if (isExclusive)
                     {
                         Logger.Trace("Starting Operation - Setting Busy Flag");

src/tests/IntegrationTests/BaseGitEnvironmentTest.cs

@@ -14,7 +14,7 @@ protected IEnvironment Initialize(NPath repoPath, NPath environmentPath = null,
         {
             InitializePlatform(repoPath, environmentPath, enableEnvironmentTrace);
 
-            var repositoryManager = GitHub.Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, ProcessManager, repoPath, Environment.FileSystem);
+            var repositoryManager = GitHub.Unity.RepositoryManager.CreateInstance(Platform, TaskManager, GitClient, ProcessManager, Environment.FileSystem, repoPath);
             onRepositoryManagerCreated?.Invoke(repositoryManager);
 
             RepositoryManager = repositoryManager;