Merge pull request #1221 from libgit2/ntk/xml_doc

nulltoken · nulltoken · commit 28f1bbc10f4f · 2015-11-06T07:59:43.000+01:00
Fix compilation warning
diff --git a/LibGit2Sharp.Tests/MergeFixture.cs b/LibGit2Sharp.Tests/MergeFixture.cs
@@ -361,7 +361,7 @@ public void MergeReportsCheckoutProgress()
 OnCheckoutProgress = (path, completed, total) => wasCalled = true,
 };
 
- MergeResult result = repo.Merge(commitToMerge, Constants.Signature, options);
+ repo.Merge(commitToMerge, Constants.Signature, options);
 
 Assert.True(wasCalled);
 }
@@ -384,7 +384,7 @@ public void MergeReportsCheckoutNotifications()
 CheckoutNotifyFlags = CheckoutNotifyFlags.Updated,
 };
 
- MergeResult result = repo.Merge(commitToMerge, Constants.Signature, options);
+ repo.Merge(commitToMerge, Constants.Signature, options);
 
 Assert.True(wasCalled);
 Assert.Equal(CheckoutNotifyFlags.Updated, actualNotifyFlags);
@@ -406,7 +406,7 @@ public void FastForwardMergeReportsCheckoutProgress()
 OnCheckoutProgress = (path, completed, total) => wasCalled = true,
 };
 
- MergeResult result = repo.Merge(commitToMerge, Constants.Signature, options);
+ repo.Merge(commitToMerge, Constants.Signature, options);
 
 Assert.True(wasCalled);
 }
@@ -429,7 +429,7 @@ public void FastForwardMergeReportsCheckoutNotifications()
 CheckoutNotifyFlags = CheckoutNotifyFlags.Updated,
 };
 
- MergeResult result = repo.Merge(commitToMerge, Constants.Signature, options);
+ repo.Merge(commitToMerge, Constants.Signature, options);
 
 Assert.True(wasCalled);
 Assert.Equal(CheckoutNotifyFlags.Updated, actualNotifyFlags);
@@ -665,7 +665,6 @@ public void MergeCanSpecifyMergeFileFavorOption(MergeFileFavor fileFavorFlag)
 Branch branch = repo.Branches[conflictBranchName];
 Assert.NotNull(branch);
 
