PathUtil.GetDirectoryName did not accept root dirs

nick-bulleid · Sep 16, 2019 · 22dafca · 22dafca
1 parent f944048
commit 22dafca
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 53 deletions.
diff --git a/GitCommands/Git/GitModule.cs b/GitCommands/Git/GitModule.cs
@@ -477,7 +477,7 @@ public static string TryFindGitWorkingDir([CanBeNull] string startDir)
                     return dir.EnsureTrailingPathSeparator();
                 }
 
-                dir = PathUtil.GetDirectoryName(dir);
+                dir = Path.GetDirectoryName(dir);
             }
 
             return null;
@@ -1222,8 +1222,8 @@ public string GetCurrentSubmoduleLocalPath()
 
             Debug.Assert(WorkingDir.StartsWith(SuperprojectModule.WorkingDir), "Submodule working dir should start with super-project's working dir");
 
-            return PathUtil.GetDirectoryName(
-                WorkingDir.Substring(SuperprojectModule.WorkingDir.Length).ToPosixPath());
+            return Path.GetDirectoryName(
+                WorkingDir.Substring(SuperprojectModule.WorkingDir.Length)).ToPosixPath();
         }
 
         public string GetSubmoduleFullPath(string localPath)

diff --git a/GitCommands/PathUtil.cs b/GitCommands/PathUtil.cs
@@ -100,29 +100,6 @@ public static string GetFileName([NotNull] string fileName)
             return fileName;
         }
 
-        [NotNull]
-        public static string GetDirectoryName([NotNull] string fileName)
-        {
-            var pathSeparators = new[] { NativeDirectorySeparatorChar, PosixDirectorySeparatorChar };
-            var pos = fileName.LastIndexOfAny(pathSeparators);
-            if (pos != -1)
-            {
-                if (pos == 0 && fileName[0] == PosixDirectorySeparatorChar)
-                {
-                    return fileName.Length == 1 ? "" : PosixDirectorySeparatorChar.ToString();
-                }
-
-                fileName = fileName.Substring(0, pos);
-            }
-
-            if (fileName.Length == 2 && char.IsLetter(fileName[0]) && fileName[1] == Path.VolumeSeparatorChar)
-            {
-                return "";
-            }
-
-            return fileName;
-        }
-
         [NotNull]
         public static string NormalizePath([NotNull] this string path)
         {

diff --git a/GitCommands/Submodules/SubmoduleStatusProvider.cs b/GitCommands/Submodules/SubmoduleStatusProvider.cs
@@ -226,7 +226,7 @@ private void SetSuperProjectSubmoduleInfo(GitModule superprojectModule, Submodul
             else
             {
                 var localPath = superprojectModule.WorkingDir.Substring(topProject.WorkingDir.Length);
-                name = PathUtil.GetDirectoryName(localPath.ToPosixPath());
+                name = Path.GetDirectoryName(localPath).ToPosixPath();
              }
 
             string path = superprojectModule.WorkingDir;
@@ -260,7 +260,7 @@ private void SetSubmoduleData(GitModule currentModule, SubmoduleInfoResult resul
             if (submodules.Any())
             {
                 string localPath = result.Module.WorkingDir.Substring(topProject.WorkingDir.Length);
-                localPath = PathUtil.GetDirectoryName(localPath.ToPosixPath());
+                localPath = Path.GetDirectoryName(localPath).ToPosixPath();
 
                 foreach (var submodule in submodules)
                 {

diff --git a/GitUI/BranchTreePanel/RepoObjectsTree.Nodes.Submodules.cs b/GitUI/BranchTreePanel/RepoObjectsTree.Nodes.Submodules.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -317,7 +318,7 @@ private void CreateSubmoduleNodes(IEnumerable<SubmoduleInfo> submodules, GitModu
                 foreach (var submoduleInfo in submodules)
                 {
                     string superPath = GetSubmoduleSuperPath(submoduleInfo.Path);
-                    string localPath = PathUtil.GetDirectoryName(submoduleInfo.Path.Substring(superPath.Length).ToPosixPath());
+                    string localPath = Path.GetDirectoryName(submoduleInfo.Path.Substring(superPath.Length)).ToPosixPath();
 
                     var isCurrent = submoduleInfo.Bold;
                     nodes.Add(new SubmoduleNode(this, submoduleInfo, isCurrent, localPath, superPath));

diff --git a/GitUI/CommandsDialogs/FormResolveConflicts.cs b/GitUI/CommandsDialogs/FormResolveConflicts.cs
@@ -1097,7 +1097,7 @@ private void SaveAs(string side)
                 using (var fileDialog = new SaveFileDialog
                 {
                     FileName = fileName,
-                    InitialDirectory = _fullPathResolver.Resolve(PathUtil.GetDirectoryName(conflictData.Filename)),
+                    InitialDirectory = _fullPathResolver.Resolve(Path.GetDirectoryName(conflictData.Filename)),
                     AddExtension = true
                 })
                 {

diff --git a/UnitTests/GitCommandsTests/Helpers/PathUtilTest.cs b/UnitTests/GitCommandsTests/Helpers/PathUtilTest.cs
@@ -130,29 +130,6 @@ public void GetFileNameTest()
             }
         }
 
-        [Test]
-        public void GetDirectoryNameTest()
-        {
-            if (Path.DirectorySeparatorChar == '\\')
-            {
-                Assert.AreEqual(PathUtil.GetDirectoryName("\\\\my-pc\\Work\\GitExtensions\\"), "\\\\my-pc\\Work\\GitExtensions");
-                Assert.AreEqual(PathUtil.GetDirectoryName("C:\\Work\\GitExtensions\\"), "C:\\Work\\GitExtensions");
-                Assert.AreEqual(PathUtil.GetDirectoryName("C:\\Work\\GitExtensions"), "C:\\Work");
-                Assert.AreEqual(PathUtil.GetDirectoryName("C:\\Work\\"), "C:\\Work");
-                Assert.AreEqual(PathUtil.GetDirectoryName("C:\\Work"), "");
-                Assert.AreEqual(PathUtil.GetDirectoryName("C:\\"), "");
-                Assert.AreEqual(PathUtil.GetDirectoryName("C:"), "");
-                Assert.AreEqual(PathUtil.GetDirectoryName(""), "");
-            }
-
-            Assert.AreEqual(PathUtil.GetDirectoryName("//my-pc/Work/GitExtensions/"), "//my-pc/Work/GitExtensions");
-            Assert.AreEqual(PathUtil.GetDirectoryName("/Work/GitExtensions/"), "/Work/GitExtensions");
-            Assert.AreEqual(PathUtil.GetDirectoryName("/Work/GitExtensions"), "/Work");
-            Assert.AreEqual(PathUtil.GetDirectoryName("/Work/"), "/Work");
-            Assert.AreEqual(PathUtil.GetDirectoryName("/"), "");
-            Assert.AreEqual("/", PathUtil.GetDirectoryName("/Work"), "/Work");
-        }
-
         [Test]
         public void GetRepositoryNameTest()
         {