diff --git a/lib/src/git_types.dart b/lib/src/git_types.dart index 74c301c..0290d6f 100644 --- a/lib/src/git_types.dart +++ b/lib/src/git_types.dart @@ -130,26 +130,26 @@ class GitObject { } /// Revparse flags, indicate the intended behavior of the spec. -class GitRevParse { - const GitRevParse._(this._value, this._name); +class GitRevSpec { + const GitRevSpec._(this._value, this._name); final int _value; final String _name; /// 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. - static const range = GitRevParse._(2, 'range'); + static const range = GitRevSpec._(2, 'range'); /// The spec used the '...' operator, which invokes special semantics. - static const mergeBase = GitRevParse._(4, 'mergeBase'); + static const mergeBase = GitRevSpec._(4, 'mergeBase'); - static const List values = [single, range, mergeBase]; + static const List values = [single, range, mergeBase]; int get value => _value; @override - String toString() => 'GitRevParse.$_name'; + String toString() => 'GitRevSpec.$_name'; } /// Basic type of any Git branch. diff --git a/lib/src/revparse.dart b/lib/src/revparse.dart index 3d4bffe..fc29f22 100644 --- a/lib/src/revparse.dart +++ b/lib/src/revparse.dart @@ -78,10 +78,10 @@ class RevSpec { } /// The intent of the revspec. - Set get flags { + Set get flags { final flagInt = _revSpecPointer.ref.flags; - var flags = {}; - for (var flag in GitRevParse.values) { + var flags = {}; + for (var flag in GitRevSpec.values) { if (flagInt & flag.value == flag.value) { flags.add(flag); } diff --git a/test/revparse_test.dart b/test/revparse_test.dart index a3d49b8..0658f87 100644 --- a/test/revparse_test.dart +++ b/test/revparse_test.dart @@ -81,7 +81,7 @@ void main() { expect(revspec.from.id.sha, headSHA); expect(revspec.to, isNull); - expect(revspec.flags, {GitRevParse.single}); + expect(revspec.flags, {GitRevSpec.single}); revspec.from.free(); @@ -89,7 +89,7 @@ void main() { expect(revspec.from.id.sha, parentSHA); expect(revspec.to?.id.sha, '5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'); - expect(revspec.flags, {GitRevParse.range}); + expect(revspec.flags, {GitRevSpec.range}); revspec.from.free(); revspec.to?.free(); @@ -98,7 +98,7 @@ void main() { expect(revspec.from.id.sha, headSHA); expect(revspec.to?.id.sha, '5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'); - expect(revspec.flags, {GitRevParse.range, GitRevParse.mergeBase}); + expect(revspec.flags, {GitRevSpec.range, GitRevSpec.mergeBase}); expect( repo.mergeBase(revspec.from.id.sha, revspec.to!.id.sha), isA(),