- var status = repo.RetrieveStatus();
 MergeOptions mergeOptions = new MergeOptions()
{
 MergeFileFavor = fileFavorFlag,
diff --git a/LibGit2Sharp.Tests/NetworkFixture.cs b/LibGit2Sharp.Tests/NetworkFixture.cs
@@ -189,7 +189,7 @@ public void CanPullIntoEmptyRepo()
 using (var repo = new Repository(repoPath))
{
 // Set up remote
- Remote remote = repo.Network.Remotes.Add(remoteName, url);
+ repo.Network.Remotes.Add(remoteName, url);
 
 // Set up tracking information
 repo.Branches.Update(repo.Head,
diff --git a/LibGit2Sharp.Tests/PackBuilderFixture.cs b/LibGit2Sharp.Tests/PackBuilderFixture.cs
@@ -103,23 +103,13 @@ internal void AddingObjectsTestDelegate(IRepository repo, PackBuilder builder)
 [Fact]
 public void ExceptionIfPathDoesNotExist()
{
- PackBuilderOptions pbo;
-
- Assert.Throws<DirectoryNotFoundException>(() =>
-{
- pbo = new PackBuilderOptions("aaa");
- });
+ Assert.Throws<DirectoryNotFoundException>(() => new PackBuilderOptions("aaa"));
 }
 
 [Fact]
 public void ExceptionIfPathEqualsNull()
{
- PackBuilderOptions pbo;
-
- Assert.Throws<ArgumentNullException>(() =>
-{
- pbo = new PackBuilderOptions(null);
- });
+ Assert.Throws<ArgumentNullException>(() => new PackBuilderOptions(null));
 }
 
 [Fact]
diff --git a/LibGit2Sharp.Tests/RevertFixture.cs b/LibGit2Sharp.Tests/RevertFixture.cs
@@ -67,8 +67,6 @@ public void CanRevertAndNotCommit()
 string path = SandboxRevertTestRepo();
 using (var repo = new Repository(path))
{
- string modifiedFileFullPath = Path.Combine(repo.Info.WorkingDirectory, revertedFile);
-
 // Checkout the revert branch.
 Branch branch = repo.Checkout(revertBranchName);
 Assert.NotNull(branch);
@@ -160,6 +158,7 @@ public void RevertWithFileConflictStrategyOption(CheckoutFileConflictStrategy co
 };
 
 RevertResult result = repo.Revert(repo.Head.Tip.Parents.First(), Constants.Signature, options);
+ Assert.Equal(RevertStatus.Conflicts, result.Status);
 
 // Verify there is a conflict.
 Assert.False(repo.Index.IsFullyMerged);
@@ -242,6 +241,7 @@ public void RevertReportsCheckoutNotification()
 repo.Revert(repo.Head.Tip, Constants.Signature, options);
 
 Assert.True(wasCalled);
+ Assert.Equal(CheckoutNotifyFlags.Updated, actualNotifyFlags);
 }
 }
 
diff --git a/LibGit2Sharp.Tests/SmartSubtransportFixture.cs b/LibGit2Sharp.Tests/SmartSubtransportFixture.cs
@@ -38,7 +38,7 @@ public void CustomSmartSubtransportTest(string scheme, string url)
 registration = GlobalSettings.RegisterSmartSubtransport<MockSmartSubtransport>(scheme);
 Assert.NotNull(registration);
 
- using (var repo = new Repository(scd.DirectoryPath))
+ using (var repo = new Repository(repoPath))
{
 Remote remote = repo.Network.Remotes.Add(remoteName, url);
 
diff --git a/LibGit2Sharp.Tests/StatusFixture.cs b/LibGit2Sharp.Tests/StatusFixture.cs
@@ -99,7 +99,7 @@ public void RetrievingTheStatusOfADirectoryThrows()
 var path = SandboxStandardTestRepoGitDir();
 using (var repo = new Repository(path))
{
- Assert.Throws<AmbiguousSpecificationException>(() =>{FileStatus status = repo.RetrieveStatus("1")});
+ Assert.Throws<AmbiguousSpecificationException>(() =>{repo.RetrieveStatus("1")});
 }
 }
 
diff --git a/LibGit2Sharp.Tests/TestHelpers/FileExportFilter.cs b/LibGit2Sharp.Tests/TestHelpers/FileExportFilter.cs
@@ -77,7 +77,6 @@ protected override void Smudge(string path, string root, Stream input, Stream ou
{
 SmudgeCalledCount++;
 
- string filename = Path.GetFileName(path);
 StringBuilder text = new StringBuilder();
 
 byte[] buffer = new byte[64 * 1024];
diff --git a/LibGit2Sharp/Filter.cs b/LibGit2Sharp/Filter.cs
@@ -52,7 +52,6 @@ protected Filter(string name, IEnumerable<FilterAttributeEntry> attributes)
 private readonly string name;
 private readonly IEnumerable<FilterAttributeEntry> attributes;
 private readonly GitFilter gitFilter;
- private readonly object @lock = new object();
 
 private GitWriteStream thisStream;
 private GitWriteStream nextStream;
diff --git a/LibGit2Sharp/IRepository.cs b/LibGit2Sharp/IRepository.cs
@@ -171,7 +171,7 @@ public interface IRepository : IDisposable
 /// </summary>
 /// <param name="resetMode">Flavor of reset operation to perform.</param>
 /// <param name="commit">The target commit object.</param>
- /// <param name="opts">Collection of parameters controlling checkout behavior.</param>
+ /// <param name="options">Collection of parameters controlling checkout behavior.</param>
 void Reset(ResetMode resetMode, Commit commit, CheckoutOptions options);
 
 /// <summary>
diff --git a/LibGit2Sharp/RebaseOperationImpl.cs b/LibGit2Sharp/RebaseOperationImpl.cs
@@ -43,24 +43,20 @@ public static RebaseResult Run(RebaseSafeHandle rebaseOperationHandle,
 else
{
 // No step to apply - need to complete the rebase.
- rebaseResult = CompleteRebase(rebaseOperationHandle, committer, rebaseResult);
+ rebaseResult = CompleteRebase(rebaseOperationHandle, committer);
 }
 }
 
 return rebaseResult;
 }
 
- private static RebaseResult CompleteRebase(RebaseSafeHandle rebaseOperationHandle, Identity committer, RebaseResult rebaseResult)
+ private static RebaseResult CompleteRebase(RebaseSafeHandle rebaseOperationHandle, Identity committer)
{
 long totalStepCount = Proxy.git_rebase_operation_entrycount(rebaseOperationHandle);
- GitRebaseOptions gitRebaseOptions = new GitRebaseOptions()
-{
- version = 1,
- };
 
 // Rebase is completed!
 Proxy.git_rebase_finish(rebaseOperationHandle, committer);
- rebaseResult = new RebaseResult(RebaseStatus.Complete,
+ var rebaseResult = new RebaseResult(RebaseStatus.Complete,
 totalStepCount,
 totalStepCount,
 null);

-Original file line number
+Diff line change
 OnCheckoutProgress=(path,completed,total)=>wasCalled=true,
 };
 -MergeResultresult=repo.Merge(commitToMerge,Constants.Signature,options);
 +repo.Merge(commitToMerge,Constants.Signature,options);
 Assert.True(wasCalled);
+}
 CheckoutNotifyFlags=CheckoutNotifyFlags.Updated,
 };
 -MergeResultresult=repo.Merge(commitToMerge,Constants.Signature,options);
 +repo.Merge(commitToMerge,Constants.Signature,options);
 Assert.True(wasCalled);
 Assert.Equal(CheckoutNotifyFlags.Updated,actualNotifyFlags);
 OnCheckoutProgress=(path,completed,total)=>wasCalled=true,
 };
 -MergeResultresult=repo.Merge(commitToMerge,Constants.Signature,options);
 +repo.Merge(commitToMerge,Constants.Signature,options);
 Assert.True(wasCalled);
+}
 CheckoutNotifyFlags=CheckoutNotifyFlags.Updated,
 };
 -MergeResultresult=repo.Merge(commitToMerge,Constants.Signature,options);
 +repo.Merge(commitToMerge,Constants.Signature,options);
 Assert.True(wasCalled);
 Assert.Equal(CheckoutNotifyFlags.Updated,actualNotifyFlags);
 Branchbranch=repo.Branches[conflictBranchName];
 Assert.NotNull(branch);
 -varstatus=repo.RetrieveStatus();
 MergeOptionsmergeOptions=newMergeOptions()
