Use relativeOrGitPath when it doesn't matter

Author: jcansdale

src/GitHub.App/ViewModels/GitHubPane/PullRequestDirectoryNode.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using GitHub.Primitives;
 
 namespace GitHub.ViewModels.GitHubPane
 {
@@ -12,11 +13,11 @@ public class PullRequestDirectoryNode : IPullRequestDirectoryNode
         /// <summary>
         /// Initializes a new instance of the <see cref="PullRequestDirectoryNode"/> class.
         /// </summary>
-        /// <param name="relativePath">The path to the directory, relative to the repository.</param>
-        public PullRequestDirectoryNode(string relativePath)
+        /// <param name="relativeOrGitPath">The path to the directory, relative to the repository.</param>
+        public PullRequestDirectoryNode(string relativeOrGitPath)
         {
-            DirectoryName = System.IO.Path.GetFileName(relativePath);
-            RelativePath = relativePath.Replace("/", "\\");
+            DirectoryName = System.IO.Path.GetFileName(relativeOrGitPath);
+            RelativePath = Paths.ToRelativePath(relativeOrGitPath);
             Directories = new List<IPullRequestDirectoryNode>();
             Files = new List<IPullRequestFileNode>();
         }

src/GitHub.App/ViewModels/GitHubPane/PullRequestFileNode.cs

@@ -3,6 +3,7 @@
 using GitHub.App;
 using GitHub.Extensions;
 using GitHub.Models;
+using GitHub.Primitives;
 using ReactiveUI;
 
 namespace GitHub.ViewModels.GitHubPane
@@ -21,7 +22,7 @@ public class PullRequestFileNode : ReactiveObject, IPullRequestFileNode
         /// Initializes a new instance of the <see cref="PullRequestFileNode"/> class.
         /// </summary>
         /// <param name="repositoryPath">The absolute path to the repository.</param>
-        /// <param name="relativePath">The path to the file, relative to the repository.</param>
+        /// <param name="relativeOrGitPath">The path to the file, relative to the repository.</param>
         /// <param name="sha">The SHA of the file.</param>
         /// <param name="status">The way the file was changed.</param>
         /// <param name="statusDisplay">The string to display in the [message] box next to the filename.</param>
@@ -31,17 +32,17 @@ public class PullRequestFileNode : ReactiveObject, IPullRequestFileNode
         /// </param>
         public PullRequestFileNode(
             string repositoryPath,
-            string relativePath,
+            string relativeOrGitPath,
             string sha,
             PullRequestFileStatus status,
             string oldPath)
         {
             Guard.ArgumentNotEmptyString(repositoryPath, nameof(repositoryPath));
-            Guard.ArgumentNotEmptyString(relativePath, nameof(relativePath));
+            Guard.ArgumentNotEmptyString(relativeOrGitPath, nameof(relativeOrGitPath));
             Guard.ArgumentNotEmptyString(sha, nameof(sha));
 
-            FileName = Path.GetFileName(relativePath);
-            RelativePath = relativePath.Replace("/", "\\");
+            FileName = Path.GetFileName(relativeOrGitPath);
+            RelativePath = Paths.ToRelativePath(relativeOrGitPath);
             Sha = sha;
             Status = status;
             OldPath = oldPath;
@@ -54,7 +55,7 @@ public PullRequestFileNode(
             {
                 if (oldPath != null)
                 {
-                    StatusDisplay = Path.GetDirectoryName(oldPath) == Path.GetDirectoryName(relativePath) ?
+                    StatusDisplay = Path.GetDirectoryName(oldPath) == Path.GetDirectoryName(relativeOrGitPath) ?
                             Path.GetFileName(oldPath) : oldPath;
                 }
                 else