PatienceAlgorithm flag in CompareOptions

[dmalikov]

Fix #1037

[dmalikov]

Do we need some tests here? I'm not quite sure what is the best approach to verify whether particular diff is patience or not.

[nulltoken]

Do we need some tests here?

Indeed, we tend to prefer covering features with tests. The easiest way to make this happen would be to

• find the smallest use case in git.git where the diff differs based on the use of "patience",
• reproduce the outcome by building two Trees (cf. the TreeDefinition type and the repo.ObjectDatabase.CreateTree() method and how they're leveraged in the test suites) and diff them.

[dmalikov]

find the smallest use case in git.git where the diff differs based on the use of "patience",

What do you mean by git.git?

[Therzok]

git.git being the git commandline tool.

[dmalikov]

@nulltoken is there some helper method to parse TreeChanges from a string containing actual git diff?

[nulltoken]

@dmalikov No. you'll have to build one Tree with one version of the file to compare and another Tree with the second version. The TreeChanges will be generated by the call to Diff.Compare().

If you've found a way to identify a small case where --patience shines please share it here and we'll help you build the Trees out of it.

[nulltoken]

FWIW, I've found a short example that should be sufficient from a test coverage perspective

http://bl.ocks.org/roryokane/79b8ebcb3813ebd934c4

[nulltoken]

@dmalikov

The following code will create a Tree, containing one entry file.txt which content is My content.

var content = "My content";
var path = "file.txt";

var td = new TreeDefinition();
td.Add(path, OdbHelper.CreateBlob(repo, content), Mode.NonExecutableFile);

var t = repo.ObjectDatabase.CreateTree(td);

[dmalikov]

Well, the problem is not to build 2 trees and calculate a diff between
them. Problem is to assert that resulted diff is equal to the expected one.

Regular diff and patience diff are almost always identical in terms of
number of added and removed lines. Thus we should match diff fully line by line

On 5 May 2015 at 21:09, nulltoken [email protected] wrote:

@dmalikov https://github.com/dmalikov

The following code will create a Tree, containing one entry file.txt
which content is My content.

var content = "My content";var path = "file.txt";
var td = new TreeDefinition();
td.Add(path, OdbHelper.CreateBlob(repo, content), Mode.NonExecutableFile);
var t = repo.ObjectDatabase.CreateTree(td);

—
Reply to this email directly or view it on GitHub
#1039 (comment).

[nulltoken]

@dmalikov Oh, sorry! I misunderstood your question.

You may be willing to actually leverage repo.Diff.Comapre<Patch>() then. See an example in DiffTreeToTargetFixture.cs

[dmalikov]

Thanks for examples, test is added

[nulltoken]

Can you please wrap this line so that it reads better on GitHub (without having to scroll horizontally)?

[dmalikov]

@nulltoken updated

[nulltoken]

@dmalikov Awesome!

Last request: Could you please squash those commits together into a single cohesive one?

[dmalikov]

@nulltoken squashed

[nulltoken]

✨ ✨ ✨ ✨ ✨ ✨ Very cool contribution!

Thanks a lot!

[dmalikov]

@nulltoken could you please build a new version of the NuGet package and upload it?

[nulltoken]

@dmalikov Sir! Done, Sir! 😉

Published as NuGet pre-release package LibGit2Sharp.0.22.0-pre20150507080442

[dmalikov]

Thanks!

On 9 May 2015 at 13:18, nulltoken [email protected] wrote:

@dmalikov https://github.com/dmalikov Sir! Done, Sir! [image: 😉]

Published as NuGet pre-release package
LibGit2Sharp.0.22.0-pre20150507080442

—
Reply to this email directly or view it on GitHub
#1039 (comment)
.