fix relative path for saving file content and checkout file

BasicSccProvider.Tests/BasicSccProvider.Tests.csproj

@@ -84,7 +84,6 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GetFileStatusTest.cs" />
     <Compile Include="GitFileStatusTrackerTest.cs" />
     <Compile Include="PackageTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

BasicSccProvider.Tests/GitFileStatusTrackerTest.cs

@@ -20,8 +20,8 @@ public class GitFileStatusTrackerTest
         public GitFileStatusTrackerTest()
         {
             tempFolder = Environment.CurrentDirectory + "\\" + Guid.NewGuid().ToString();
-            tempFile = Path.Combine(tempFolder, "test");
-            lines = new string[] { "First line", "Second line", "Third line" };
+            tempFile = Path.Combine(tempFolder, "t e s t");
+            lines = new string[] { "First line", "中文 2", "čtestč" };
         }
 
         private TestContext testContextInstance;
@@ -276,7 +276,11 @@ public void FileNameCaseTest()
             tempFile = tempFile.Replace("test", "TEST");
             File.WriteAllText(tempFile, "changed text");
             tracker.Refresh();
-            Assert.AreEqual(GitFileStatus.Modified, tracker.GetFileStatus(tempFile));
+            //This test fails all cases because status check uses ngit, never git.exe
+            //Assert.AreEqual(GitFileStatus.Modified, tracker.GetFileStatus(tempFile));
+
+            var file = tracker.ChangedFiles.First();
+            Assert.AreEqual(GitFileStatus.Modified, file.Status);
         }
 
         [TestMethod]
@@ -298,6 +302,42 @@ public void GetBranchTest()
             tracker.CheckOutBranch("dev", true);
             Assert.AreEqual("dev", tracker.CurrentBranch);
         }
+
+        [TestMethod]
+        public void SaveFileFromRepositoryTest()
+        {
+            GitFileStatusTracker.Init(tempFolder);
+            File.WriteAllLines(tempFile, lines);
+
+            GitFileStatusTracker tracker = new GitFileStatusTracker(tempFolder);
+            tracker.StageFile(tempFile);
+            tracker.Commit("test");
+
+            tracker.SaveFileFromRepository(tempFile, tempFile + ".bk");
+            var newlines = File.ReadAllLines(tempFile + ".bk");
+            Assert.AreEqual(lines[0], newlines[0]);
+            Assert.AreEqual(lines[1], newlines[1]);
+            Assert.AreEqual(lines[2], newlines[2]);
+        }
+
+        [TestMethod]
+        public void CheckOutFileTest()
+        {
+            GitFileStatusTracker.Init(tempFolder);
+            File.WriteAllLines(tempFile, lines);
+
+            GitFileStatusTracker tracker = new GitFileStatusTracker(tempFolder);
+            tracker.StageFile(tempFile);
+            tracker.Commit("test");
+
+            File.WriteAllText(tempFile, "changed text");
+            tracker.CheckOutFile(tempFile);
+            var newlines = File.ReadAllLines(tempFile);
+            Assert.AreEqual(lines[0], newlines[0]);
+            Assert.AreEqual(lines[1], newlines[1]);
+            Assert.AreEqual(lines[2], newlines[2]);
+        }
+
     }
 
     [TestClass()]
@@ -319,7 +359,7 @@ public GitFileStatusTrackerTest_WithSubFolder()
             GitBash.GitExePath = null;
             tempFolder = Environment.CurrentDirectory + "\\" + Guid.NewGuid().ToString();
             Directory.CreateDirectory(Path.Combine(tempFolder, "folder 1"));
-            tempFile = Path.Combine(tempFolder, "folder 1\\test");
+            tempFile = Path.Combine(tempFolder, "folder 1\\t e s t");
         }
     }
 
@@ -342,7 +382,7 @@ public GitFileStatusTrackerTest_WithSubFolder_UsingGitBash()
             GitBash.GitExePath = @"C:\Program Files (x86)\Git\bin\sh.exe";
             tempFolder = Environment.CurrentDirectory + "\\" + Guid.NewGuid().ToString();
             Directory.CreateDirectory(Path.Combine(tempFolder, "folder 2"));
-            tempFile = Path.Combine(tempFolder, "folder 2\\test");
+            tempFile = Path.Combine(tempFolder, "folder 2\\t e s t");
         }
     }
 }

GitFileStatusTracker.cs

@@ -874,7 +874,7 @@ public IEnumerable<GitFile> ChangedFiles
         private const int INDEX = 1;
         private const int WORKDIR = 2;
 
-        public IList<GitFile> GetChangedFiles()
+        internal IList<GitFile> GetChangedFiles()
         {
             if (GitBash.Exists)
             {
@@ -1046,15 +1046,14 @@ public IList<GitFile> ParseGitStatus(string statusString)
 
         #endregion
 
-        internal void SaveFileFromRepository(string fileName, string tempFile)
+        public void SaveFileFromRepository(string fileName, string tempFile)
         {
             if (!this.HasGitRepository || this.head == null) return;
 
-            string fileNameRel = GetRelativeFileName(fileName);
-
             if (GitBash.Exists)
             {
-                GitBash.RunCmd(string.Format("show HEAD:{0} > \"{1}\"", fileNameRel, tempFile), this.GitWorkingDirectory);
+                string fileNameRel = GetRelativeFileNameForGit(fileName);
+                GitBash.RunCmd(string.Format("show \"HEAD:{0}\" > \"{1}\"", fileNameRel, tempFile), this.GitWorkingDirectory);
             }
             else
             {
@@ -1066,15 +1065,15 @@ internal void SaveFileFromRepository(string fileName, string tempFile)
             }
         }
 
-        internal void CheckOutFile(string fileName)
+        public void CheckOutFile(string fileName)
         {
             if (!this.HasGitRepository || this.head == null) return;
 
             string fileNameRel = GetRelativeFileName(fileName);
 
             if (GitBash.Exists)
             {
-                GitBash.Run("checkout -- " + fileNameRel, this.GitWorkingDirectory);
+                GitBash.Run(string.Format("checkout -- \"{0}\"", fileNameRel), this.GitWorkingDirectory);
             }
             else
             {