Added lock, unlock and unlock force menu items.

Author: neogeek

Assets/Plugins/CandyCoded.GitStatus/Scripts/CustomEditor/Git.cs

@@ -4,8 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Threading.Tasks;
 using UnityEngine;
+using Debug = UnityEngine.Debug;
 
 namespace CandyCoded.GitStatus
 {
@@ -23,6 +25,8 @@ public static class Git
         public static string GitLFSPath => "/usr/local/bin/git-lfs";
 #endif
 
+        public static string RepoPath => $"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}";
+
         private static Task<Process> GenerateProcess(string path, string arguments)
         {
 
@@ -111,6 +115,17 @@ public static async Task DiscardChanges(string path)
 
         }
 
+        public static async Task ForceUnlockFile(string path)
+        {
+
+            var process =
+                await GenerateProcess(GitLFSPath,
+                    $@"unlock ""{path.Replace(RepoPath, "")}"" --force");
+
+            process?.WaitForExit();
+
+        }
+
         public static async Task Init()
         {
 
@@ -145,6 +160,23 @@ public static async Task<string[]> LockedFiles()
 
         }
 
+        public static async Task LockFile(string path)
+        {
+
+            var process = await GenerateProcess(GitLFSPath,
+                $@"lock ""{path.Replace(RepoPath, "")}""");
+
+            if (process?.StandardError.ReadLine() is string line && line.StartsWith("Lock failed: missing protocol"))
+            {
+
+                throw new Exception("Locking requires git repo has been pushed to a remote.");
+
+            }
+
+            process?.WaitForExit();
+
+        }
+
         public static async Task<string> Status()
         {
 
@@ -161,6 +193,16 @@ public static async Task<string> Status()
 
         }
 
+        public static async Task UnlockFile(string path)
+        {
+
+            var process = await GenerateProcess(GitLFSPath,
+                $@"unlock ""{path.Replace(RepoPath, "")}""");
+
+            process?.WaitForExit();
+
+        }
+
         public static async Task<string[]> UntrackedFiles()
         {
 

Assets/Plugins/CandyCoded.GitStatus/Scripts/CustomEditor/GitMenuItems.cs

@@ -3,6 +3,7 @@
 #if UNITY_EDITOR
 using System;
 using System.IO;
+using System.Linq;
 using UnityEditor;
 
 namespace CandyCoded.GitStatus
@@ -13,10 +14,17 @@ public static class GitMenuItems
 
         private const int PRIORITY = 5000;
 
-        private static string GetSelectedPath()
+        private static string GetSelectedAbsolutePath()
         {
 
-            return Path.Combine(Environment.CurrentDirectory, AssetDatabase.GetAssetPath(Selection.activeObject));
+            return Path.Combine(Environment.CurrentDirectory, GetSelectedRelativePath());
+
+        }
+
+        private static string GetSelectedRelativePath()
+        {
+
+            return AssetDatabase.GetAssetPath(Selection.activeObject);
 
         }
 
@@ -28,7 +36,7 @@ private static async void DiscardChanges()
             try
             {
 
-                await Git.DiscardChanges(GetSelectedPath());
+                await Git.DiscardChanges(GetSelectedAbsolutePath());
 
             }
             catch (Exception error)
@@ -45,7 +53,8 @@ private static async void DiscardChanges()
         private static bool ValidateDiscardChanges()
         {
 
-            return Selection.activeObject && File.Exists(GetSelectedPath());
+            return Selection.activeObject && File.Exists(GetSelectedAbsolutePath()) &&
+                   GitStatus.changedFiles.Contains(GetSelectedRelativePath());
 
         }
 
@@ -63,7 +72,7 @@ private static async void DiscardAllChanges()
                 try
                 {
 
-                    await Git.DiscardChanges(GetSelectedPath());
+                    await Git.DiscardChanges(GetSelectedAbsolutePath());
 
                 }
                 catch (Exception error)
@@ -82,7 +91,84 @@ private static async void DiscardAllChanges()
         private static bool ValidateDiscardAllChanges()
         {
 
-            return Selection.activeObject && Directory.Exists(GetSelectedPath());
+            return Selection.activeObject && Directory.Exists(GetSelectedAbsolutePath());
+
+        }
+
+        [MenuItem("Git/Lock File", true, PRIORITY)]
+        [MenuItem("Assets/Lock File", true, PRIORITY)]
+        private static bool ValidateLockFile()
+        {
+
+            return Selection.activeObject && File.Exists(GetSelectedAbsolutePath()) &&
+                   !GitStatus.lockedFiles.Contains(GetSelectedRelativePath());
+
+        }
+
+        [MenuItem("Git/Lock File", false, PRIORITY)]
+        [MenuItem("Assets/Lock File", false, PRIORITY)]
+        private static async void LockFile()
+        {
+
+            try
+            {
+
+                await Git.LockFile(GetSelectedAbsolutePath());
+
+            }
+            catch (Exception error)
+            {
+
+                EditorUtility.DisplayDialog("Error", error.Message, "Ok");
+
+            }
+
+        }
+
+        [MenuItem("Git/Unlock File", true, PRIORITY)]
+        [MenuItem("Assets/Unlock File", true, PRIORITY)]
+        private static bool ValidateUnlockFile()
+        {
+
+            return Selection.activeObject && File.Exists(GetSelectedAbsolutePath()) &&
+                   GitStatus.lockedFiles.Contains(GetSelectedRelativePath());
+
+        }
+
+        [MenuItem("Git/Unlock File", false, PRIORITY)]
+        [MenuItem("Assets/Unlock File", false, PRIORITY)]
+        private static async void UnlockFile()
+        {
+
+            await Git.UnlockFile(GetSelectedAbsolutePath());
+
+        }
+
+        [MenuItem("Git/Force Unlock File", true, PRIORITY)]
+        [MenuItem("Assets/Force Unlock File", true, PRIORITY)]
+        private static bool ValidateForceUnlockFile()
+        {
+
+            return Selection.activeObject && File.Exists(GetSelectedAbsolutePath()) &&
+                   GitStatus.lockedFiles.Contains(GetSelectedRelativePath());
+
+        }
+
+        [MenuItem("Git/Force Unlock File", false, PRIORITY)]
+        [MenuItem("Assets/Force Unlock File", false, PRIORITY)]
+        private static async void ForceUnlockFile()
+        {
+
+            if (EditorUtility.DisplayDialog(
+                "Force unlock file",
+                $"Are you sure you want to force unlock {Selection.activeObject.name}?",
+                "Yes",
+                "Cancel"))
+            {
+
+                await Git.ForceUnlockFile(GetSelectedAbsolutePath());
+
+            }
 
         }