+{
 MergeFileFavor=fileFavorFlag,
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ public void CanPullIntoEmptyRepo()`
`189`	`189`	`using(varrepo=newRepository(repoPath))`
`190`	`190`	`{`
`191`	`191`	`// Set up remote`
`192`		`-Remoteremote=repo.Network.Remotes.Add(remoteName,url);`
	`192`	`+repo.Network.Remotes.Add(remoteName,url);`
`193`	`193`
`194`	`194`	`// Set up tracking information`
`195`	`195`	`repo.Branches.Update(repo.Head,`
Original file line number	Diff line number	Diff line change
`@@ -103,23 +103,13 @@ internal void AddingObjectsTestDelegate(IRepository repo, PackBuilder builder)`
`103`	`103`	`[Fact]`
`104`	`104`	`publicvoidExceptionIfPathDoesNotExist()`
`105`	`105`	`{`
`106`		`-PackBuilderOptionspbo;`
`107`		`-`
`108`		`-Assert.Throws<DirectoryNotFoundException>(()=>`
`109`		`-{`
`110`		`-pbo=newPackBuilderOptions("aaa");`
`111`		`-});`
	`106`	`+Assert.Throws<DirectoryNotFoundException>(()=>newPackBuilderOptions("aaa"));`
`112`	`107`	`}`
`113`	`108`
`114`	`109`	`[Fact]`
`115`	`110`	`publicvoidExceptionIfPathEqualsNull()`
`116`	`111`	`{`
`117`		`-PackBuilderOptionspbo;`
`118`		`-`
`119`		`-Assert.Throws<ArgumentNullException>(()=>`
`120`		`-{`
`121`		`-pbo=newPackBuilderOptions(null);`
`122`		`-});`
	`112`	`+Assert.Throws<ArgumentNullException>(()=>newPackBuilderOptions(null));`
`123`	`113`	`}`
`124`	`114`
`125`	`115`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,6 @@ public void CanRevertAndNotCommit()`
`67`	`67`	`stringpath=SandboxRevertTestRepo();`
`68`	`68`	`using(varrepo=newRepository(path))`
`69`	`69`	`{`
`70`		`-stringmodifiedFileFullPath=Path.Combine(repo.Info.WorkingDirectory,revertedFile);`
`71`		`-`
`72`	`70`	`// Checkout the revert branch.`
`73`	`71`	`Branchbranch=repo.Checkout(revertBranchName);`
`74`	`72`	`Assert.NotNull(branch);`
`@@ -160,6 +158,7 @@ public void RevertWithFileConflictStrategyOption(CheckoutFileConflictStrategy co`
`160`	`158`	`};`
`161`	`159`
`162`	`160`	`RevertResultresult=repo.Revert(repo.Head.Tip.Parents.First(),Constants.Signature,options);`
	`161`	`+Assert.Equal(RevertStatus.Conflicts,result.Status);`
`163`	`162`
`164`	`163`	`// Verify there is a conflict.`
`165`	`164`	`Assert.False(repo.Index.IsFullyMerged);`
`@@ -242,6 +241,7 @@ public void RevertReportsCheckoutNotification()`
`242`	`241`	`repo.Revert(repo.Head.Tip,Constants.Signature,options);`
`243`	`242`
`244`	`243`	`Assert.True(wasCalled);`
	`244`	`+Assert.Equal(CheckoutNotifyFlags.Updated,actualNotifyFlags);`
`245`	`245`	`}`
`246`	`246`	`}`
`247`	`247`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public void CustomSmartSubtransportTest(string scheme, string url)`
`38`	`38`	`registration=GlobalSettings.RegisterSmartSubtransport<MockSmartSubtransport>(scheme);`
`39`	`39`	`Assert.NotNull(registration);`
`40`	`40`
`41`		`-using(varrepo=newRepository(scd.DirectoryPath))`
	`41`	`+using(varrepo=newRepository(repoPath))`
`42`	`42`	`{`
`43`	`43`	`Remoteremote=repo.Network.Remotes.Add(remoteName,url);`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public void RetrievingTheStatusOfADirectoryThrows()`
`99`	`99`	`varpath=SandboxStandardTestRepoGitDir();`
`100`	`100`	`using(varrepo=newRepository(path))`
`101`	`101`	`{`
`102`		`-Assert.Throws<AmbiguousSpecificationException>(()=>{FileStatusstatus=repo.RetrieveStatus("1");});`
	`102`	`+Assert.Throws<AmbiguousSpecificationException>(()=>{repo.RetrieveStatus("1");});`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ protected override void Smudge(string path, string root, Stream input, Stream ou`
`77`	`77`	`{`
`78`	`78`	`SmudgeCalledCount++;`
`79`	`79`
`80`		`-stringfilename=Path.GetFileName(path);`
`81`	`80`	`StringBuildertext=newStringBuilder();`
`82`	`81`
`83`	`82`	`byte[]buffer=newbyte[64*1024];`
-Original file line number
+Diff line change
 privatereadonlystringname;
 privatereadonlyIEnumerable<FilterAttributeEntry>attributes;
 privatereadonlyGitFiltergitFilter;
 -privatereadonlyobject@lock=newobject();
 privateGitWriteStreamthisStream;
 privateGitWriteStreamnextStream;
Original file line number	Diff line number	Diff line change
`@@ -43,24 +43,20 @@ public static RebaseResult Run(RebaseSafeHandle rebaseOperationHandle,`
`43`	`43`	`else`
`44`	`44`	`{`
`45`	`45`	`// No step to apply - need to complete the rebase.`
`46`		`-rebaseResult=CompleteRebase(rebaseOperationHandle,committer,rebaseResult);`
	`46`	`+rebaseResult=CompleteRebase(rebaseOperationHandle,committer);`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`returnrebaseResult;`
`51`	`51`	`}`
`52`	`52`
`53`		`-privatestaticRebaseResultCompleteRebase(RebaseSafeHandlerebaseOperationHandle,Identitycommitter,RebaseResultrebaseResult)`
	`53`	`+privatestaticRebaseResultCompleteRebase(RebaseSafeHandlerebaseOperationHandle,Identitycommitter)`
`54`	`54`	`{`
`55`	`55`	`longtotalStepCount=Proxy.git_rebase_operation_entrycount(rebaseOperationHandle);`
`56`		`-GitRebaseOptionsgitRebaseOptions=newGitRebaseOptions()`
`57`		`-{`
`58`		`-version=1,`
`59`		`-};`
`60`	`56`
`61`	`57`	`// Rebase is completed!`
`62`	`58`	`Proxy.git_rebase_finish(rebaseOperationHandle,committer);`
`63`		`-rebaseResult=newRebaseResult(RebaseStatus.Complete,`
	`59`	`+varrebaseResult=newRebaseResult(RebaseStatus.Complete,`
`64`	`60`	`totalStepCount,`
`65`	`61`	`totalStepCount,`
`66`	`62`	`null);`