Merge branch 'enhancements/git-path-save-button' into enhancements/git-path-view

StanleyGoldman · StanleyGoldman · commit 9832cfefa5b0 · 2017-09-08T14:13:36.000-04:00
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ## Notices
 
-From version 0.19 onwards, the location of the plugin has moved to `Assets/Plugins/GitHub`. If you have version 0.18 or lower, you need to delete the `Assets/Editor/GitHub` folder before you install newer versions. You should exit Unity and delete the folder from Explorer/Finder, as Unity will not unload native libraries while it's running.
+From version 0.19 onwards, the location of the plugin has moved to `Assets/Plugins/GitHub`. If you have version 0.18 or lower, you need to delete the `Assets/Editor/GitHub` folder before you install newer versions. You should exit Unity and delete the folder from Explorer/Finder, as Unity will not unload native libraries while it's running. Also, remember to update your `.gitignore` file.
 
 ![Build Status](https://ci.appveyor.com/api/projects/status/github/github-for-unity/Unity?branch=master&svg=true)
 
@@ -81,7 +81,11 @@ Once the extension is installed, you can open a command line with the same Git a
 
 ### Installation
 
-To install the extension, download the latest package from [the releases page](https://github.com/github-for-unity/Unity/releases) and double click on it.
+This extensions needs to be installed (and updated) for each Unity project that you want to version control. 
+First step is to download the latest package from [the releases page](https://github.com/github-for-unity/Unity/releases);
+it will be saved as a file with the extension `.unitypackage`.
+To install it, open Unity, then open the project you want to version control, and then double click on the downloaded package.
+Alternatively, import the package by clicking Assets, Import Package, Custom Package, then select the downloaded package.
 
 #### Log files
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs
@@ -126,52 +126,52 @@ public List<GitBranch> RemoteBranches
     }
 
     [Location("views/branches.yaml", LocationAttribute.Location.LibraryFolder)]
-    sealed class Favourites : ScriptObjectSingleton<Favourites>
+    sealed class Favorites : ScriptObjectSingleton<Favorites>
     {
-        [SerializeField] private List<string> favouriteBranches;
-        public List<string> FavouriteBranches
+        [SerializeField] private List<string> favoriteBranches;
+        public List<string> FavoriteBranches
         {
             get
             {
-                if (favouriteBranches == null)
-                    FavouriteBranches = new List<string>();
-                return favouriteBranches;
+                if (favoriteBranches == null)
+                    FavoriteBranches = new List<string>();
+                return favoriteBranches;
             }
             set
             {
-                favouriteBranches = value;
+                favoriteBranches = value;
                 Save(true);
             }
         }
 
-        public void SetFavourite(string branchName)
+        public void SetFavorite(string branchName)
         {
-            if (FavouriteBranches.Contains(branchName))
+            if (FavoriteBranches.Contains(branchName))
                 return;
-            FavouriteBranches.Add(branchName);
+            FavoriteBranches.Add(branchName);
             Save(true);
         }
 
-        public void UnsetFavourite(string branchName)
+        public void UnsetFavorite(string branchName)
         {
-            if (!FavouriteBranches.Contains(branchName))
+            if (!FavoriteBranches.Contains(branchName))
                 return;
-            FavouriteBranches.Remove(branchName);
+            FavoriteBranches.Remove(branchName);
             Save(true);
         }
 
-        public void ToggleFavourite(string branchName)
+        public void ToggleFavorite(string branchName)
         {
-            if (FavouriteBranches.Contains(branchName))
-                FavouriteBranches.Remove(branchName);
+            if (FavoriteBranches.Contains(branchName))
+                FavoriteBranches.Remove(branchName);
             else
-                FavouriteBranches.Add(branchName);
+                FavoriteBranches.Add(branchName);
             Save(true);
         }
 
-        public bool IsFavourite(string branchName)
+        public bool IsFavorite(string branchName)
         {
-            return FavouriteBranches.Contains(branchName);
+            return FavoriteBranches.Contains(branchName);
         }
     }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs
@@ -83,8 +83,8 @@ class Styles
         private static Texture2D branchIcon,
                                  activeBranchIcon,
                                  trackingBranchIcon,
-                                 favouriteIconOn,
-                                 favouriteIconOff,
+                                 favoriteIconOn,
+                                 favoriteIconOff,
                                  smallLogoIcon,
                                  bigLogoIcon,
                                  defaultAssetIcon,
@@ -645,29 +645,29 @@ public static Texture2D TrackingBranchIcon
             }
         }
 
