From a806d0a312771531cbc571f90f3194de6e68c439 Mon Sep 17 00:00:00 2001 From: Aleksey Kulikov Date: Fri, 22 Oct 2021 15:10:04 +0300 Subject: [PATCH] style: sort imports alphabetically --- analysis_options.yaml | 1 + lib/libgit2dart.dart | 48 +++++++++++++------------- lib/src/bindings/blob.dart | 4 ++- lib/src/bindings/branch.dart | 6 ++-- lib/src/bindings/checkout.dart | 4 ++- lib/src/bindings/commit.dart | 4 ++- lib/src/bindings/config.dart | 4 ++- lib/src/bindings/describe.dart | 4 ++- lib/src/bindings/diff.dart | 4 ++- lib/src/bindings/graph.dart | 4 ++- lib/src/bindings/index.dart | 4 ++- lib/src/bindings/mailmap.dart | 4 ++- lib/src/bindings/merge.dart | 4 ++- lib/src/bindings/object.dart | 4 ++- lib/src/bindings/odb.dart | 6 ++-- lib/src/bindings/oid.dart | 4 ++- lib/src/bindings/packbuilder.dart | 4 ++- lib/src/bindings/patch.dart | 4 ++- lib/src/bindings/rebase.dart | 4 ++- lib/src/bindings/refdb.dart | 3 +- lib/src/bindings/reference.dart | 4 ++- lib/src/bindings/reflog.dart | 4 ++- lib/src/bindings/refspec.dart | 4 ++- lib/src/bindings/remote_callbacks.dart | 8 +++-- lib/src/bindings/repository.dart | 4 ++- lib/src/bindings/reset.dart | 3 +- lib/src/bindings/revparse.dart | 4 ++- lib/src/bindings/revwalk.dart | 6 ++-- lib/src/bindings/signature.dart | 4 ++- lib/src/bindings/stash.dart | 4 ++- lib/src/bindings/status.dart | 4 ++- lib/src/bindings/submodule.dart | 4 ++- lib/src/bindings/tag.dart | 4 ++- lib/src/bindings/tree.dart | 4 ++- lib/src/bindings/treebuilder.dart | 4 ++- lib/src/bindings/worktree.dart | 4 ++- lib/src/blame.dart | 4 ++- lib/src/blob.dart | 4 ++- lib/src/branch.dart | 4 ++- lib/src/commit.dart | 4 ++- lib/src/config.dart | 4 ++- lib/src/diff.dart | 4 ++- lib/src/index.dart | 6 ++-- lib/src/oid.dart | 4 ++- lib/src/reference.dart | 4 ++- lib/src/repository.dart | 18 +++++----- lib/src/tag.dart | 4 ++- lib/src/tree.dart | 4 ++- lib/src/util.dart | 3 +- test/blame_test.dart | 4 ++- test/blob_test.dart | 4 ++- test/branch_test.dart | 4 ++- test/checkout_test.dart | 4 ++- test/commit_test.dart | 4 ++- test/config_test.dart | 3 +- test/credentials_test.dart | 3 +- test/describe_test.dart | 4 ++- test/diff_test.dart | 4 ++- test/features_test.dart | 2 +- test/git_types_test.dart | 2 +- test/index_test.dart | 4 ++- test/mailmap_test.dart | 4 ++- test/merge_test.dart | 4 ++- test/note_test.dart | 4 ++- test/odb_test.dart | 4 ++- test/oid_test.dart | 6 ++-- test/packbuilder_test.dart | 4 ++- test/patch_test.dart | 4 ++- test/rebase_test.dart | 4 ++- test/reference_test.dart | 4 ++- test/reflog_test.dart | 4 ++- test/remote_prune_test.dart | 4 ++- test/remote_test.dart | 4 ++- test/repository_clone_test.dart | 4 ++- test/repository_empty_test.dart | 3 +- test/repository_init_test.dart | 3 +- test/repository_test.dart | 4 ++- test/reset_test.dart | 4 ++- test/revparse_test.dart | 4 ++- test/revwalk_test.dart | 4 ++- test/signature_test.dart | 2 +- test/stash_test.dart | 4 ++- test/submodule_test.dart | 4 ++- test/tag_test.dart | 4 ++- test/tree_test.dart | 4 ++- test/treebuilder_test.dart | 4 ++- test/worktree_test.dart | 4 ++- 87 files changed, 281 insertions(+), 123 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 5c17980..46d4433 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -3,6 +3,7 @@ linter: rules: - prefer_const_constructors - sort_constructors_first + - directives_ordering analyzer: exclude: - lib/src/bindings/libgit2_bindings.dart diff --git a/lib/libgit2dart.dart b/lib/libgit2dart.dart index 54190ee..345c841 100644 --- a/lib/libgit2dart.dart +++ b/lib/libgit2dart.dart @@ -1,33 +1,33 @@ -export 'src/repository.dart'; -export 'src/config.dart'; +export 'src/blame.dart'; +export 'src/blob.dart'; +export 'src/branch.dart'; +export 'src/callbacks.dart'; export 'src/commit.dart'; +export 'src/config.dart'; +export 'src/credentials.dart'; +export 'src/diff.dart'; +export 'src/error.dart'; +export 'src/features.dart'; +export 'src/git_types.dart'; export 'src/index.dart'; +export 'src/mailmap.dart'; +export 'src/note.dart'; export 'src/odb.dart'; export 'src/oid.dart'; +export 'src/packbuilder.dart'; +export 'src/patch.dart'; +export 'src/rebase.dart'; export 'src/reference.dart'; export 'src/reflog.dart'; -export 'src/tree.dart'; -export 'src/signature.dart'; -export 'src/revwalk.dart'; -export 'src/blob.dart'; -export 'src/tag.dart'; -export 'src/treebuilder.dart'; -export 'src/branch.dart'; -export 'src/worktree.dart'; -export 'src/diff.dart'; -export 'src/patch.dart'; -export 'src/stash.dart'; -export 'src/remote.dart'; export 'src/refspec.dart'; +export 'src/remote.dart'; +export 'src/repository.dart'; export 'src/revparse.dart'; -export 'src/callbacks.dart'; -export 'src/credentials.dart'; -export 'src/blame.dart'; -export 'src/note.dart'; -export 'src/rebase.dart'; -export 'src/mailmap.dart'; -export 'src/packbuilder.dart'; +export 'src/revwalk.dart'; +export 'src/signature.dart'; +export 'src/stash.dart'; export 'src/submodule.dart'; -export 'src/features.dart'; -export 'src/error.dart'; -export 'src/git_types.dart'; +export 'src/tag.dart'; +export 'src/tree.dart'; +export 'src/treebuilder.dart'; +export 'src/worktree.dart'; diff --git a/lib/src/bindings/blob.dart b/lib/src/bindings/blob.dart index 0971d91..b0168d3 100644 --- a/lib/src/bindings/blob.dart +++ b/lib/src/bindings/blob.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../error.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Lookup a blob object from a repository. /// diff --git a/lib/src/bindings/branch.dart b/lib/src/bindings/branch.dart index e60be71..f70cfc8 100644 --- a/lib/src/bindings/branch.dart +++ b/lib/src/bindings/branch.dart @@ -1,10 +1,12 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; import 'package:libgit2dart/libgit2dart.dart'; -import 'libgit2_bindings.dart'; -import 'reference.dart' as reference_bindings; + import '../error.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; +import 'reference.dart' as reference_bindings; /// Return a list of branches. /// diff --git a/lib/src/bindings/checkout.dart b/lib/src/bindings/checkout.dart index 856895a..083a138 100644 --- a/lib/src/bindings/checkout.dart +++ b/lib/src/bindings/checkout.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../error.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Updates files in the index and the working tree to match the content of the commit /// pointed at by HEAD. diff --git a/lib/src/bindings/commit.dart b/lib/src/bindings/commit.dart index dc121eb..e7b8db0 100644 --- a/lib/src/bindings/commit.dart +++ b/lib/src/bindings/commit.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../error.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Lookup a commit object from a repository. /// diff --git a/lib/src/bindings/config.dart b/lib/src/bindings/config.dart index f4eefde..755f527 100644 --- a/lib/src/bindings/config.dart +++ b/lib/src/bindings/config.dart @@ -1,10 +1,12 @@ // coverage:ignore-file import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../error.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Create a new config instance containing a single on-disk file Pointer open(String path) { diff --git a/lib/src/bindings/describe.dart b/lib/src/bindings/describe.dart index 83cd994..0dd7977 100644 --- a/lib/src/bindings/describe.dart +++ b/lib/src/bindings/describe.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; -import 'libgit2_bindings.dart'; + import '../error.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Describe a commit. /// diff --git a/lib/src/bindings/diff.dart b/lib/src/bindings/diff.dart index 1625ba3..fa525e5 100644 --- a/lib/src/bindings/diff.dart +++ b/lib/src/bindings/diff.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../error.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Create a diff between the repository index and the workdir directory. Pointer indexToWorkdir({ diff --git a/lib/src/bindings/graph.dart b/lib/src/bindings/graph.dart index e939d51..f18c32b 100644 --- a/lib/src/bindings/graph.dart +++ b/lib/src/bindings/graph.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; -import 'libgit2_bindings.dart'; + import '../error.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Determine if a commit is the descendant of another commit. /// diff --git a/lib/src/bindings/index.dart b/lib/src/bindings/index.dart index 32e75b1..6585bfc 100644 --- a/lib/src/bindings/index.dart +++ b/lib/src/bindings/index.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../error.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Update the contents of an existing index object in memory by reading from the hard disk. /// diff --git a/lib/src/bindings/mailmap.dart b/lib/src/bindings/mailmap.dart index acc1288..f8a5cf5 100644 --- a/lib/src/bindings/mailmap.dart +++ b/lib/src/bindings/mailmap.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; -import 'libgit2_bindings.dart'; + import '../error.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Allocate a new mailmap object. /// diff --git a/lib/src/bindings/merge.dart b/lib/src/bindings/merge.dart index 84a73a4..c51689e 100644 --- a/lib/src/bindings/merge.dart +++ b/lib/src/bindings/merge.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../error.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Find a merge base between two commits. /// diff --git a/lib/src/bindings/object.dart b/lib/src/bindings/object.dart index e5e57e2..f48ffb6 100644 --- a/lib/src/bindings/object.dart +++ b/lib/src/bindings/object.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; -import 'libgit2_bindings.dart'; + import '../error.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Get the object type of an object. int type(Pointer obj) => libgit2.git_object_type(obj); diff --git a/lib/src/bindings/odb.dart b/lib/src/bindings/odb.dart index e531a08..aced45b 100644 --- a/lib/src/bindings/odb.dart +++ b/lib/src/bindings/odb.dart @@ -1,10 +1,12 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; -import 'oid.dart' as oid_bindings; + import '../error.dart'; import '../oid.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; +import 'oid.dart' as oid_bindings; /// Create a new object database with no backends. /// diff --git a/lib/src/bindings/oid.dart b/lib/src/bindings/oid.dart index 7e74338..a256920 100644 --- a/lib/src/bindings/oid.dart +++ b/lib/src/bindings/oid.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; -import 'libgit2_bindings.dart'; + import '../util.dart'; +import 'libgit2_bindings.dart'; /// Parse N characters of a hex formatted object id into a git_oid. Pointer fromStrN(String hex) { diff --git a/lib/src/bindings/packbuilder.dart b/lib/src/bindings/packbuilder.dart index ab593ff..734301a 100644 --- a/lib/src/bindings/packbuilder.dart +++ b/lib/src/bindings/packbuilder.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; -import 'libgit2_bindings.dart'; + import '../error.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Initialize a new packbuilder. /// diff --git a/lib/src/bindings/patch.dart b/lib/src/bindings/patch.dart index d728c0b..b9601cf 100644 --- a/lib/src/bindings/patch.dart +++ b/lib/src/bindings/patch.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../error.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Directly generate a patch from the difference between two buffers. /// diff --git a/lib/src/bindings/rebase.dart b/lib/src/bindings/rebase.dart index d566a39..3c0dbf3 100644 --- a/lib/src/bindings/rebase.dart +++ b/lib/src/bindings/rebase.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; -import 'libgit2_bindings.dart'; + import '../error.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Initializes a rebase operation to rebase the changes in [branchPointer] relative /// to [upstreamPointer] onto [ontoPointer] another branch. To begin the rebase process, call diff --git a/lib/src/bindings/refdb.dart b/lib/src/bindings/refdb.dart index d3e0b66..1c0c720 100644 --- a/lib/src/bindings/refdb.dart +++ b/lib/src/bindings/refdb.dart @@ -1,6 +1,7 @@ import 'dart:ffi'; -import 'libgit2_bindings.dart'; + import '../util.dart'; +import 'libgit2_bindings.dart'; /// Suggests that the given refdb compress or optimize its references. /// This mechanism is implementation specific. For on-disk reference databases, diff --git a/lib/src/bindings/reference.dart b/lib/src/bindings/reference.dart index 97c7036..ffde7ba 100644 --- a/lib/src/bindings/reference.dart +++ b/lib/src/bindings/reference.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../error.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Get the type of a reference. /// diff --git a/lib/src/bindings/reflog.dart b/lib/src/bindings/reflog.dart index 6d9d980..c2d6ba9 100644 --- a/lib/src/bindings/reflog.dart +++ b/lib/src/bindings/reflog.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; -import 'libgit2_bindings.dart'; + import '../util.dart'; +import 'libgit2_bindings.dart'; /// Read the reflog for the given reference. /// diff --git a/lib/src/bindings/refspec.dart b/lib/src/bindings/refspec.dart index 4d17a5d..20f4228 100644 --- a/lib/src/bindings/refspec.dart +++ b/lib/src/bindings/refspec.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../error.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Get the source specifier. String source(Pointer refspec) { diff --git a/lib/src/bindings/remote_callbacks.dart b/lib/src/bindings/remote_callbacks.dart index 32ba124..d508808 100644 --- a/lib/src/bindings/remote_callbacks.dart +++ b/lib/src/bindings/remote_callbacks.dart @@ -1,14 +1,16 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; import 'package:libgit2dart/libgit2dart.dart'; import 'package:libgit2dart/src/util.dart'; -import '../credentials.dart'; + import '../callbacks.dart'; -import '../repository.dart'; +import '../credentials.dart'; import '../oid.dart'; import '../remote.dart'; -import 'libgit2_bindings.dart'; +import '../repository.dart'; import 'credentials.dart' as credentials_bindings; +import 'libgit2_bindings.dart'; class RemoteCallbacks { /// Callback function that reports transfer progress. diff --git a/lib/src/bindings/repository.dart b/lib/src/bindings/repository.dart index f47ef66..4540650 100644 --- a/lib/src/bindings/repository.dart +++ b/lib/src/bindings/repository.dart @@ -1,11 +1,13 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../callbacks.dart'; import '../error.dart'; import '../remote.dart'; import '../repository.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; import 'remote_callbacks.dart'; /// Attempt to open an already-existing repository at [path]. diff --git a/lib/src/bindings/reset.dart b/lib/src/bindings/reset.dart index 66fed23..194806a 100644 --- a/lib/src/bindings/reset.dart +++ b/lib/src/bindings/reset.dart @@ -1,6 +1,7 @@ import 'dart:ffi'; -import 'libgit2_bindings.dart'; + import '../util.dart'; +import 'libgit2_bindings.dart'; /// Sets the current head to the specified commit oid and optionally resets the index /// and working tree to match. diff --git a/lib/src/bindings/revparse.dart b/lib/src/bindings/revparse.dart index 3396b0a..1e7a65e 100644 --- a/lib/src/bindings/revparse.dart +++ b/lib/src/bindings/revparse.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; -import 'libgit2_bindings.dart'; + import '../error.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Parse a revision string for from, to, and intent. /// diff --git a/lib/src/bindings/revwalk.dart b/lib/src/bindings/revwalk.dart index f2defee..1f7362b 100644 --- a/lib/src/bindings/revwalk.dart +++ b/lib/src/bindings/revwalk.dart @@ -1,9 +1,11 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; -import 'libgit2_bindings.dart'; -import 'commit.dart' as commit_bindings; + import '../error.dart'; import '../util.dart'; +import 'commit.dart' as commit_bindings; +import 'libgit2_bindings.dart'; /// Allocate a new revision walker to iterate through a repo. /// diff --git a/lib/src/bindings/signature.dart b/lib/src/bindings/signature.dart index 4d8f2d2..2df6fa9 100644 --- a/lib/src/bindings/signature.dart +++ b/lib/src/bindings/signature.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../error.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Create a new action signature. /// diff --git a/lib/src/bindings/stash.dart b/lib/src/bindings/stash.dart index 8e580bb..151aa20 100644 --- a/lib/src/bindings/stash.dart +++ b/lib/src/bindings/stash.dart @@ -1,11 +1,13 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../error.dart'; import '../oid.dart'; import '../stash.dart'; +import '../util.dart'; import 'checkout.dart' as checkout_bindings; import 'libgit2_bindings.dart'; -import '../util.dart'; /// Save the local modifications to a new stash. /// diff --git a/lib/src/bindings/status.dart b/lib/src/bindings/status.dart index 5af5fba..3728abd 100644 --- a/lib/src/bindings/status.dart +++ b/lib/src/bindings/status.dart @@ -1,9 +1,11 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; import 'package:libgit2dart/libgit2dart.dart'; -import 'libgit2_bindings.dart'; + import '../error.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Gather file status information and populate the git_status_list. /// diff --git a/lib/src/bindings/submodule.dart b/lib/src/bindings/submodule.dart index cf5f705..e226dd9 100644 --- a/lib/src/bindings/submodule.dart +++ b/lib/src/bindings/submodule.dart @@ -1,9 +1,11 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../callbacks.dart'; -import 'libgit2_bindings.dart'; import '../error.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; import 'remote_callbacks.dart'; /// List of submodule paths. diff --git a/lib/src/bindings/tag.dart b/lib/src/bindings/tag.dart index 9c55e0f..c9efd83 100644 --- a/lib/src/bindings/tag.dart +++ b/lib/src/bindings/tag.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../error.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Fill a list with all the tags in the repository. /// diff --git a/lib/src/bindings/tree.dart b/lib/src/bindings/tree.dart index a6b114b..488d430 100644 --- a/lib/src/bindings/tree.dart +++ b/lib/src/bindings/tree.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../error.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Get the id of a tree. Pointer id(Pointer tree) => libgit2.git_tree_id(tree); diff --git a/lib/src/bindings/treebuilder.dart b/lib/src/bindings/treebuilder.dart index 91c7c84..7d70286 100644 --- a/lib/src/bindings/treebuilder.dart +++ b/lib/src/bindings/treebuilder.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; + import '../error.dart'; -import 'libgit2_bindings.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Create a new tree builder. /// diff --git a/lib/src/bindings/worktree.dart b/lib/src/bindings/worktree.dart index 8aec0ea..2b928c5 100644 --- a/lib/src/bindings/worktree.dart +++ b/lib/src/bindings/worktree.dart @@ -1,9 +1,11 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; import 'package:libgit2dart/libgit2dart.dart'; -import 'libgit2_bindings.dart'; + import '../error.dart'; import '../util.dart'; +import 'libgit2_bindings.dart'; /// Add a new working tree. /// diff --git a/lib/src/blame.dart b/lib/src/blame.dart index 4bfbb5f..71d5797 100644 --- a/lib/src/blame.dart +++ b/lib/src/blame.dart @@ -1,9 +1,11 @@ import 'dart:collection'; import 'dart:ffi'; + import 'package:ffi/ffi.dart'; import 'package:libgit2dart/libgit2dart.dart'; -import 'bindings/libgit2_bindings.dart'; + import 'bindings/blame.dart' as bindings; +import 'bindings/libgit2_bindings.dart'; class Blame with IterableMixin { /// Returns the blame for a single file. diff --git a/lib/src/blob.dart b/lib/src/blob.dart index a1f9f18..a88f8d2 100644 --- a/lib/src/blob.dart +++ b/lib/src/blob.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; + import 'package:libgit2dart/libgit2dart.dart'; -import 'bindings/libgit2_bindings.dart'; + import 'bindings/blob.dart' as bindings; +import 'bindings/libgit2_bindings.dart'; import 'bindings/patch.dart' as patch_bindings; class Blob { diff --git a/lib/src/branch.dart b/lib/src/branch.dart index 63cf282..1187b3c 100644 --- a/lib/src/branch.dart +++ b/lib/src/branch.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; + import 'package:libgit2dart/libgit2dart.dart'; -import 'bindings/libgit2_bindings.dart'; + import 'bindings/branch.dart' as bindings; +import 'bindings/libgit2_bindings.dart'; import 'bindings/reference.dart' as reference_bindings; class Branch { diff --git a/lib/src/commit.dart b/lib/src/commit.dart index 621fb76..0db4454 100644 --- a/lib/src/commit.dart +++ b/lib/src/commit.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; + import 'package:libgit2dart/libgit2dart.dart'; -import 'bindings/libgit2_bindings.dart'; + import 'bindings/commit.dart' as bindings; +import 'bindings/libgit2_bindings.dart'; import 'bindings/tree.dart' as tree_bindings; class Commit { diff --git a/lib/src/config.dart b/lib/src/config.dart index 54d4006..febbb99 100644 --- a/lib/src/config.dart +++ b/lib/src/config.dart @@ -1,10 +1,12 @@ import 'dart:collection'; import 'dart:ffi'; import 'dart:io'; + import 'package:ffi/ffi.dart'; import 'package:libgit2dart/libgit2dart.dart'; -import 'bindings/libgit2_bindings.dart'; + import 'bindings/config.dart' as bindings; +import 'bindings/libgit2_bindings.dart'; import 'util.dart'; class Config with IterableMixin { diff --git a/lib/src/diff.dart b/lib/src/diff.dart index a63c3ae..78c9b5c 100644 --- a/lib/src/diff.dart +++ b/lib/src/diff.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; import 'package:libgit2dart/libgit2dart.dart'; -import 'bindings/libgit2_bindings.dart'; + import 'bindings/diff.dart' as bindings; +import 'bindings/libgit2_bindings.dart'; import 'bindings/patch.dart' as patch_bindings; import 'util.dart'; diff --git a/lib/src/index.dart b/lib/src/index.dart index 7804310..9a0f003 100644 --- a/lib/src/index.dart +++ b/lib/src/index.dart @@ -1,10 +1,12 @@ import 'dart:collection'; import 'dart:ffi'; + import 'package:ffi/ffi.dart'; import 'package:libgit2dart/libgit2dart.dart'; -import 'bindings/libgit2_bindings.dart'; -import 'bindings/index.dart' as bindings; + import 'bindings/diff.dart' as diff_bindings; +import 'bindings/index.dart' as bindings; +import 'bindings/libgit2_bindings.dart'; class Index with IterableMixin { /// Initializes a new instance of [Index] class from provided diff --git a/lib/src/oid.dart b/lib/src/oid.dart index 05d1841..5c3ea5a 100644 --- a/lib/src/oid.dart +++ b/lib/src/oid.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:libgit2dart/libgit2dart.dart'; + import 'bindings/libgit2_bindings.dart'; -import 'bindings/oid.dart' as bindings; import 'bindings/odb.dart' as odb_bindings; +import 'bindings/oid.dart' as bindings; import 'util.dart'; class Oid { diff --git a/lib/src/reference.dart b/lib/src/reference.dart index ad2a342..2c57b97 100644 --- a/lib/src/reference.dart +++ b/lib/src/reference.dart @@ -1,9 +1,11 @@ import 'dart:ffi'; + import 'package:libgit2dart/libgit2dart.dart'; + import 'bindings/libgit2_bindings.dart'; -import 'bindings/reference.dart' as bindings; import 'bindings/object.dart' as object_bindings; import 'bindings/refdb.dart' as refdb_bindings; +import 'bindings/reference.dart' as bindings; import 'bindings/repository.dart' as repository_bindings; class Reference { diff --git a/lib/src/repository.dart b/lib/src/repository.dart index 0bdc593..54c58e3 100644 --- a/lib/src/repository.dart +++ b/lib/src/repository.dart @@ -1,18 +1,20 @@ import 'dart:ffi'; + import 'package:ffi/ffi.dart'; import 'package:libgit2dart/libgit2dart.dart'; + +import 'bindings/attr.dart' as attr_bindings; +import 'bindings/checkout.dart' as checkout_bindings; +import 'bindings/commit.dart' as commit_bindings; +import 'bindings/describe.dart' as describe_bindings; +import 'bindings/diff.dart' as diff_bindings; +import 'bindings/graph.dart' as graph_bindings; import 'bindings/libgit2_bindings.dart'; -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 'bindings/checkout.dart' as checkout_bindings; +import 'bindings/repository.dart' as bindings; import 'bindings/reset.dart' as reset_bindings; -import 'bindings/diff.dart' as diff_bindings; -import 'bindings/attr.dart' as attr_bindings; -import 'bindings/graph.dart' as graph_bindings; -import 'bindings/describe.dart' as describe_bindings; +import 'bindings/status.dart' as status_bindings; import 'util.dart'; class Repository { diff --git a/lib/src/tag.dart b/lib/src/tag.dart index 4c5970b..8f235b5 100644 --- a/lib/src/tag.dart +++ b/lib/src/tag.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:libgit2dart/libgit2dart.dart'; + import 'bindings/libgit2_bindings.dart'; -import 'bindings/tag.dart' as bindings; import 'bindings/object.dart' as object_bindings; +import 'bindings/tag.dart' as bindings; class Tag { /// Initializes a new instance of [Tag] class from provided pointer to diff --git a/lib/src/tree.dart b/lib/src/tree.dart index 357f30a..efc2af9 100644 --- a/lib/src/tree.dart +++ b/lib/src/tree.dart @@ -1,8 +1,10 @@ import 'dart:ffi'; + import 'package:libgit2dart/libgit2dart.dart'; + +import 'bindings/diff.dart' as diff_bindings; import 'bindings/libgit2_bindings.dart'; import 'bindings/tree.dart' as bindings; -import 'bindings/diff.dart' as diff_bindings; class Tree { /// Initializes a new instance of [Tree] class from provided pointer to diff --git a/lib/src/util.dart b/lib/src/util.dart index 6c2f70c..1b13122 100644 --- a/lib/src/util.dart +++ b/lib/src/util.dart @@ -1,7 +1,8 @@ // coverage:ignore-file -import 'dart:io'; import 'dart:ffi'; +import 'dart:io'; + import 'bindings/libgit2_bindings.dart'; DynamicLibrary loadLibrary() { diff --git a/test/blame_test.dart b/test/blame_test.dart index 9c6f327..4ebd9e3 100644 --- a/test/blame_test.dart +++ b/test/blame_test.dart @@ -1,6 +1,8 @@ import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/blob_test.dart b/test/blob_test.dart index 4655194..6456275 100644 --- a/test/blob_test.dart +++ b/test/blob_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/branch_test.dart b/test/branch_test.dart index 1c301cf..10f16ef 100644 --- a/test/branch_test.dart +++ b/test/branch_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/checkout_test.dart b/test/checkout_test.dart index 9af8d96..8d46d56 100644 --- a/test/checkout_test.dart +++ b/test/checkout_test.dart @@ -1,7 +1,9 @@ import 'dart:io'; + +import 'package:libgit2dart/libgit2dart.dart'; import 'package:libgit2dart/src/git_types.dart'; import 'package:test/test.dart'; -import 'package:libgit2dart/libgit2dart.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/commit_test.dart b/test/commit_test.dart index 987b9d2..fa9e2ed 100644 --- a/test/commit_test.dart +++ b/test/commit_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/config_test.dart b/test/config_test.dart index b73536d..e1478f5 100644 --- a/test/config_test.dart +++ b/test/config_test.dart @@ -1,6 +1,7 @@ import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; void main() { final tmpDir = Directory.systemTemp.path; diff --git a/test/credentials_test.dart b/test/credentials_test.dart index f103737..a9ff2f7 100644 --- a/test/credentials_test.dart +++ b/test/credentials_test.dart @@ -1,6 +1,7 @@ import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; void main() { final cloneDir = Directory('${Directory.systemTemp.path}/credentials_cloned'); diff --git a/test/describe_test.dart b/test/describe_test.dart index 12ab8f4..9a97fe2 100644 --- a/test/describe_test.dart +++ b/test/describe_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/diff_test.dart b/test/diff_test.dart index 559e90a..8d1d9c7 100644 --- a/test/diff_test.dart +++ b/test/diff_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/features_test.dart b/test/features_test.dart index d2df857..457dcb4 100644 --- a/test/features_test.dart +++ b/test/features_test.dart @@ -1,5 +1,5 @@ -import 'package:test/test.dart'; import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; void main() { group('Features', () { diff --git a/test/git_types_test.dart b/test/git_types_test.dart index c83eaf1..37770fd 100644 --- a/test/git_types_test.dart +++ b/test/git_types_test.dart @@ -1,6 +1,6 @@ +import 'package:libgit2dart/libgit2dart.dart'; import 'package:libgit2dart/src/git_types.dart'; import 'package:test/test.dart'; -import 'package:libgit2dart/libgit2dart.dart'; void main() { group('GitTypes', () { diff --git a/test/index_test.dart b/test/index_test.dart index b8f52c9..519f2e1 100644 --- a/test/index_test.dart +++ b/test/index_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/mailmap_test.dart b/test/mailmap_test.dart index 0d21594..44bd05e 100644 --- a/test/mailmap_test.dart +++ b/test/mailmap_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/merge_test.dart b/test/merge_test.dart index 1d0da86..6ba681f 100644 --- a/test/merge_test.dart +++ b/test/merge_test.dart @@ -2,8 +2,10 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/note_test.dart b/test/note_test.dart index 990c2d9..7a5af7e 100644 --- a/test/note_test.dart +++ b/test/note_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/odb_test.dart b/test/odb_test.dart index d5ec1f0..51f8a97 100644 --- a/test/odb_test.dart +++ b/test/odb_test.dart @@ -1,6 +1,8 @@ import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/oid_test.dart b/test/oid_test.dart index 356413f..c9b793a 100644 --- a/test/oid_test.dart +++ b/test/oid_test.dart @@ -1,7 +1,9 @@ -import 'dart:io'; import 'dart:ffi'; -import 'package:test/test.dart'; +import 'dart:io'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/packbuilder_test.dart b/test/packbuilder_test.dart index fa7c470..b3637cf 100644 --- a/test/packbuilder_test.dart +++ b/test/packbuilder_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/patch_test.dart b/test/patch_test.dart index 0fa5e6a..e9a69ce 100644 --- a/test/patch_test.dart +++ b/test/patch_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/rebase_test.dart b/test/rebase_test.dart index da3377d..2d2a703 100644 --- a/test/rebase_test.dart +++ b/test/rebase_test.dart @@ -1,6 +1,8 @@ import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/reference_test.dart b/test/reference_test.dart index c76b12b..6736322 100644 --- a/test/reference_test.dart +++ b/test/reference_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/reflog_test.dart b/test/reflog_test.dart index f2049fa..377e036 100644 --- a/test/reflog_test.dart +++ b/test/reflog_test.dart @@ -1,6 +1,8 @@ import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/remote_prune_test.dart b/test/remote_prune_test.dart index 7cbfd7b..0f335d6 100644 --- a/test/remote_prune_test.dart +++ b/test/remote_prune_test.dart @@ -1,6 +1,8 @@ import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/remote_test.dart b/test/remote_test.dart index c2d88a8..c2871e5 100644 --- a/test/remote_test.dart +++ b/test/remote_test.dart @@ -1,7 +1,9 @@ import 'dart:io'; + +import 'package:libgit2dart/libgit2dart.dart'; import 'package:libgit2dart/src/git_types.dart'; import 'package:test/test.dart'; -import 'package:libgit2dart/libgit2dart.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/repository_clone_test.dart b/test/repository_clone_test.dart index d529ba8..9190e75 100644 --- a/test/repository_clone_test.dart +++ b/test/repository_clone_test.dart @@ -1,6 +1,8 @@ import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/repository_empty_test.dart b/test/repository_empty_test.dart index 3dfebfa..d6e7dc2 100644 --- a/test/repository_empty_test.dart +++ b/test/repository_empty_test.dart @@ -1,7 +1,8 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; void main() { late Repository repo; diff --git a/test/repository_init_test.dart b/test/repository_init_test.dart index a4084f6..958737c 100644 --- a/test/repository_init_test.dart +++ b/test/repository_init_test.dart @@ -1,6 +1,7 @@ import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; void main() { late Repository repo; diff --git a/test/repository_test.dart b/test/repository_test.dart index c6dac56..6a07dd5 100644 --- a/test/repository_test.dart +++ b/test/repository_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/reset_test.dart b/test/reset_test.dart index 4c30164..5231fcc 100644 --- a/test/reset_test.dart +++ b/test/reset_test.dart @@ -1,6 +1,8 @@ import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/revparse_test.dart b/test/revparse_test.dart index 7f73551..1b9c5eb 100644 --- a/test/revparse_test.dart +++ b/test/revparse_test.dart @@ -1,6 +1,8 @@ import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/revwalk_test.dart b/test/revwalk_test.dart index 6afda74..b3a1721 100644 --- a/test/revwalk_test.dart +++ b/test/revwalk_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/signature_test.dart b/test/signature_test.dart index 4ec69d0..4578f00 100644 --- a/test/signature_test.dart +++ b/test/signature_test.dart @@ -1,5 +1,5 @@ -import 'package:test/test.dart'; import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; void main() { late Signature signature; diff --git a/test/stash_test.dart b/test/stash_test.dart index 28adb4f..97bf646 100644 --- a/test/stash_test.dart +++ b/test/stash_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/submodule_test.dart b/test/submodule_test.dart index a14886e..6aec63f 100644 --- a/test/submodule_test.dart +++ b/test/submodule_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/tag_test.dart b/test/tag_test.dart index a37ba1f..1cf688c 100644 --- a/test/tag_test.dart +++ b/test/tag_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/tree_test.dart b/test/tree_test.dart index 1a4b47c..0d39739 100644 --- a/test/tree_test.dart +++ b/test/tree_test.dart @@ -1,6 +1,8 @@ import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/treebuilder_test.dart b/test/treebuilder_test.dart index 59b2ce3..75ff970 100644 --- a/test/treebuilder_test.dart +++ b/test/treebuilder_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() { diff --git a/test/worktree_test.dart b/test/worktree_test.dart index c00487b..27b8308 100644 --- a/test/worktree_test.dart +++ b/test/worktree_test.dart @@ -1,7 +1,9 @@ import 'dart:ffi'; import 'dart:io'; -import 'package:test/test.dart'; + import 'package:libgit2dart/libgit2dart.dart'; +import 'package:test/test.dart'; + import 'helpers/util.dart'; void main() {