Now using the visual studio version of libgit2sharp

Updated the git wrapper to use repository only when needed, not keeping instance open
Bumped version to 1.0.0.8

Author: glennawatson

GitSquash.VisualStudio.Extension/GitSquash.VisualStudio.Extension/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="GitSquash.VisualStudio.Extension.Glenn Watson.9d974827-f458-4741-b96c-f6926984b1d8" Version="1.0.0.7" Language="en-US" Publisher="Glenn Watson" />
+    <Identity Id="GitSquash.VisualStudio.Extension.Glenn Watson.9d974827-f458-4741-b96c-f6926984b1d8" Version="1.0.0.8" Language="en-US" Publisher="Glenn Watson" />
     <DisplayName>Git Squash</DisplayName>
     <Description xml:space="preserve">Allows rebasing with squash in Visual Studio Team Explorer</Description>
     <MoreInfo>https://github.com/glennawatson/GitSquash-VIsualStudio</MoreInfo>

GitSquash.VisualStudio.Extension/GitSquash.VisualStudio/GitSquash.VisualStudio.csproj

@@ -45,9 +45,9 @@
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LibGit2Sharp">
-      <HintPath>..\..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="LibGit2Sharp, Version=0.22.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>.\LibGit2Sharp.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.TeamFoundation.Common, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -84,6 +84,11 @@
     <Compile Include="IGitSquashWrapper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="GitSquashWrapper.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="Key.snk" />
@@ -96,6 +101,12 @@
   <ItemGroup>
     <Content Include="FodyWeavers.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

GitSquash.VisualStudio.Extension/GitSquash.VisualStudio/GitSquashWrapper.cs

@@ -1,3 +1,5 @@
+using GitSquash.VisualStudio.Properties;
+
 namespace GitSquash.VisualStudio
 {
     using System;
@@ -29,10 +31,6 @@ public class GitSquashWrapper : IGitSquashWrapper
 
         private readonly string repoDirectory;
 
-        private readonly Repository repository;
-
-        private bool isDisposed;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="GitSquashWrapper" /> class.
         /// </summary>
@@ -42,15 +40,6 @@ public GitSquashWrapper(string repoDirectory, IGitSquashOutputLogger logger)
         {
             this.repoDirectory = repoDirectory;
             outputLogger = logger;
-
-            this.repository = new Repository(repoDirectory);
-        }
-
-        /// <inheritdoc />
-        public void Dispose()
-        {
-            this.Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         /// <inheritdoc />
@@ -62,10 +51,12 @@ public string GetCommitMessages(GitCommit startCommit)
             }
 
             var sb = new StringBuilder();
-
-            foreach (Commit commit in this.repository.Head.Commits.TakeWhile(x => x.Sha != startCommit.Sha))
+            using (var repository = GetRepository())
             {
-                sb.AppendLine(commit.Message);
+                foreach (Commit commit in repository.Head.Commits.TakeWhile(x => x.Sha != startCommit.Sha))
+                {
+                    sb.AppendLine(commit.Message);
+                }
             }
 
             return sb.ToString();
@@ -74,31 +65,40 @@ public string GetCommitMessages(GitCommit startCommit)
         /// <inheritdoc />
         public GitBranch GetCurrentBranch()
         {
-            return new GitBranch(this.repository.Head.FriendlyName);
+            using (var repository = GetRepository())
+            {
+                return new GitBranch(repository.Head.FriendlyName);
+            }
         }
 
         /// <inheritdoc />
         public async Task<GitCommandResponse> PushForce(CancellationToken token)
         {
-            if (this.repository.Head.IsTracking == false)
+            using (var repository = GetRepository())
             {
-                return new GitCommandResponse(false, "The branch has not been pushed before.");
-            }
+                if (repository.Head.IsTracking == false)
+                {
+                    return new GitCommandResponse(false, "The branch has not been pushed before.");
+                }
 
-            return await this.RunGit("push -f", token);
+                return await this.RunGit("push -f", token);
+            }
         }
 
         /// <inheritdoc />
         public IEnumerable<GitCommit> GetCommitsForBranch(GitBranch branch, int number = 25)
         {
-            Branch internalBranch = this.repository.Branches.FirstOrDefault(x => x.FriendlyName == branch.FriendlyName);
-
-            if (internalBranch == null)
+            using (var repository = GetRepository())
             {
-                return Enumerable.Empty<GitCommit>();
-            }
+                Branch internalBranch = repository.Branches.FirstOrDefault(x => x.FriendlyName == branch.FriendlyName);
+
+                if (internalBranch == null)
+                {
+                    return Enumerable.Empty<GitCommit>();
+                }
 
-            return internalBranch.Commits.Take(number).Select(x => new GitCommit(x.Sha, x.MessageShort));
+                return internalBranch.Commits.Take(number).Select(x => new GitCommit(x.Sha, x.MessageShort));
+            }
         }
 
         /// <inheritdoc />