-        public static Texture2D FavouriteIconOn
+        public static Texture2D FavoriteIconOn
         {
             get
             {
-                if (favouriteIconOn == null)
+                if (favoriteIconOn == null)
                 {
-                    favouriteIconOn = Utility.GetIcon("favorite-branch-indicator.png");
+                    favoriteIconOn = Utility.GetIcon("favorite-branch-indicator.png");
                 }
 
-                return favouriteIconOn;
+                return favoriteIconOn;
             }
         }
 
-        public static Texture2D FavouriteIconOff
+        public static Texture2D FavoriteIconOff
         {
             get
             {
-                if (favouriteIconOff == null)
+                if (favoriteIconOff == null)
                 {
-                    favouriteIconOff = FolderIcon;
+                    favoriteIconOff = FolderIcon;
                 }
 
-                return favouriteIconOff;
+                return favoriteIconOff;
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
@@ -38,11 +38,12 @@ class BranchesView : Subview
         private bool showLocalBranches = true;
         private bool showRemoteBranches = true;
 
-        [NonSerialized] private List<BranchTreeNode> favourites = new List<BranchTreeNode>();
+        [NonSerialized] private List<BranchTreeNode> favorites = new List<BranchTreeNode>();
         [NonSerialized] private int listID = -1;
         [NonSerialized] private List<GitBranch> newLocalBranches;
         [NonSerialized] private BranchTreeNode newNodeSelection;
         [NonSerialized] private BranchesMode targetMode;
+        [NonSerialized] private bool favoritesHasChanged;
 
         [SerializeField] private BranchTreeNode activeBranchNode;
         [SerializeField] private BranchTreeNode localRoot;
@@ -51,6 +52,7 @@ class BranchesView : Subview
         [SerializeField] private List<Remote> remotes = new List<Remote>();
         [SerializeField] private Vector2 scroll;
         [SerializeField] private BranchTreeNode selectedNode;
+        private List<string> favoritesList;
 
         public override void InitializeView(IView parent)
         {
@@ -62,6 +64,7 @@ public override void OnEnable()
         {
             base.OnEnable();
             AttachHandlers(Repository);
+            favoritesHasChanged = true;
         }
 
         public override void OnDisable()
@@ -70,6 +73,21 @@ public override void OnDisable()
             DetachHandlers(Repository);
         }
 
+        public override void OnDataUpdate()
+        {
+            base.OnDataUpdate();
+            MaybeUpdateData();
+        }
+
+        private void MaybeUpdateData()
+        {
+            if (favoritesHasChanged)
+            {
+                favoritesList = Manager.LocalSettings.Get(FavoritesSetting, new List<string>());
+                favoritesHasChanged = false;
+            }
+        }
+
         public override void OnRepositoryChanged(IRepository oldRepository)
         {
             base.OnRepositoryChanged(oldRepository);
@@ -147,17 +165,17 @@ public void OnEmbeddedGUI()
 
                 GUILayout.BeginVertical(Styles.CommitFileAreaStyle);
                 {
-                    // Favourites list
-                    if (favourites.Count > 0)
+                    // Favorites list
+                    if (favorites.Count > 0)
                     {
                         GUILayout.Label(FavoritesTitle);
                         GUILayout.BeginHorizontal();
                         {
                             GUILayout.BeginVertical();
                             {
-                                for (var index = 0; index < favourites.Count; ++index)
+                                for (var index = 0; index < favorites.Count; ++index)
                                 {
-                                    OnTreeNodeGUI(favourites[index]);
+                                    OnTreeNodeGUI(favorites[index]);
                                 }
                             }
 
@@ -251,12 +269,12 @@ public void OnEmbeddedGUI()
 
         private int CompareBranches(GitBranch a, GitBranch b)
         {
-            if (GetFavourite(a.Name))
+            if (IsFavorite(a.Name))
             {
                 return -1;
             }
 
-            if (GetFavourite(b.Name))
+            if (IsFavorite(b.Name))
             {
                 return 1;
             }
@@ -274,19 +292,9 @@ private int CompareBranches(GitBranch a, GitBranch b)
             return 0;
         }
 
-        private bool GetFavourite(BranchTreeNode branch)
-        {
-            return GetFavourite(branch.Name);
-        }
-
-        private bool GetFavourite(string branchName)
+        private bool IsFavorite(string branchName)
         {
-            if (string.IsNullOrEmpty(branchName))
-            {
-                return false;
-            }
-
-            return Manager.LocalSettings.Get(FavoritesSetting, new List<string>()).Contains(branchName);
+            return !String.IsNullOrEmpty(branchName) && favoritesList.Contains(branchName);
         }
 
         private void OnLocalBranchesUpdate(IEnumerable<GitBranch> list)
@@ -315,9 +323,8 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo
             var tracking = new List<KeyValuePair<int, int>>();
             var localBranchNodes = new List<BranchTreeNode>();
 
-            // Prepare for updated favourites listing
-            favourites.Clear();
-            var cachedFavs = Manager.LocalSettings.Get<List<string>>(FavoritesSetting, new List<string>());
+            // Prepare for updated favorites listing
+            favorites.Clear();
 
             // Just build directly on the local root, keep track of active branch
             localRoot = new BranchTreeNode("", NodeType.Folder, false);
@@ -346,10 +353,10 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo
                     }
                 }
 
-                // Add to favourites
-                if (cachedFavs.Contains(branch.Name))
+                // Add to favorites
+                if (favoritesList.Contains(branch.Name))
                 {
-                    favourites.Add(node);
+                    favorites.Add(node);
                 }
 
                 // Build into tree
@@ -390,10 +397,10 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo
                     }
                 }
 
-                // Add to favourites
-                if (cachedFavs.Contains(branch.Name))
+                // Add to favorites
+                if (favoritesList.Contains(branch.Name))
                 {
-                    favourites.Add(node);
+                    favorites.Add(node);
                 }
 
                 // Build on the root of the remote, just like with locals
@@ -428,23 +435,23 @@ private void BuildTree(BranchTreeNode parent, BranchTreeNode child)
             BuildTree(folder, child);
         }
 
-        private void SetFavourite(BranchTreeNode branch, bool favourite)
+        private void SetFavorite(BranchTreeNode branch, bool favorite)
         {
             if (string.IsNullOrEmpty(branch.Name))
             {
                 return;
             }
 
-            if (!favourite)
+            if (!favorite)
             {
-                favourites.Remove(branch);
-                Manager.LocalSettings.Set(FavoritesSetting, favourites.Select(x => x.Name).ToList());
+                favorites.Remove(branch);
+                Manager.LocalSettings.Set(FavoritesSetting, favorites.Select(x => x.Name).ToList());
             }
             else
             {
-                favourites.Remove(branch);
-                favourites.Add(branch);
-                Manager.LocalSettings.Set(FavoritesSetting, favourites.Select(x => x.Name).ToList());
+                favorites.Remove(branch);
+                favorites.Add(branch);
+                Manager.LocalSettings.Set(FavoritesSetting, favorites.Select(x => x.Name).ToList());
             }
         }
 
@@ -587,12 +594,12 @@ private void OnTreeNodeGUI(BranchTreeNode node)
             var style = node.Active ? Styles.BoldLabel : Styles.Label;
             var rect = GUILayoutUtility.GetRect(content, style, GUILayout.MaxHeight(EditorGUIUtility.singleLineHeight));
             var clickRect = new Rect(0f, rect.y, Position.width, rect.height);
-            var favouriteRect = new Rect(clickRect.xMax - clickRect.height * 2f, clickRect.y, clickRect.height, clickRect.height);
+            var favoriteRect = new Rect(clickRect.xMax - clickRect.height * 2f, clickRect.y, clickRect.height, clickRect.height);
 
             var selected = selectedNode == node;
             var keyboardFocus = GUIUtility.keyboardControl == listID;
 
-            // Selection highlight and favourite toggle
+            // Selection highlight and favorite toggle
             if (selected)
             {
                 if (Event.current.type == EventType.Repaint)
@@ -602,22 +609,22 @@ private void OnTreeNodeGUI(BranchTreeNode node)
 
                 if (node.Type != NodeType.Folder)
                 {
-                    var favourite = GetFavourite(node);
+                    var favorite = IsFavorite(node.Name);
                     if (Event.current.type == EventType.Repaint)
                     {
-                        GUI.DrawTexture(favouriteRect, favourite ? Styles.FavouriteIconOn : Styles.FavouriteIconOff);
+                        GUI.DrawTexture(favoriteRect, favorite ? Styles.FavoriteIconOn : Styles.FavoriteIconOff);
                     }
-                    else if (Event.current.type == EventType.MouseDown && favouriteRect.Contains(Event.current.mousePosition))
+                    else if (Event.current.type == EventType.MouseDown && favoriteRect.Contains(Event.current.mousePosition))
                     {
-                        SetFavourite(node, !favourite);
+                        SetFavorite(node, !favorite);
                         Event.current.Use();
                     }
                 }
             }
-            // Favourite status
-            else if (Event.current.type == EventType.Repaint && node.Type != NodeType.Folder && GetFavourite(node.Name))
+            // Favorite status
+            else if (Event.current.type == EventType.Repaint && node.Type != NodeType.Folder && IsFavorite(node.Name))
             {
-                GUI.DrawTexture(favouriteRect, Styles.FavouriteIconOn);
+                GUI.DrawTexture(favoriteRect, Styles.FavoriteIconOn);
             }
 
             // The actual icon and label
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs

Original file line number	Diff line number	Diff line change
`@@ -126,52 +126,52 @@ public List<GitBranch> RemoteBranches`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`[Location("views/branches.yaml", LocationAttribute.Location.LibraryFolder)]`
`129`		`- sealed class Favourites : ScriptObjectSingleton<Favourites>`
	`129`	`+ sealed class Favorites : ScriptObjectSingleton<Favorites>`
`130`	`130`	`{`
`131`		`- [SerializeField] private List<string> favouriteBranches;`
`132`		`- public List<string> FavouriteBranches`
	`131`	`+ [SerializeField] private List<string> favoriteBranches;`
	`132`	`+ public List<string> FavoriteBranches`
`133`	`133`	`{`
`134`	`134`	`get`
`135`	`135`	`{`
`136`		`- if (favouriteBranches == null)`
`137`		`- FavouriteBranches = new List<string>();`
`138`		`- return favouriteBranches;`
	`136`	`+ if (favoriteBranches == null)`
	`137`	`+ FavoriteBranches = new List<string>();`
	`138`	`+ return favoriteBranches;`
`139`	`139`	`}`
`140`	`140`	`set`
`141`	`141`	`{`
`142`		`- favouriteBranches = value;`
	`142`	`+ favoriteBranches = value;`
`143`	`143`	`Save(true);`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
`147`		`- public void SetFavourite(string branchName)`
	`147`	`+ public void SetFavorite(string branchName)`
`148`	`148`	`{`
`149`		`- if (FavouriteBranches.Contains(branchName))`
	`149`	`+ if (FavoriteBranches.Contains(branchName))`
`150`	`150`	`return;`
`151`		`- FavouriteBranches.Add(branchName);`
	`151`	`+ FavoriteBranches.Add(branchName);`
`152`	`152`	`Save(true);`
`153`	`153`	`}`
`154`	`154`
`155`		`- public void UnsetFavourite(string branchName)`
	`155`	`+ public void UnsetFavorite(string branchName)`
`156`	`156`	`{`
`157`		`- if (!FavouriteBranches.Contains(branchName))`
	`157`	`+ if (!FavoriteBranches.Contains(branchName))`
`158`	`158`	`return;`
`159`		`- FavouriteBranches.Remove(branchName);`
	`159`	`+ FavoriteBranches.Remove(branchName);`
`160`	`160`	`Save(true);`
`161`	`161`	`}`
`162`	`162`
`163`		`- public void ToggleFavourite(string branchName)`
	`163`	`+ public void ToggleFavorite(string branchName)`
`164`	`164`	`{`
`165`		`- if (FavouriteBranches.Contains(branchName))`
`166`		`- FavouriteBranches.Remove(branchName);`
	`165`	`+ if (FavoriteBranches.Contains(branchName))`
	`166`	`+ FavoriteBranches.Remove(branchName);`
`167`	`167`	`else`
`168`		`- FavouriteBranches.Add(branchName);`
	`168`	`+ FavoriteBranches.Add(branchName);`
`169`	`169`	`Save(true);`
`170`	`170`	`}`
`171`	`171`
`172`		`- public bool IsFavourite(string branchName)`
	`172`	`+ public bool IsFavorite(string branchName)`
`173`	`173`	`{`
`174`		`- return FavouriteBranches.Contains(branchName);`
	`174`	`+ return FavoriteBranches.Contains(branchName);`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`
Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,8 @@ class Styles`
`83`	`83`	`private static Texture2D branchIcon,`
`84`	`84`	`activeBranchIcon,`
`85`	`85`	`trackingBranchIcon,`
`86`		`- favouriteIconOn,`
`87`		`- favouriteIconOff,`
	`86`	`+ favoriteIconOn,`
	`87`	`+ favoriteIconOff,`
`88`	`88`	`smallLogoIcon,`
`89`	`89`	`bigLogoIcon,`
`90`	`90`	`defaultAssetIcon,`
`@@ -645,29 +645,29 @@ public static Texture2D TrackingBranchIcon`
`645`	`645`	`}`
`646`	`646`	`}`
`647`	`647`
`648`		`- public static Texture2D FavouriteIconOn`
	`648`	`+ public static Texture2D FavoriteIconOn`
`649`	`649`	`{`
`650`	`650`	`get`
`651`	`651`	`{`
`652`		`- if (favouriteIconOn == null)`
	`652`	`+ if (favoriteIconOn == null)`
`653`	`653`	`{`
`654`		`- favouriteIconOn = Utility.GetIcon("favorite-branch-indicator.png");`
	`654`	`+ favoriteIconOn = Utility.GetIcon("favorite-branch-indicator.png");`
`655`	`655`	`}`
`656`	`656`
`657`		`- return favouriteIconOn;`
	`657`	`+ return favoriteIconOn;`
`658`	`658`	`}`
`659`	`659`	`}`
`660`	`660`
`661`		`- public static Texture2D FavouriteIconOff`
	`661`	`+ public static Texture2D FavoriteIconOff`
`662`	`662`	`{`
`663`	`663`	`get`
`664`	`664`	`{`
`665`		`- if (favouriteIconOff == null)`
	`665`	`+ if (favoriteIconOff == null)`
`666`	`666`	`{`
`667`		`- favouriteIconOff = FolderIcon;`
	`667`	`+ favoriteIconOff = FolderIcon;`
`668`	`668`	`}`
`669`	`669`
`670`		`- return favouriteIconOff;`
	`670`	`+ return favoriteIconOff;`
`671`	`671`	`}`
`672`	`672`	`}`
`673`	`673`
Original file line number	Diff line number	Diff line change
`@@ -38,11 +38,12 @@ class BranchesView : Subview`
`38`	`38`	`private bool showLocalBranches = true;`
`39`	`39`	`private bool showRemoteBranches = true;`
`40`	`40`
`41`		`- [NonSerialized] private List<BranchTreeNode> favourites = new List<BranchTreeNode>();`
	`41`	`+ [NonSerialized] private List<BranchTreeNode> favorites = new List<BranchTreeNode>();`
`42`	`42`	`[NonSerialized] private int listID = -1;`
`43`	`43`	`[NonSerialized] private List<GitBranch> newLocalBranches;`
`44`	`44`	`[NonSerialized] private BranchTreeNode newNodeSelection;`
`45`	`45`	`[NonSerialized] private BranchesMode targetMode;`
	`46`	`+ [NonSerialized] private bool favoritesHasChanged;`
`46`	`47`
`47`	`48`	`[SerializeField] private BranchTreeNode activeBranchNode;`
`48`	`49`	`[SerializeField] private BranchTreeNode localRoot;`
`@@ -51,6 +52,7 @@ class BranchesView : Subview`
`51`	`52`	`[SerializeField] private List<Remote> remotes = new List<Remote>();`
`52`	`53`	`[SerializeField] private Vector2 scroll;`
`53`	`54`	`[SerializeField] private BranchTreeNode selectedNode;`
	`55`	`+ private List<string> favoritesList;`
`54`	`56`
`55`	`57`	`public override void InitializeView(IView parent)`
`56`	`58`	`{`
`@@ -62,6 +64,7 @@ public override void OnEnable()`
`62`	`64`	`{`
`63`	`65`	`base.OnEnable();`
`64`	`66`	`AttachHandlers(Repository);`
	`67`	`+ favoritesHasChanged = true;`
`65`	`68`	`}`
`66`	`69`
`67`	`70`	`public override void OnDisable()`
`@@ -70,6 +73,21 @@ public override void OnDisable()`
`70`	`73`	`DetachHandlers(Repository);`
`71`	`74`	`}`
`72`	`75`
	`76`	`+ public override void OnDataUpdate()`
	`77`	`+ {`
	`78`	`+ base.OnDataUpdate();`
	`79`	`+ MaybeUpdateData();`
	`80`	`+ }`
	`81`	`+`
	`82`	`+ private void MaybeUpdateData()`
	`83`	`+ {`
	`84`	`+ if (favoritesHasChanged)`
	`85`	`+ {`
	`86`	`+ favoritesList = Manager.LocalSettings.Get(FavoritesSetting, new List<string>());`
	`87`	`+ favoritesHasChanged = false;`
	`88`	`+ }`
	`89`	`+ }`
	`90`	`+`
`73`	`91`	`public override void OnRepositoryChanged(IRepository oldRepository)`
`74`	`92`	`{`
`75`	`93`	`base.OnRepositoryChanged(oldRepository);`
`@@ -147,17 +165,17 @@ public void OnEmbeddedGUI()`
`147`	`165`
`148`	`166`	`GUILayout.BeginVertical(Styles.CommitFileAreaStyle);`
`149`	`167`	`{`
`150`		`- // Favourites list`
`151`		`- if (favourites.Count > 0)`
	`168`	`+ // Favorites list`
	`169`	`+ if (favorites.Count > 0)`
`152`	`170`	`{`
`153`	`171`	`GUILayout.Label(FavoritesTitle);`
`154`	`172`	`GUILayout.BeginHorizontal();`
`155`	`173`	`{`
`156`	`174`	`GUILayout.BeginVertical();`
`157`	`175`	`{`
`158`		`- for (var index = 0; index < favourites.Count; ++index)`
	`176`	`+ for (var index = 0; index < favorites.Count; ++index)`
`159`	`177`	`{`
`160`		`- OnTreeNodeGUI(favourites[index]);`
	`178`	`+ OnTreeNodeGUI(favorites[index]);`
`161`	`179`	`}`
`162`	`180`	`}`
`163`	`181`
`@@ -251,12 +269,12 @@ public void OnEmbeddedGUI()`
`251`	`269`
`252`	`270`	`private int CompareBranches(GitBranch a, GitBranch b)`
`253`	`271`	`{`
`254`		`- if (GetFavourite(a.Name))`
	`272`	`+ if (IsFavorite(a.Name))`
`255`	`273`	`{`
`256`	`274`	`return -1;`
`257`	`275`	`}`
`258`	`276`
`259`		`- if (GetFavourite(b.Name))`
	`277`	`+ if (IsFavorite(b.Name))`
`260`	`278`	`{`
`261`	`279`	`return 1;`
`262`	`280`	`}`
`@@ -274,19 +292,9 @@ private int CompareBranches(GitBranch a, GitBranch b)`
`274`	`292`	`return 0;`
`275`	`293`	`}`
`276`	`294`
`277`		`- private bool GetFavourite(BranchTreeNode branch)`
`278`		`- {`
`279`		`- return GetFavourite(branch.Name);`
`280`		`- }`
`281`		`-`
`282`		`- private bool GetFavourite(string branchName)`
	`295`	`+ private bool IsFavorite(string branchName)`
`283`	`296`	`{`
`284`		`- if (string.IsNullOrEmpty(branchName))`
`285`		`- {`
`286`		`- return false;`
`287`		`- }`
`288`		`-`
`289`		`- return Manager.LocalSettings.Get(FavoritesSetting, new List<string>()).Contains(branchName);`
	`297`	`+ return !String.IsNullOrEmpty(branchName) && favoritesList.Contains(branchName);`
`290`	`298`	`}`
`291`	`299`
`292`	`300`	`private void OnLocalBranchesUpdate(IEnumerable<GitBranch> list)`
`@@ -315,9 +323,8 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo`
`315`	`323`	`var tracking = new List<KeyValuePair<int, int>>();`
`316`	`324`	`var localBranchNodes = new List<BranchTreeNode>();`
`317`	`325`
`318`		`- // Prepare for updated favourites listing`
`319`		`- favourites.Clear();`
`320`		`- var cachedFavs = Manager.LocalSettings.Get<List<string>>(FavoritesSetting, new List<string>());`
	`326`	`+ // Prepare for updated favorites listing`
	`327`	`+ favorites.Clear();`
`321`	`328`
`322`	`329`	`// Just build directly on the local root, keep track of active branch`
`323`	`330`	`localRoot = new BranchTreeNode("", NodeType.Folder, false);`
`@@ -346,10 +353,10 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo`
`346`	`353`	`}`
`347`	`354`	`}`
`348`	`355`
`349`		`- // Add to favourites`
`350`		`- if (cachedFavs.Contains(branch.Name))`
	`356`	`+ // Add to favorites`
	`357`	`+ if (favoritesList.Contains(branch.Name))`
`351`	`358`	`{`
`352`		`- favourites.Add(node);`
	`359`	`+ favorites.Add(node);`
`353`	`360`	`}`
`354`	`361`
`355`	`362`	`// Build into tree`
`@@ -390,10 +397,10 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo`
`390`	`397`	`}`
`391`	`398`	`}`
`392`	`399`
`393`		`- // Add to favourites`
`394`		`- if (cachedFavs.Contains(branch.Name))`
	`400`	`+ // Add to favorites`
	`401`	`+ if (favoritesList.Contains(branch.Name))`
`395`	`402`	`{`
`396`		`- favourites.Add(node);`
	`403`	`+ favorites.Add(node);`
`397`	`404`	`}`
`398`	`405`
`399`	`406`	`// Build on the root of the remote, just like with locals`
`@@ -428,23 +435,23 @@ private void BuildTree(BranchTreeNode parent, BranchTreeNode child)`
`428`	`435`	`BuildTree(folder, child);`
`429`	`436`	`}`
`430`	`437`
`431`		`- private void SetFavourite(BranchTreeNode branch, bool favourite)`
	`438`	`+ private void SetFavorite(BranchTreeNode branch, bool favorite)`
`432`	`439`	`{`
`433`	`440`	`if (string.IsNullOrEmpty(branch.Name))`
`434`	`441`	`{`
`435`	`442`	`return;`
`436`	`443`	`}`
`437`	`444`
`438`		`- if (!favourite)`
	`445`	`+ if (!favorite)`
`439`	`446`	`{`
`440`		`- favourites.Remove(branch);`
`441`		`- Manager.LocalSettings.Set(FavoritesSetting, favourites.Select(x => x.Name).ToList());`
	`447`	`+ favorites.Remove(branch);`
	`448`	`+ Manager.LocalSettings.Set(FavoritesSetting, favorites.Select(x => x.Name).ToList());`
`442`	`449`	`}`
`443`	`450`	`else`
`444`	`451`	`{`
`445`		`- favourites.Remove(branch);`
`446`		`- favourites.Add(branch);`
`447`		`- Manager.LocalSettings.Set(FavoritesSetting, favourites.Select(x => x.Name).ToList());`
	`452`	`+ favorites.Remove(branch);`
	`453`	`+ favorites.Add(branch);`
	`454`	`+ Manager.LocalSettings.Set(FavoritesSetting, favorites.Select(x => x.Name).ToList());`
`448`	`455`	`}`
`449`	`456`	`}`
`450`	`457`
`@@ -587,12 +594,12 @@ private void OnTreeNodeGUI(BranchTreeNode node)`
`587`	`594`	`var style = node.Active ? Styles.BoldLabel : Styles.Label;`
`588`	`595`	`var rect = GUILayoutUtility.GetRect(content, style, GUILayout.MaxHeight(EditorGUIUtility.singleLineHeight));`
`589`	`596`	`var clickRect = new Rect(0f, rect.y, Position.width, rect.height);`
`590`		`- var favouriteRect = new Rect(clickRect.xMax - clickRect.height * 2f, clickRect.y, clickRect.height, clickRect.height);`
	`597`	`+ var favoriteRect = new Rect(clickRect.xMax - clickRect.height * 2f, clickRect.y, clickRect.height, clickRect.height);`
`591`	`598`
`592`	`599`	`var selected = selectedNode == node;`
`593`	`600`	`var keyboardFocus = GUIUtility.keyboardControl == listID;`
`594`	`601`
`595`		`- // Selection highlight and favourite toggle`
	`602`	`+ // Selection highlight and favorite toggle`
`596`	`603`	`if (selected)`
`597`	`604`	`{`
`598`	`605`	`if (Event.current.type == EventType.Repaint)`
`@@ -602,22 +609,22 @@ private void OnTreeNodeGUI(BranchTreeNode node)`
`602`	`609`
`603`	`610`	`if (node.Type != NodeType.Folder)`
`604`	`611`	`{`
`605`		`- var favourite = GetFavourite(node);`
	`612`	`+ var favorite = IsFavorite(node.Name);`
`606`	`613`	`if (Event.current.type == EventType.Repaint)`
`607`	`614`	`{`
`608`		`- GUI.DrawTexture(favouriteRect, favourite ? Styles.FavouriteIconOn : Styles.FavouriteIconOff);`
	`615`	`+ GUI.DrawTexture(favoriteRect, favorite ? Styles.FavoriteIconOn : Styles.FavoriteIconOff);`
`609`	`616`	`}`
`610`		`- else if (Event.current.type == EventType.MouseDown && favouriteRect.Contains(Event.current.mousePosition))`
	`617`	`+ else if (Event.current.type == EventType.MouseDown && favoriteRect.Contains(Event.current.mousePosition))`
`611`	`618`	`{`
`612`		`- SetFavourite(node, !favourite);`
	`619`	`+ SetFavorite(node, !favorite);`
`613`	`620`	`Event.current.Use();`
`614`	`621`	`}`
`615`	`622`	`}`
`616`	`623`	`}`
`617`		`- // Favourite status`
`618`		`- else if (Event.current.type == EventType.Repaint && node.Type != NodeType.Folder && GetFavourite(node.Name))`
	`624`	`+ // Favorite status`
	`625`	`+ else if (Event.current.type == EventType.Repaint && node.Type != NodeType.Folder && IsFavorite(node.Name))`
`619`	`626`	`{`
`620`		`- GUI.DrawTexture(favouriteRect, Styles.FavouriteIconOn);`
	`627`	`+ GUI.DrawTexture(favoriteRect, Styles.FavoriteIconOn);`
`621`	`628`	`}`
`622`	`629`
`623`	`630`	`// The actual icon and label`