Merge branch 'master' into fixes/isolating-favorites

Author: StanleyGoldman

src/GitHub.Api/Git/Repository.cs

@@ -303,9 +303,9 @@ private void RepositoryManager_OnRemoteBranchRemoved(string remote, string name)
             Dictionary<string, ConfigBranch> branchList;
             if (remoteBranches.TryGetValue(remote, out branchList))
             {
-                if (localBranches.ContainsKey(name))
+                if (branchList.ContainsKey(name))
                 {
-                    localBranches.Remove(name);
+                    branchList.Remove(name);
 
                     Logger.Trace("OnRemoteBranchListChanged");
                     OnRemoteBranchListChanged?.Invoke();

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs

@@ -1,5 +1,3 @@
-#pragma warning disable 649
-
 using System;
 using System.Linq;
 using UnityEditor;

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesetTreeView.cs

@@ -1,5 +1,3 @@
-#pragma warning disable 649
-
 using System;
 using System.Collections.Generic;
 using System.IO;

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs

@@ -1,5 +1,3 @@
-#pragma warning disable 649
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -42,7 +40,6 @@ class HistoryView : Subview
         [NonSerialized] private int selectionIndex;
         [NonSerialized] private bool logHasChanged;
         [NonSerialized] private bool useScrollTime;
-        [NonSerialized] private bool isBusy;
 
         [SerializeField] private Vector2 detailsScroll;
         [SerializeField] private Vector2 scroll;
@@ -650,7 +647,7 @@ private void DrawTimelineRectAroundIconRect(Rect parentRect, Rect iconRect)
 
         public override bool IsBusy
         {
-            get { return isBusy; }
+            get { return false; }
         }
 
         private float EntryHeight

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs

@@ -1,5 +1,3 @@
-#pragma warning disable 649
-
 using System;
 using System.Linq;
 using UnityEditor;
@@ -109,19 +107,7 @@ public override void OnDataUpdate()
         {
             base.OnDataUpdate();
 
-            string repoRemote = null;
-            if (MaybeUpdateData(out repoRemote))
-            {
-                repoBranchContent = new GUIContent(repoBranch, Window_RepoBranchTooltip);
-                if (repoUrl != null)
-                {
-                    repoUrlContent = new GUIContent(repoUrl, string.Format(Window_RepoUrlTooltip, repoRemote));
-                }
-                else
-                {
-                    repoUrlContent = new GUIContent(repoUrl, Window_RepoNoUrlTooltip);
-                }
-            }
+            MaybeUpdateData();
 
             if (ActiveView != null)
                 ActiveView.OnDataUpdate();
@@ -198,45 +184,43 @@ private void RefreshOnMainThread()
             new ActionTask(TaskManager.Token, Refresh) { Affinity = TaskAffinity.UI }.Start();
         }
 
-        private bool MaybeUpdateData(out string repoRemote)
+        private void MaybeUpdateData()
         {
-            repoRemote = null;
-            bool repoDataChanged = false;
+            string updatedRepoBranch = null;
+            string updatedRepoRemote = null;
+            string updatedRepoUrl = DefaultRepoUrl;
+
             if (Repository != null)
             {
-                var currentBranchString = (Repository.CurrentBranch.HasValue ? Repository.CurrentBranch.Value.Name : null);
-                if (repoBranch != currentBranchString)
-                {
-                    repoBranch = currentBranchString;
-                    repoDataChanged = true;
-                }
+                var repositoryCurrentBranch = Repository.CurrentBranch;
+                updatedRepoBranch = repositoryCurrentBranch.HasValue ? repositoryCurrentBranch.Value.Name : null;
 
-                var url = Repository.CloneUrl != null ? Repository.CloneUrl.ToString() : DefaultRepoUrl;
-                if (repoUrl != url)
-                {
-                    repoUrl = url;
-                    repoDataChanged = true;
-                }
+                var repositoryCloneUrl = Repository.CloneUrl;
+                updatedRepoUrl = repositoryCloneUrl != null ? repositoryCloneUrl.ToString() : DefaultRepoUrl;
 
-                if (Repository.CurrentRemote.HasValue)
-                    repoRemote = Repository.CurrentRemote.Value.Name;
+                var repositoryCurrentRemote = Repository.CurrentRemote;
+                if (repositoryCurrentRemote.HasValue)
+                    updatedRepoRemote = repositoryCurrentRemote.Value.Name;
             }
-            else
+
+            if (repoBranch != updatedRepoBranch)
+            {
+                repoBranch = updatedRepoBranch;
+                repoBranchContent = new GUIContent(repoBranch, Window_RepoBranchTooltip);
+            }
+
+            if (repoUrl != updatedRepoUrl)
             {
-                if (repoBranch != null)
+                repoUrl = updatedRepoUrl;
+                if (updatedRepoRemote != null)
                 {
-                    repoBranch = null;
-                    repoDataChanged = true;
+                    repoUrlContent = new GUIContent(repoUrl, string.Format(Window_RepoUrlTooltip, updatedRepoRemote));
                 }
-
-                if (repoUrl != DefaultRepoUrl)
+                else
                 {
-                    repoUrl = DefaultRepoUrl;
-                    repoDataChanged = true;
+                    repoUrlContent = new GUIContent(repoUrl, Window_RepoNoUrlTooltip);
                 }
             }
-
-            return repoDataChanged;
         }
 
         private void AttachHandlers(IRepository repository)