Merge branch 'release/v8.14'

Author: love-linger

VERSION

@@ -1 +1 @@
-8.13
+8.14

build/build.linux.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec /opt/sourcegit/sourcegit
+exec /opt/sourcegit/sourcegit $1

build/resources/_common/usr/bin/sourcegit

@@ -36,13 +36,33 @@ public static bool SetUpstream(string repo, string name, string upstream)
             return cmd.Exec();
         }
 
-        public static bool Delete(string repo, string name)
+        public static bool DeleteLocal(string repo, string name)
         {
             var cmd = new Command();
             cmd.WorkingDirectory = repo;
             cmd.Context = repo;
             cmd.Args = $"branch -D {name}";
             return cmd.Exec();
         }
+
+        public static bool DeleteRemote(string repo, string remote, string name)
+        {
+            var cmd = new Command();
+            cmd.WorkingDirectory = repo;
+            cmd.Context = repo;
+
+            var sshKey = new Config(repo).Get($"remote.{remote}.sshkey");
+            if (!string.IsNullOrEmpty(sshKey))
+            {
+                cmd.Args = $"-c core.sshCommand=\"ssh -i '{sshKey}'\" ";
+            }
+            else
+            {
+                cmd.Args = "-c credential.helper=manager ";
+            }
+
+            cmd.Args += $"push {remote} --delete {name}";
+            return cmd.Exec();
+        }
     }
 }

src/Commands/Branch.cs

@@ -62,6 +62,14 @@ public bool FileWithRevision(string file, string revision)
             return Exec();
         }
 
+        public bool Commit(string commitId, Action<string> onProgress)
+        {
+            Args = $"checkout --detach --progress {commitId}";
+            TraitErrorAsOutput = true;
+            _outputHandler = onProgress;
+            return Exec();
+        }
+
         public bool Files(List<string> files)
         {
             StringBuilder builder = new StringBuilder();

src/Commands/Checkout.cs

@@ -12,11 +12,11 @@ public partial class Diff : Command
         private const string PREFIX_LFS_DEL = "-version https://git-lfs.github.com/spec/";
         private const string PREFIX_LFS_MODIFY = " version https://git-lfs.github.com/spec/";
 
-        public Diff(string repo, Models.DiffOption opt)
+        public Diff(string repo, Models.DiffOption opt, int unified)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"diff --ignore-cr-at-eol --unified=4 {opt}";
+            Args = $"diff --ignore-cr-at-eol --unified={unified} {opt}";
         }
 
         public Models.DiffResult Result()

src/Commands/Diff.cs

@@ -33,31 +33,6 @@ public Push(string repo, string local, string remote, string remoteBranch, bool
             Args += $"{remote} {local}:{remoteBranch}";
         }
 
-        /// <summary>
-        ///     Only used to delete a remote branch!!!!!!
-        /// </summary>
-        /// <param name="repo"></param>
-        /// <param name="remote"></param>
-        /// <param name="branch"></param>
-        public Push(string repo, string remote, string branch)
-        {
-            WorkingDirectory = repo;
-            Context = repo;
-            TraitErrorAsOutput = true;
-
-            var sshKey = new Config(repo).Get($"remote.{remote}.sshkey");
-            if (!string.IsNullOrEmpty(sshKey))
-            {
-                Args = $"-c core.sshCommand=\"ssh -i '{sshKey}'\" ";
-            }
-            else
-            {
-                Args = "-c credential.helper=manager ";
-            }
-
-            Args += $"push {remote} --delete {branch}";
-        }
-
         public Push(string repo, string remote, string tag, bool isDelete)
         {
             WorkingDirectory = repo;

src/Commands/Push.cs

@@ -8,6 +8,7 @@ public partial class QueryBranches : Command
     {
         private const string PREFIX_LOCAL = "refs/heads/";
         private const string PREFIX_REMOTE = "refs/remotes/";
+        private const string PREFIX_DETACHED = "(HEAD detached at";
 
         [GeneratedRegex(@"^(\d+)\s(\d+)$")]
         private static partial Regex REG_AHEAD_BEHIND();
@@ -51,7 +52,12 @@ protected override void OnReadline(string line)
             var refName = parts[0];
             if (refName.EndsWith("/HEAD", StringComparison.Ordinal))
                 return;
-
+            
+            if (refName.StartsWith(PREFIX_DETACHED, StringComparison.Ordinal))
+            {
+                branch.IsHead = true;
+            }
+            
             if (refName.StartsWith(PREFIX_LOCAL, StringComparison.Ordinal))
             {
                 branch.Name = refName.Substring(PREFIX_LOCAL.Length);

src/Commands/QueryBranches.cs

@@ -146,6 +146,15 @@ private bool ParseDecorators(List<Models.Decorator> decorators, string data)
                         Name = d.Substring(19).Trim(),
                     });
                 }
+                else if (d.Equals("HEAD"))
+                {
+                    isHeadOfCurrent = true;
+                    decorators.Add(new Models.Decorator()
+                    {
+                        Type = Models.DecoratorType.CurrentCommitHead,
+                        Name = d.Trim(),
+                    });
+                }
                 else if (d.StartsWith("refs/heads/", StringComparison.Ordinal))
                 {
                     decorators.Add(new Models.Decorator()

src/Commands/QueryCommits.cs

@@ -5,12 +5,22 @@ namespace SourceGit.Commands
 {
     public static class Tag
     {
-        public static bool Add(string repo, string name, string basedOn, string message)
+        public static bool Add(string repo, string name, string basedOn)
         {
             var cmd = new Command();
             cmd.WorkingDirectory = repo;
             cmd.Context = repo;
-            cmd.Args = $"tag -a {name} {basedOn} ";
+            cmd.Args = $"tag {name} {basedOn}";
+            return cmd.Exec();
+        }
+
+        public static bool Add(string repo, string name, string basedOn, string message, bool sign)
+        {
+            var param = sign ? "-s -a" : "-a";
+            var cmd = new Command();
+            cmd.WorkingDirectory = repo;
+            cmd.Context = repo;
+            cmd.Args = $"tag {param} {name} {basedOn} ";
 
             if (!string.IsNullOrEmpty(message))
             {