Simplify Index.Unstage() implementation

Author: nulltoken

LibGit2Sharp/Diff.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
 using LibGit2Sharp.Core;
 using LibGit2Sharp.Core.Handles;
 
@@ -31,11 +33,11 @@ private GitDiffOptions BuildOptions(DiffOptions diffOptions, IEnumerable<string>
                 return options;
             }
 
-            options.PathSpec = GitStrArrayIn.BuildFrom(ToFilePaths(paths));
+            options.PathSpec = GitStrArrayIn.BuildFrom(ToFilePaths(repo, paths));
             return options;
         }
 
-        private static FilePath[] ToFilePaths(IEnumerable<string> paths)
+        private static FilePath[] ToFilePaths(Repository repo, IEnumerable<string> paths)
         {
             var filePaths = new List<FilePath>();
 
@@ -46,7 +48,7 @@ private static FilePath[] ToFilePaths(IEnumerable<string> paths)
                     throw new ArgumentException("At least one provided path is either null or empty.", "paths");
                 }
 
-                filePaths.Add(path);
+                filePaths.Add(BuildRelativePathFrom(repo, path));
             }
 
             if (filePaths.Count == 0)
@@ -57,6 +59,26 @@ private static FilePath[] ToFilePaths(IEnumerable<string> paths)
             return filePaths.ToArray();
         }
 
+        private static string BuildRelativePathFrom(Repository repo, string path)
+        {
+            //TODO: To be removed when libgit2 natively implements this
+            if (!Path.IsPathRooted(path))
+            {
+                return path;
+            }
+
+            string normalizedPath = Path.GetFullPath(path);
+
+            if (!normalizedPath.StartsWith(repo.Info.WorkingDirectory, StringComparison.Ordinal))
+            {
+                throw new ArgumentException(string.Format(CultureInfo.InvariantCulture,
+                                                          "Unable to process file '{0}'. This absolute filepath escapes out of the working directory of the repository ('{1}').",
+                                                          normalizedPath, repo.Info.WorkingDirectory));
+            }
+
+            return normalizedPath.Substring(repo.Info.WorkingDirectory.Length);
+        }
+
         /// <summary>
         ///   Needed for mocking purposes.
         /// </summary>

LibGit2Sharp/Index.cs

@@ -213,33 +213,15 @@ public virtual void Unstage(IEnumerable<string> paths)
         {
             Ensure.ArgumentNotNull(paths, "paths");
 
-            IEnumerable<KeyValuePair<string, FileStatus>> batch = PrepareBatch(paths);
-
-            foreach (KeyValuePair<string, FileStatus> kvp in batch)
+            if (repo.Info.IsHeadOrphaned)
             {
-                if (Directory.Exists(kvp.Key))
-                {
-                    throw new NotImplementedException();
-                }
-            }
+                TreeChanges changes = repo.Diff.Compare(null, DiffTargets.Index, paths);
 
-            var commit = repo.Lookup("HEAD",
-                                        GitObjectType.Any,
-                                        LookUpOptions.DereferenceResultToCommit) as Commit;
-
-            if (null != commit)
-            {
-                repo.Reset("HEAD", paths);
+                Reset(changes);
             }
             else
             {
-                // HEAD doesn't exist, so all these staged paths must be Added.
-                foreach (String path in paths)
-                {
-                    RemoveFromIndex(path);
-                }
-
-                UpdatePhysicalIndex();
+                repo.Reset("HEAD", paths);
             }
         }