@@ -112,21 +112,30 @@ public bool IsRebaseHappening()
         /// <inheritdoc />
         public bool IsWorkingDirectoryDirty()
         {
-            return this.repository.RetrieveStatus().IsDirty;
+            using (var repository = GetRepository())
+            {
+                return repository.RetrieveStatus().IsDirty;
+            }
         }
 
         /// <inheritdoc />
         public bool HasConflicts()
         {
-            return this.repository.Index.IsFullyMerged == false;
+            using (var repository = GetRepository())
+            {
+                return repository.Index.IsFullyMerged == false;
+            }
         }
 
         /// <inheritdoc />
         public async Task<GitCommandResponse> Squash(CancellationToken token, string newCommitMessage, GitCommit startCommit)
         {
-            if (this.repository.RetrieveStatus().IsDirty)
+            using (var repository = GetRepository())
             {
-                return new GitCommandResponse(false, "Cannot rebase: You have unstaged changes.");
+                if (repository.RetrieveStatus().IsDirty)
+                {
+                    return new GitCommandResponse(false, "Cannot rebase: You have unstaged changes.");
+                }
             }
 
             string rewriterName;
@@ -155,9 +164,12 @@ public Task<GitCommandResponse> FetchOrigin(CancellationToken token)
         /// <inheritdoc />
         public async Task<GitCommandResponse> Rebase(CancellationToken token, GitBranch parentBranch)
         {
-            if (this.repository.RetrieveStatus().IsDirty)
+            using (var repository = GetRepository())
             {
-                return new GitCommandResponse(false, "Cannot rebase: You have unstaged changes.");
+                if (repository.RetrieveStatus().IsDirty)
+                {
+                    return new GitCommandResponse(false, "Cannot rebase: You have unstaged changes.");
+                }
             }
 
             GitCommandResponse response = await this.FetchOrigin(token);
@@ -192,26 +204,10 @@ public async Task<GitCommandResponse> Continue(CancellationToken token)
         /// <inheritdoc />
         public IList<GitBranch> GetBranches()
         {
-            return this.repository.Branches.OrderBy(x => x.FriendlyName).Select(x => new GitBranch(x.FriendlyName)).ToList();
-        }
-
-        /// <summary>
-        /// Disposes of any objects contained in the class.
-        /// </summary>
-        /// <param name="isDisposing">If the ,method is being called by the dispose method.</param>
-        protected virtual void Dispose(bool isDisposing)
-        {
-            if (this.isDisposed)
+            using (var repository = GetRepository())
             {
-                return;
+                return repository.Branches.OrderBy(x => x.FriendlyName).Select(x => new GitBranch(x.FriendlyName)).ToList();
             }
-
-            if (isDisposing)
-            {
-                this.repository.Dispose();
-            }
-
-            this.isDisposed = true;
         }
 
         private static Process CreateGitProcess(string arguments, string repoDirectory)
@@ -228,7 +224,7 @@ private static Task<int> RunProcessAsync(Process process, CancellationToken toke
             token.Register(() =>
             {
                 process.Kill();
-                outputLogger.WriteLine("Killing GIT process.");
+                outputLogger.WriteLine(Resources.KillingProcess);
             });
 
             process.Exited += (s, ea) => tcs.SetResult(process.ExitCode);
@@ -247,6 +243,11 @@ private static Task<int> RunProcessAsync(Process process, CancellationToken toke
             return tcs.Task;
         }
 
+        private Repository GetRepository()
+        {
+            return new Repository(repoDirectory);
+        }
+
         private bool GetWritersName(out string rebaseWriter, out string commentWriter)
         {
             rebaseWriter = null;
@@ -339,7 +340,7 @@ private void OnErrorReceived(object sender, DataReceivedEventArgs dataReceivedEv
 
             error = new StringBuilder();
             error.Append(dataReceivedEventArgs.Data);
-            outputLogger.WriteLine($"Error: {dataReceivedEventArgs.Data}");
+            outputLogger.WriteLine(string.Format(Resources.ErrorGit, dataReceivedEventArgs.Data));
         }
     }
 }

GitSquash.VisualStudio.Extension/GitSquash.VisualStudio/IGitSquashWrapper.cs

@@ -8,7 +8,7 @@
     /// <summary>
     /// A wrapper around git that will provide the GIT squash actions.
     /// </summary>
-    public interface IGitSquashWrapper : IDisposable
+    public interface IGitSquashWrapper
     {
         /// <summary>
         /// Determines if there are any conflicts.