Clean up trace logging, commented-out code and superfluous whitespace

src/GitHub.Api/Application/ApiClient.cs

@@ -154,8 +154,6 @@ private async Task<GitHubRepository> CreateRepositoryInternal(string repositoryN
         {
             try
             {
-                logger.Trace("Creating repository");
-
                 var user = await GetCurrentUser();
                 var keychainAdapter = keychain.Connect(OriginalUrl);
 
@@ -209,8 +207,6 @@ private async Task GetOrganizationInternal(Action<Organization[]> onSuccess, Act
         {
             try
             {
-                logger.Trace("Getting Organizations");
-
                 var user = await GetCurrentUser();
                 var keychainAdapter = keychain.Connect(OriginalUrl);
 

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -43,7 +43,6 @@ protected void Initialize()
 
         public void Run(bool firstRun)
         {
-            Logger.Trace("Run - CurrentDirectory {0}", NPath.CurrentDirectory);
             isBusy = true;
 
             var thread = new Thread(obj =>
@@ -78,8 +77,6 @@ public void Run(bool firstRun)
 
         public ITask InitializeRepository()
         {
-            //Logger.Trace("Running Repository Initialize");
-
             var targetPath = NPath.CurrentDirectory;
 
             var unityYamlMergeExec = Environment.UnityApplicationContents.Combine("Tools", "UnityYAMLMerge" + Environment.ExecutableExtension);
@@ -136,8 +133,6 @@ public void RestartRepository()
 
         protected void SetupMetrics(string unityVersion, bool firstRun, Guid instanceId)
         {
-            //Logger.Trace("Setup metrics");
-
             string userId = null;
             if (UserSettings.Exists(Constants.GuidKey))
             {

src/GitHub.Api/Authentication/Keychain.cs

@@ -107,8 +107,6 @@ public async Task<IKeychainAdapter> Load(UriString host)
             var keychainAdapter = FindOrCreateAdapter(host);
             var connection = GetConnection(host);
 
-            //logger.Trace($@"Loading KeychainAdapter Host:""{host}"" Cached Username:""{cachedConnection.Username}""");
-
             var keychainItem = await credentialManager.Load(host);
             if (keychainItem == null)
             {
@@ -123,7 +121,6 @@ public async Task<IKeychainAdapter> Load(UriString host)
                     logger.Warning("Keychain Username:\"{0}\" does not match cached Username:\"{1}\"; Hopefully it works", keychainItem.Username, connection.Username);
                 }
 
-                //logger.Trace("Loaded from Credential Manager Host:\"{0}\" Username:\"{1}\"", keychainItem.Host, keychainItem.Username);
                 keychainAdapter.Set(keychainItem);
             }
             return keychainAdapter;
@@ -142,14 +139,11 @@ private KeychainAdapter FindOrCreateAdapter(UriString host)
 
         public void Initialize()
         {
-            //logger.Trace("Initialize");
             LoadConnectionsFromDisk();
         }
 
         public async Task Clear(UriString host, bool deleteFromCredentialManager)
         {
-            //logger.Trace("Clear Host:{0}", host);
-
             Guard.ArgumentNotNull(host, nameof(host));
 
             RemoveConnection(host);
@@ -160,8 +154,6 @@ public async Task Clear(UriString host, bool deleteFromCredentialManager)
 
         public async Task Save(UriString host)
         {
-            //logger.Trace("Save: {0}", host);
-
             Guard.ArgumentNotNull(host, nameof(host));
 
             var keychainAdapter = await AddCredential(host);
@@ -170,8 +162,6 @@ public async Task Save(UriString host)
 
         public void SetCredentials(ICredential credential)
         {
-            //logger.Trace("SetCredentials Host:{0}", credential.Host);
-
             Guard.ArgumentNotNull(credential, nameof(credential));
 
             var keychainAdapter = GetKeychainAdapter(credential.Host);
@@ -180,8 +170,6 @@ public void SetCredentials(ICredential credential)
 
         public void SetToken(UriString host, string token, string username)
         {
-            //logger.Trace("SetToken Host:{0}", host);
-
             Guard.ArgumentNotNull(host, nameof(host));
             Guard.ArgumentNotNull(token, nameof(token));
             Guard.ArgumentNotNull(username, nameof(username));
@@ -192,7 +180,6 @@ public void SetToken(UriString host, string token, string username)
 
         private void LoadConnectionsFromDisk()
         {
-            //logger.Trace("ReadCacheFromDisk Path:{0}", cachePath.ToString());
             if (cachePath.FileExists())
             {
                 var json = cachePath.ReadAllText();
@@ -216,7 +203,6 @@ private void LoadConnectionsFromDisk()
 
         private void SaveConnectionsToDisk(bool raiseChangedEvent = true)
         {
-            //logger.Trace("WriteCacheToDisk Count:{0} Path:{1}", connectionCache.Count, cachePath.ToString());
             try
             {
                 var json = connections.Values.ToJson();

src/GitHub.Api/Authentication/LoginManager.cs

@@ -106,7 +106,6 @@ public async Task<LoginResultData> ContinueLogin(LoginResultData loginResultData
             var password = keychainAdapter.Credential.Token;
             try
             {
-                logger.Trace("2FA Continue");
                 loginResultData = await TryLogin(host, username, password, twofacode);
 
                 if (loginResultData.Code == LoginResultCodes.Success)

src/GitHub.Api/Events/RepositoryWatcher.cs

@@ -80,7 +80,6 @@ public void Start()
             }
 
             Logger.Trace("Watching Path: \"{0}\"", paths.RepositoryPath.ToString());
-
             running = true;
             pauseEvent.Reset();
             Task.Factory.StartNew(WatcherLoop, cancellationToken, TaskCreationOptions.None, TaskScheduler.Default);
@@ -89,21 +88,14 @@ public void Start()
         public void Stop()
         {
             if (!running)
-            {
-                //Logger.Warning("Watcher already stopped");
                 return;
-            }
-
-            //Logger.Trace("Stopping watcher");
 
             running = false;
             pauseEvent.Set();
         }
 
         private void WatcherLoop()
         {
-            //Logger.Trace("Starting watcher");
-
             while (running)
             {
                 if (cancellationToken.IsCancellationRequested)
@@ -136,9 +128,7 @@ public int CheckAndProcessEvents()
             var fileEvents = nativeInterface.GetEvents();
             if (fileEvents.Length > 0)
             {
-                //Logger.Trace("Handling {0} Events", fileEvents.Length);
                 processedEventCount = ProcessEvents(fileEvents);
-                //Logger.Trace("Processed {0} Events", processedEventCount);
             }
 
             lastCountOfProcessedEvents = processedEventCount;
@@ -164,8 +154,6 @@ private int ProcessEvents(Event[] fileEvents)
                     break;
                 }
 
-                //Logger.Trace(fileEvent.Describe());
-
                 var eventDirectory = new NPath(fileEvent.Directory);
                 var fileA = eventDirectory.Combine(fileEvent.FileA);
 
@@ -215,28 +203,24 @@ private int FireEvents(HashSet<EventType> events)
             int eventsProcessed = 0;
             if (events.Contains(EventType.ConfigChanged))
             {
-                //Logger.Trace("ConfigChanged");
                 ConfigChanged?.Invoke();
                 eventsProcessed++;
             }
 
             if (events.Contains(EventType.HeadChanged))
             {
-                //Logger.Trace("HeadChanged");
                 HeadChanged?.Invoke();
                 eventsProcessed++;
             }
 
             if (events.Contains(EventType.LocalBranchesChanged))
             {
-                //Logger.Trace("LocalBranchesChanged");
                 LocalBranchesChanged?.Invoke();
                 eventsProcessed++;
             }
 
             if (events.Contains(EventType.RemoteBranchesChanged))
             {
-                //Logger.Trace("RemoteBranchesChanged");
                 RemoteBranchesChanged?.Invoke();
                 eventsProcessed++;
             }
@@ -245,22 +229,19 @@ private int FireEvents(HashSet<EventType> events)
             {
                 if (!events.Contains(EventType.RepositoryChanged))
                 {
-                    //Logger.Trace("IndexChanged");
                     IndexChanged?.Invoke();
                     eventsProcessed++;
                 }
             }
 
             if (events.Contains(EventType.RepositoryChanged))
             {
-                //Logger.Trace("RepositoryChanged");
                 RepositoryChanged?.Invoke();
                 eventsProcessed++;
             }
 
             if (events.Contains(EventType.RepositoryCommitted))
             {
-                //Logger.Trace("RepositoryCommitted");
                 RepositoryCommitted?.Invoke();
                 eventsProcessed++;
             }