Siklos/libgit2dart
1
0
Fork 0
mirror of https://github.com/SkinnyMind/libgit2dart.git synced 2025-05-05 04:39:07 -04:00
Code Issues Projects Releases Wiki Activity

feat(merge): add ability to pass options to fileFromIndex(...) API method (#69)

Browse source
This commit is contained in:
Aleksey Kulikov 2022-06-17 15:40:19 +03:00 • committed by GitHub
parent aa073c531e
commit d71e00947e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 85 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
test/merge_test.dart
View file

@ -168,31 +168,38 @@ Another feature edit
expect(diff, diffExpected);
});
test('merges with provided merge flags and file flags', () {
test('merges with provided options', () {
const diffExpected = """
\<<<<<<< conflict_file
master conflict edit
\<<<<<<< ours
Feature edit on feature branch
||||||| ancestor
Feature edit
=======
conflict branch edit
>>>>>>> conflict_file
Another feature edit
>>>>>>> theirs
""";
Checkout.reference(repo: repo, name: 'refs/heads/feature');
repo.setHead('refs/heads/feature');
Merge.commit(
repo: repo,
commit: AnnotatedCommit.lookup(
repo: repo,
oid: Branch.lookup(repo: repo, name: 'conflict-branch').target,
oid: Branch.lookup(repo: repo, name: 'ancestor-conflict').target,
),
mergeFlags: {GitMergeFlag.noRecursive},
fileFlags: {GitMergeFileFlag.ignoreWhitespaceEOL},
);
final conflictedFile = repo.index.conflicts['conflict_file']!;
final conflictedFile = repo.index.conflicts['feature_file']!;
final diff = Merge.fileFromIndex(
repo: repo,
ancestor: null,
ancestor: conflictedFile.ancestor,
ancestorLabel: 'ancestor',
ours: conflictedFile.our!,
oursLabel: 'ours',
theirs: conflictedFile.their!,
theirsLabel: 'theirs',
flags: {GitMergeFileFlag.styleDiff3},
);
expect(diff, diffExpected);