Refactor GetBlob

The name didn't really match what it does. Also, remove the Copy function to save a function call. This is part of the work required for git-tfs#144
sc68cal · May 15, 2012 · 01293b3 · 01293b3
1 parent f8e7b1f
commit 01293b3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/GitTfs/Core/Changes/Git/Add.cs b/GitTfs/Core/Changes/Git/Add.cs
@@ -16,7 +16,7 @@ public Add(IGitRepository repository, GitChangeInfo changeInfo)
         public void Apply(ITfsWorkspace workspace)
         {
             var workspaceFile = workspace.GetLocalPath(Path);
-            Repository.GetBlob(NewSha, workspaceFile);
+            Repository.CopyBlob(NewSha, workspaceFile);
             workspace.Add(Path);
         }
     }

diff --git a/GitTfs/Core/Changes/Git/Modify.cs b/GitTfs/Core/Changes/Git/Modify.cs
@@ -19,7 +19,7 @@ public void Apply(ITfsWorkspace workspace)
         {
             workspace.Edit(Path);
             var workspaceFile = workspace.GetLocalPath(Path);
-            _repository.GetBlob(NewSha, workspaceFile);
+            _repository.CopyBlob(NewSha, workspaceFile);
         }
     }
 }
diff --git a/GitTfs/Core/Changes/Git/RenameEdit.cs b/GitTfs/Core/Changes/Git/RenameEdit.cs
@@ -22,7 +22,7 @@ public void Apply(ITfsWorkspace workspace)
             workspace.Edit(Path);
             workspace.Rename(Path, PathTo, Score);
             var workspaceFile = workspace.GetLocalPath(PathTo);
-            _repository.GetBlob(NewSha, workspaceFile);
+            _repository.CopyBlob(NewSha, workspaceFile);
         }
     }
 }
diff --git a/GitTfs/Core/GitRepository.cs b/GitTfs/Core/GitRepository.cs
@@ -404,23 +404,18 @@ public bool WorkingCopyHasUnstagedOrUncommitedChanges
             }
         }
 
-        public void GetBlob(string sha, string outputFile)
+        public void CopyBlob(string sha, string outputFile)
         {
             using(LibGit2Sharp.Repository repo = new LibGit2Sharp.Repository(GitDir))
             {
                 Blob blob;
                 if ((blob = repo.Lookup<Blob>(sha)) != null)
                     using (Stream stream = blob.ContentStream)
-                        Copy(stream, outputFile);
+                    using (var destination = File.Create(outputFile))
+                            stream.CopyTo(destination);
             }
         }
 
-        private void Copy(Stream gitstream, string file)
-        {
-            using (var destination = File.Create(file))
-                gitstream.CopyTo(destination);
-        }
-
         public string HashAndInsertObject(string filename)
         {
             using (Repository repo = new Repository(GitDir))

diff --git a/GitTfs/Core/IGitRepository.cs b/GitTfs/Core/IGitRepository.cs
@@ -20,7 +20,7 @@ public interface IGitRepository : IGitHelpers
         IEnumerable<IGitChangedFile> GetChangedFiles(string from, string to);
         string GetChangeSummary(string from, string to);
         bool WorkingCopyHasUnstagedOrUncommitedChanges { get; }
-        void GetBlob(string sha, string outputFile);
+        void CopyBlob(string sha, string outputFile);
         GitCommit GetCommit(string commitish);
         Dictionary<string, GitObject> GetObjects();
         string GetCommitMessage(string head, string parentCommitish);