Merge pull request #532 from github-for-unity/fixes/changes-view-lock-icons

Functionality to use lock data in ChangesTreeView Icons

Author: StanleyGoldman

src/GitHub.Api/Git/TreeData.cs

@@ -30,17 +30,19 @@ public struct GitStatusEntryTreeData : ITreeData
         public static GitStatusEntryTreeData Default = new GitStatusEntryTreeData(GitStatusEntry.Default);
 
         public GitStatusEntry gitStatusEntry;
+        public bool isLocked;
 
-        public GitStatusEntryTreeData(GitStatusEntry gitStatusEntry)
+        public GitStatusEntryTreeData(GitStatusEntry gitStatusEntry, bool isLocked = false)
         {
+            this.isLocked = isLocked;
             this.gitStatusEntry = gitStatusEntry;
         }
 
         public string Path => gitStatusEntry.Path;
         public string ProjectPath => gitStatusEntry.ProjectPath;
         public bool IsActive => false;
         public GitStatusEntry GitStatusEntry => gitStatusEntry;
-
         public GitFileStatus FileStatus => gitStatusEntry.Status;
+        public bool IsLocked => isLocked;
     }
 }

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

@@ -14,6 +14,7 @@ public class ChangesTreeNode : TreeNode
     {
         public string projectPath;
         public GitFileStatus gitFileStatus;
+        public bool isLocked;
 
         public string ProjectPath
         {
@@ -26,6 +27,12 @@ public GitFileStatus GitFileStatus
             get { return gitFileStatus; }
             set { gitFileStatus = value; }
         }
+
+        public bool IsLocked
+        {
+            get { return isLocked; }
+            set { isLocked = value; }
+        }
     }
 
     [Serializable]
@@ -150,11 +157,22 @@ protected Texture GetNodeIconBadge(ChangesTreeNode node)
             }
 
             var gitFileStatus = node.GitFileStatus;
-            return Styles.GetFileStatusIcon(gitFileStatus, false);
+            return Styles.GetFileStatusIcon(gitFileStatus, node.IsLocked);
         }
 
         protected override ChangesTreeNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, GitStatusEntryTreeData? treeData)
         {
+            var gitFileStatus = GitFileStatus.None;
+            var projectPath = (string) null;
+            var isLocked = false;
+
+            if (treeData.HasValue)
+            {
+                isLocked = treeData.Value.IsLocked;
+                gitFileStatus = treeData.Value.FileStatus;
+                projectPath = treeData.Value.ProjectPath;
+            }
+
             var node = new ChangesTreeNode
             {
                 Path = path,
@@ -165,8 +183,9 @@ protected override ChangesTreeNode CreateTreeNode(string path, string label, int
                 IsHidden = isHidden,
                 IsCollapsed = isCollapsed,
                 TreeIsCheckable = IsCheckable,
-                GitFileStatus = treeData.HasValue ? treeData.Value.FileStatus : GitFileStatus.None,
-                ProjectPath = treeData.HasValue ? treeData.Value.ProjectPath : null
+                GitFileStatus = gitFileStatus,
+                ProjectPath = projectPath,
+                IsLocked = isLocked
             };
 
             if (isFolder)

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

@@ -20,6 +20,7 @@ class ChangesView : Subview
 
         [NonSerialized] private bool currentBranchHasUpdate;
         [NonSerialized] private bool currentStatusEntriesHasUpdate;
+        [NonSerialized] private bool currentLocksHasUpdate;
         [NonSerialized] private bool isBusy;
 
         [SerializeField] private string commitBody = "";
@@ -28,7 +29,9 @@ class ChangesView : Subview
         [SerializeField] private Vector2 scroll;
         [SerializeField] private CacheUpdateEvent lastCurrentBranchChangedEvent;
         [SerializeField] private CacheUpdateEvent lastStatusEntriesChangedEvent;
+        [SerializeField] private CacheUpdateEvent lastLocksChangedEvent;
         [SerializeField] private ChangesTree treeChanges;
+        [SerializeField] private HashSet<string> gitLocks;
         [SerializeField] private List<GitStatusEntry> gitStatusEntries;
         [SerializeField] private string changedFilesText = NoChangedFilesLabel;
 
@@ -39,6 +42,7 @@ public override void OnEnable()
             AttachHandlers(Repository);
             Repository.CheckCurrentBranchChangedEvent(lastCurrentBranchChangedEvent);
             Repository.CheckStatusEntriesChangedEvent(lastStatusEntriesChangedEvent);
+            Repository.CheckLocksChangedEvent(lastLocksChangedEvent);
         }
 
         public override void OnDisable()
@@ -142,6 +146,16 @@ private void RepositoryOnCurrentBranchChanged(CacheUpdateEvent cacheUpdateEvent)
             }
         }
 
+        private void RepositoryOnLocksChanged(CacheUpdateEvent cacheUpdateEvent)
+        {
+            if (!lastLocksChangedEvent.Equals(cacheUpdateEvent))
+            {
+                lastLocksChangedEvent = cacheUpdateEvent;
+                currentLocksHasUpdate = true;
+                Redraw();
+            }
+        }
+
         private void AttachHandlers(IRepository repository)
         {
             if (repository == null)
@@ -151,6 +165,7 @@ private void AttachHandlers(IRepository repository)
 
             repository.CurrentBranchChanged += RepositoryOnCurrentBranchChanged;
             repository.StatusEntriesChanged += RepositoryOnStatusEntriesChanged;
+            repository.LocksChanged += RepositoryOnLocksChanged;
         }
 
         private void DetachHandlers(IRepository repository)
@@ -162,6 +177,7 @@ private void DetachHandlers(IRepository repository)
 
             repository.CurrentBranchChanged -= RepositoryOnCurrentBranchChanged;
             repository.StatusEntriesChanged -= RepositoryOnStatusEntriesChanged;
+            repository.LocksChanged -= RepositoryOnLocksChanged;
         }
 
         private void MaybeUpdateData()
@@ -172,9 +188,12 @@ private void MaybeUpdateData()
                 currentBranch = string.Format("[{0}]", Repository.CurrentBranchName);
             }
 
-            if (currentStatusEntriesHasUpdate)
+            if (currentStatusEntriesHasUpdate || currentLocksHasUpdate)
             {
                 currentStatusEntriesHasUpdate = false;
+                currentLocksHasUpdate = false;
+
+                gitLocks = new HashSet<string>(Repository.CurrentLocks.Select(gitLock => gitLock.Path));
                 gitStatusEntries = Repository.CurrentChanges.Where(x => x.Status != GitFileStatus.Ignored).ToList();
 
                 changedFilesText = gitStatusEntries.Count == 0
@@ -200,7 +219,7 @@ private void BuildTree()
                 TreeOnEnable();
             }
 
-            treeChanges.Load(gitStatusEntries.Select(entry => new GitStatusEntryTreeData(entry)));
+            treeChanges.Load(gitStatusEntries.Select(entry => new GitStatusEntryTreeData(entry, gitLocks.Contains(entry.Path))));
             Redraw();
         }
 

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

@@ -185,6 +185,7 @@ private void MaybeUpdateData()
             {
                 currentLocksHasUpdate = false;
                 var repositoryCurrentLocks = Repository.CurrentLocks;
+                lockedFileSelection = -1;
                 lockedFiles = repositoryCurrentLocks != null
                     ? repositoryCurrentLocks.ToList()
                     : new List<GitLock>();