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

refactor(revparse)!: use same name for revspec flags as in libgit2

Browse source
This commit is contained in:
Aleksey Kulikov 2021-09-17 18:53:43 +03:00
parent a1e420d86c
commit 825f3f9926
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/src/git_types.dart
View file

@ -130,26 +130,26 @@ class GitObject {
} }
/// Revparse flags, indicate the intended behavior of the spec. /// Revparse flags, indicate the intended behavior of the spec.
class GitRevParse { class GitRevSpec {
const GitRevParse._(this._value, this._name); const GitRevSpec._(this._value, this._name);
final int _value; final int _value;
final String _name; final String _name;
/// The spec targeted a single object. /// The spec targeted a single object.
static const single = GitRevParse._(1, 'single'); static const single = GitRevSpec._(1, 'single');
/// The spec targeted a range of commits. /// The spec targeted a range of commits.
static const range = GitRevParse._(2, 'range'); static const range = GitRevSpec._(2, 'range');
/// The spec used the '...' operator, which invokes special semantics. /// The spec used the '...' operator, which invokes special semantics.
static const mergeBase = GitRevParse._(4, 'mergeBase'); static const mergeBase = GitRevSpec._(4, 'mergeBase');
static const List<GitRevParse> values = [single, range, mergeBase]; static const List<GitRevSpec> values = [single, range, mergeBase];
int get value => _value; int get value => _value;
@override @override
String toString() => 'GitRevParse.$_name'; String toString() => 'GitRevSpec.$_name';
} }
/// Basic type of any Git branch. /// Basic type of any Git branch.

6
lib/src/revparse.dart
View file

@ -78,10 +78,10 @@ class RevSpec {
} }
/// The intent of the revspec. /// The intent of the revspec.
Set<GitRevParse> get flags { Set<GitRevSpec> get flags {
final flagInt = _revSpecPointer.ref.flags; final flagInt = _revSpecPointer.ref.flags;
var flags = <GitRevParse>{}; var flags = <GitRevSpec>{};
for (var flag in GitRevParse.values) { for (var flag in GitRevSpec.values) {
if (flagInt & flag.value == flag.value) { if (flagInt & flag.value == flag.value) {
flags.add(flag); flags.add(flag);
} }

6
test/revparse_test.dart
View file

@ -81,7 +81,7 @@ void main() {
expect(revspec.from.id.sha, headSHA); expect(revspec.from.id.sha, headSHA);
expect(revspec.to, isNull); expect(revspec.to, isNull);
expect(revspec.flags, {GitRevParse.single}); expect(revspec.flags, {GitRevSpec.single});
revspec.from.free(); revspec.from.free();
@ -89,7 +89,7 @@ void main() {
expect(revspec.from.id.sha, parentSHA); expect(revspec.from.id.sha, parentSHA);
expect(revspec.to?.id.sha, '5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'); expect(revspec.to?.id.sha, '5aecfa0fb97eadaac050ccb99f03c3fb65460ad4');
expect(revspec.flags, {GitRevParse.range}); expect(revspec.flags, {GitRevSpec.range});
revspec.from.free(); revspec.from.free();
revspec.to?.free(); revspec.to?.free();
@ -98,7 +98,7 @@ void main() {
expect(revspec.from.id.sha, headSHA); expect(revspec.from.id.sha, headSHA);
expect(revspec.to?.id.sha, '5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'); expect(revspec.to?.id.sha, '5aecfa0fb97eadaac050ccb99f03c3fb65460ad4');
expect(revspec.flags, {GitRevParse.range, GitRevParse.mergeBase}); expect(revspec.flags, {GitRevSpec.range, GitRevSpec.mergeBase});
expect( expect(
repo.mergeBase(revspec.from.id.sha, revspec.to!.id.sha), repo.mergeBase(revspec.from.id.sha, revspec.to!.id.sha),
isA<Oid>(), isA<Oid>(),