Merge branch 'master' into fixes/sign-out

Author: StanleyGoldman

src/GitHub.Api/RepositoryLocator.cs

@@ -43,9 +43,9 @@ public void Run()
             ApplicationManager.GitClient.Init()
                               .Then(ApplicationManager.GitClient.SetConfig("merge.unityyamlmerge.cmd", yamlMergeCommand, GitConfigSource.Local))
                               .Then(ApplicationManager.GitClient.SetConfig("merge.unityyamlmerge.trustExitCode", "false", GitConfigSource.Local))
-                              .Then(ApplicationManager.GitClient.LfsInstall()).Then(new ActionTask(token, _ => {
-                                  SetProjectToTextSerialization();
-
+                              .Then(ApplicationManager.GitClient.LfsInstall())
+                              .ThenInUI(SetProjectToTextSerialization)
+                              .Then(new ActionTask(token, _ => {
                                   AssemblyResources.ToFile(ResourceType.Generic, ".gitignore", targetPath);
                                   AssemblyResources.ToFile(ResourceType.Generic, ".gitattributes", targetPath);
 

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

@@ -46,9 +46,9 @@ private AuthenticationService AuthenticationService
             }
         }
 
-        public override void Initialize(IView parent)
+        public override void InitializeView(IView parent)
         {
-            base.Initialize(parent);
+            base.InitializeView(parent);
             need2fa = busy = false;
         }
 

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

@@ -55,7 +55,7 @@ private void CreateViews()
                 authView = new AuthenticationView();
 
             Initialize(EntryPoint.ApplicationManager);
-            authView.Initialize(this);
+            authView.InitializeView(this);
         }
 
         private void ShowActiveView()

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

@@ -38,9 +38,9 @@ class BranchesView : Subview
         [SerializeField] private Vector2 scroll;
         [SerializeField] private BranchTreeNode selectedNode;
 
-        public override void Initialize(IView parent)
+        public override void InitializeView(IView parent)
         {
-            base.Initialize(parent);
+            base.InitializeView(parent);
             targetMode = mode;
         }
 

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

@@ -27,10 +27,10 @@ class ChangesView : Subview
         [SerializeField] private Vector2 horizontalScroll;
         [SerializeField] private ChangesetTreeView tree = new ChangesetTreeView();
 
-        public override void Initialize(IView parent)
+        public override void InitializeView(IView parent)
         {
-            base.Initialize(parent);
-            tree.Initialize(this);
+            base.InitializeView(parent);
+            tree.InitializeView(this);
         }
 
         public override void OnShow()

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

@@ -58,14 +58,24 @@ class HistoryView : Subview
         [SerializeField] private ChangesetTreeView changesetTree = new ChangesetTreeView();
         [SerializeField] private List<GitLogEntry> history = new List<GitLogEntry>();
 
-        public override void Initialize(IView parent)
+        public override void Initialize(IApplicationManager applicationManager)
         {
-            base.Initialize(parent);
+            base.Initialize(applicationManager);
+            if (Manager != null)
+            {
+                UpdateLog();
+            }
+        }
+
+        public override void InitializeView(IView parent)
+        {
+            Logger.Trace("InitializeView(IView)");
+            base.InitializeView(parent);
 
             lastWidth = Position.width;
             selectionIndex = newSelectionIndex = -1;
 
-            changesetTree.Initialize(this);
+            changesetTree.InitializeView(this);
             changesetTree.Readonly = true;
 
             if (Repository != null)

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

@@ -83,9 +83,9 @@ class SettingsView : Subview
         [SerializeField] private string repositoryRemoteName;
         [SerializeField] private string repositoryRemoteUrl;
 
-        public override void Initialize(IView parent)
+        public override void InitializeView(IView parent)
         {
-            base.Initialize(parent);
+            base.InitializeView(parent);
             Setup();
         }
 

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

@@ -93,12 +93,13 @@ abstract class Subview : IView
         protected IEnvironment Environment { get { return Manager != null ? Manager.Environment : null; } }
         protected IPlatform Platform { get { return Manager != null ? Manager.Platform : null; } }
 
-        void IView.Initialize(IApplicationManager applicationManager)
+        public virtual void Initialize(IApplicationManager applicationManager)
         {
+            Logger.Trace("Initialize(IApplicationManager: {0})", applicationManager != null);
             Manager = applicationManager;
         }
 
-        public virtual void Initialize(IView parent)
+        public virtual void InitializeView(IView parent)
         {
             Debug.Assert(parent != null, NullParentError);
             Parent = parent;

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

@@ -73,10 +73,10 @@ public override void OnEnable()
             // Set window title
             titleContent = new GUIContent(Title, Styles.SmallLogo);
 
-            historyTab.Initialize(this);
-            changesTab.Initialize(this);
-            branchesTab.Initialize(this);
-            settingsTab.Initialize(this);
+            historyTab.InitializeView(this);
+            changesTab.InitializeView(this);
+            branchesTab.InitializeView(this);
+            settingsTab.InitializeView(this);
         }
 
         public override void Refresh()
@@ -336,11 +336,11 @@ public override void Initialize(IApplicationManager applicationManager)
         {
             base.Initialize(applicationManager);
 
-            HistoryTab.Initialize(this);
-            ChangesTab.Initialize(this);
-            BranchesTab.Initialize(this);
-            SettingsTab.Initialize(this);
-            ActiveTab.Initialize(this);
+            HistoryTab.InitializeView(this);
+            ChangesTab.InitializeView(this);
+            BranchesTab.InitializeView(this);
+            SettingsTab.InitializeView(this);
+            ActiveTab.InitializeView(this);
         }
     }
 }