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

feat(merge): add bindings and api for merge analysis

Browse source
This commit is contained in:
Aleksey Kulikov 2021-09-08 16:03:35 +03:00
parent 1f2d00b177
commit 223cc7cc14
5 changed files with 231 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

49
lib/src/repository.dart
View file

@ -5,6 +5,7 @@ import 'bindings/repository.dart' as bindings;
import 'bindings/merge.dart' as merge_bindings;
import 'bindings/object.dart' as object_bindings;
import 'bindings/status.dart' as status_bindings;
import 'bindings/commit.dart' as commit_bindings;
import 'branch.dart';
import 'commit.dart';
import 'config.dart';
@ -399,19 +400,6 @@ class Repository {
/// Throws a [LibGit2Error] if error occured.
RevSpec revParse(String spec) => RevParse.range(this, spec);
/// Finds a merge base between two commits.
///
/// Throws a [LibGit2Error] if error occured.
Oid mergeBase(String one, String two) {
final oidOne = Oid.fromSHA(this, one);
final oidTwo = Oid.fromSHA(this, two);
return Oid(merge_bindings.mergeBase(
_repoPointer,
oidOne.pointer,
oidTwo.pointer,
));
}
/// Creates a new blob from a [content] string and writes it to ODB.
///
/// Throws a [LibGit2Error] if error occured.
@ -494,4 +482,39 @@ class Repository {
///
/// Throws a [LibGit2Error] if error occured.
int statusFile(String path) => status_bindings.file(_repoPointer, path);
/// Finds a merge base between two commits.
///
/// Throws a [LibGit2Error] if error occured.
Oid mergeBase(String one, String two) {
final oidOne = Oid.fromSHA(this, one);
final oidTwo = Oid.fromSHA(this, two);
return Oid(merge_bindings.mergeBase(
_repoPointer,
oidOne.pointer,
oidTwo.pointer,
));
}
/// Analyzes the given branch(es) and determines the opportunities for merging them
/// into a reference (default is 'HEAD').
///
/// Returns list with analysis result and preference for fast forward merge values
/// respectively.
///
/// Throws a [LibGit2Error] if error occured.
List<int> mergeAnalysis(Oid theirHead, [String ourRef = 'HEAD']) {
final ref = references[ourRef];
final head = commit_bindings.annotatedLookup(
_repoPointer,
theirHead.pointer,
);
final result = merge_bindings.analysis(_repoPointer, ref.pointer, head, 1);
commit_bindings.annotatedFree(head.value);
ref.free();
return result;
}
}