diff --git a/lib/src/bindings/blob.dart b/lib/src/bindings/blob.dart index 4557078..b69edc5 100644 --- a/lib/src/bindings/blob.dart +++ b/lib/src/bindings/blob.dart @@ -123,5 +123,51 @@ Pointer createFromDisk({ } } +/// Create an in-memory copy of a blob. The copy must be explicitly free'd or +/// it will leak. +Pointer duplicate(Pointer source) { + final out = calloc>(); + libgit2.git_blob_dup(out, source); + return out.value; +} + +/// Get a buffer with the filtered content of a blob. +/// +/// This applies filters as if the blob was being checked out to the working +/// directory under the specified filename. This may apply CRLF filtering or +/// other types of changes depending on the file attributes set for the blob +/// and the content detected in it. +/// +/// Throws a [LibGit2Error] if error occured. +String filterContent({ + required Pointer blobPointer, + required String asPath, + required int flags, + git_oid? attributesCommit, +}) { + final out = calloc(); + final asPathC = asPath.toNativeUtf8().cast(); + final opts = calloc(); + libgit2.git_blob_filter_options_init(opts, GIT_BLOB_FILTER_OPTIONS_VERSION); + opts.ref.flags = flags; + if (attributesCommit != null) { + opts.ref.attr_commit_id = attributesCommit; + } + + final error = libgit2.git_blob_filter(out, blobPointer, asPathC, opts); + + calloc.free(asPathC); + calloc.free(opts); + + if (error < 0) { + calloc.free(out); + throw LibGit2Error(libgit2.git_error_last()); + } else { + final result = out.ref.ptr.cast().toDartString(length: out.ref.size); + calloc.free(out); + return result; + } +} + /// Close an open blob to release memory. void free(Pointer blob) => libgit2.git_blob_free(blob); diff --git a/lib/src/blob.dart b/lib/src/blob.dart index b3e38f9..c1bce91 100644 --- a/lib/src/blob.dart +++ b/lib/src/blob.dart @@ -80,6 +80,11 @@ class Blob { /// Size in bytes of the contents of a blob. int get size => bindings.size(_blobPointer); + /// Creates an in-memory copy of a blob. + /// + /// **IMPORTANT**: Should be freed to release allocated memory. + Blob duplicate() => Blob(bindings.duplicate(_blobPointer)); + /// Directly generates a [Patch] from the difference between two blobs. /// /// [newBlob] is the blob for new side of diff, or null for empty blob. @@ -161,6 +166,35 @@ class Blob { ); } + /// Returns filtered content of a blob. + /// + /// This applies filters as if the blob was being checked out to the working + /// directory under the specified filename. This may apply CRLF filtering or + /// other types of changes depending on the file attributes set for the blob + /// and the content detected in it. + /// + /// [asPath] is path used for file attribute lookups, etc. + /// + /// [flags] is a combination of [GitBlobFilter] flags to use for filtering + /// the blob. Defaults to none. + /// + /// [attributesCommit] is the commit to load attributes from, when + /// [GitBlobFilter.attributesFromCommit] is provided in [flags]. + /// + /// Throws a [LibGit2Error] if error occured. + String filterContent({ + required String asPath, + Set flags = const {}, + Commit? attributesCommit, + }) { + return bindings.filterContent( + blobPointer: _blobPointer, + asPath: asPath, + flags: flags.fold(0, (acc, e) => acc | e.value), + attributesCommit: attributesCommit?.oid.pointer.ref, + ); + } + /// Releases memory allocated for blob object. void free() => bindings.free(_blobPointer); diff --git a/lib/src/git_types.dart b/lib/src/git_types.dart index 8c6d185..2140185 100644 --- a/lib/src/git_types.dart +++ b/lib/src/git_types.dart @@ -1728,3 +1728,40 @@ class GitIndexCapability { @override String toString() => 'GitIndexCapability.$_name'; } + +/// Flags to control the functionality of blob content filtering. +class GitBlobFilter { + const GitBlobFilter._(this._value, this._name); + final int _value; + final String _name; + + /// When set, filters will not be applied to binary files. + static const checkForBinary = GitBlobFilter._(1, 'checkForBinary'); + + /// When set, filters will not load configuration from the + /// system-wide `gitattributes` in `/etc` (or system equivalent). + static const noSystemAttributes = GitBlobFilter._(2, 'noSystemAttributes'); + + /// When set, filters will be loaded from a `.gitattributes` file + /// in the HEAD commit. + static const attributesFromHead = GitBlobFilter._(4, 'attributesFromHead'); + + /// When set, filters will be loaded from a `.gitattributes` file + /// in the specified commit. + static const attributesFromCommit = GitBlobFilter._( + 8, + 'attributesFromCommit', + ); + + static const List values = [ + checkForBinary, + noSystemAttributes, + attributesFromHead, + attributesFromCommit, + ]; + + int get value => _value; + + @override + String toString() => 'GitBlobFilter.$_name'; +} diff --git a/lib/src/repository.dart b/lib/src/repository.dart index 93328ec..01c6a07 100644 --- a/lib/src/repository.dart +++ b/lib/src/repository.dart @@ -1142,7 +1142,7 @@ class Repository { } /// Checkouts the provided reference [refName] using the given strategy, and - /// update the HEAD. + /// updates the HEAD. /// /// If no reference [refName] is given, checkouts from the index. /// diff --git a/test/assets/attributes_repo/.gitdir/COMMIT_EDITMSG b/test/assets/attributes_repo/.gitdir/COMMIT_EDITMSG new file mode 100644 index 0000000..4484091 --- /dev/null +++ b/test/assets/attributes_repo/.gitdir/COMMIT_EDITMSG @@ -0,0 +1 @@ +add .gitattributes diff --git a/test/assets/blamerepo/.gitdir/HEAD b/test/assets/attributes_repo/.gitdir/HEAD similarity index 100% rename from test/assets/blamerepo/.gitdir/HEAD rename to test/assets/attributes_repo/.gitdir/HEAD diff --git a/test/assets/blamerepo/.gitdir/ORIG_HEAD b/test/assets/attributes_repo/.gitdir/ORIG_HEAD similarity index 100% rename from test/assets/blamerepo/.gitdir/ORIG_HEAD rename to test/assets/attributes_repo/.gitdir/ORIG_HEAD diff --git a/test/assets/blamerepo/.gitdir/branches/empty_marker b/test/assets/attributes_repo/.gitdir/branches/empty_marker similarity index 100% rename from test/assets/blamerepo/.gitdir/branches/empty_marker rename to test/assets/attributes_repo/.gitdir/branches/empty_marker diff --git a/test/assets/testrepo/.gitdir/config b/test/assets/attributes_repo/.gitdir/config similarity index 100% rename from test/assets/testrepo/.gitdir/config rename to test/assets/attributes_repo/.gitdir/config diff --git a/test/assets/blamerepo/.gitdir/description b/test/assets/attributes_repo/.gitdir/description similarity index 100% rename from test/assets/blamerepo/.gitdir/description rename to test/assets/attributes_repo/.gitdir/description diff --git a/test/assets/blamerepo/.gitdir/hooks/applypatch-msg.sample b/test/assets/attributes_repo/.gitdir/hooks/applypatch-msg.sample similarity index 100% rename from test/assets/blamerepo/.gitdir/hooks/applypatch-msg.sample rename to test/assets/attributes_repo/.gitdir/hooks/applypatch-msg.sample diff --git a/test/assets/blamerepo/.gitdir/hooks/commit-msg.sample b/test/assets/attributes_repo/.gitdir/hooks/commit-msg.sample similarity index 100% rename from test/assets/blamerepo/.gitdir/hooks/commit-msg.sample rename to test/assets/attributes_repo/.gitdir/hooks/commit-msg.sample diff --git a/test/assets/blamerepo/.gitdir/hooks/fsmonitor-watchman.sample b/test/assets/attributes_repo/.gitdir/hooks/fsmonitor-watchman.sample similarity index 100% rename from test/assets/blamerepo/.gitdir/hooks/fsmonitor-watchman.sample rename to test/assets/attributes_repo/.gitdir/hooks/fsmonitor-watchman.sample diff --git a/test/assets/blamerepo/.gitdir/hooks/post-update.sample b/test/assets/attributes_repo/.gitdir/hooks/post-update.sample similarity index 100% rename from test/assets/blamerepo/.gitdir/hooks/post-update.sample rename to test/assets/attributes_repo/.gitdir/hooks/post-update.sample diff --git a/test/assets/blamerepo/.gitdir/hooks/pre-applypatch.sample b/test/assets/attributes_repo/.gitdir/hooks/pre-applypatch.sample similarity index 100% rename from test/assets/blamerepo/.gitdir/hooks/pre-applypatch.sample rename to test/assets/attributes_repo/.gitdir/hooks/pre-applypatch.sample diff --git a/test/assets/blamerepo/.gitdir/hooks/pre-commit.sample b/test/assets/attributes_repo/.gitdir/hooks/pre-commit.sample similarity index 100% rename from test/assets/blamerepo/.gitdir/hooks/pre-commit.sample rename to test/assets/attributes_repo/.gitdir/hooks/pre-commit.sample diff --git a/test/assets/blamerepo/.gitdir/hooks/pre-merge-commit.sample b/test/assets/attributes_repo/.gitdir/hooks/pre-merge-commit.sample similarity index 100% rename from test/assets/blamerepo/.gitdir/hooks/pre-merge-commit.sample rename to test/assets/attributes_repo/.gitdir/hooks/pre-merge-commit.sample diff --git a/test/assets/blamerepo/.gitdir/hooks/pre-push.sample b/test/assets/attributes_repo/.gitdir/hooks/pre-push.sample similarity index 100% rename from test/assets/blamerepo/.gitdir/hooks/pre-push.sample rename to test/assets/attributes_repo/.gitdir/hooks/pre-push.sample diff --git a/test/assets/blamerepo/.gitdir/hooks/pre-rebase.sample b/test/assets/attributes_repo/.gitdir/hooks/pre-rebase.sample similarity index 100% rename from test/assets/blamerepo/.gitdir/hooks/pre-rebase.sample rename to test/assets/attributes_repo/.gitdir/hooks/pre-rebase.sample diff --git a/test/assets/blamerepo/.gitdir/hooks/pre-receive.sample b/test/assets/attributes_repo/.gitdir/hooks/pre-receive.sample similarity index 100% rename from test/assets/blamerepo/.gitdir/hooks/pre-receive.sample rename to test/assets/attributes_repo/.gitdir/hooks/pre-receive.sample diff --git a/test/assets/blamerepo/.gitdir/hooks/prepare-commit-msg.sample b/test/assets/attributes_repo/.gitdir/hooks/prepare-commit-msg.sample similarity index 100% rename from test/assets/blamerepo/.gitdir/hooks/prepare-commit-msg.sample rename to test/assets/attributes_repo/.gitdir/hooks/prepare-commit-msg.sample diff --git a/test/assets/blamerepo/.gitdir/hooks/push-to-checkout.sample b/test/assets/attributes_repo/.gitdir/hooks/push-to-checkout.sample similarity index 100% rename from test/assets/blamerepo/.gitdir/hooks/push-to-checkout.sample rename to test/assets/attributes_repo/.gitdir/hooks/push-to-checkout.sample diff --git a/test/assets/blamerepo/.gitdir/hooks/update.sample b/test/assets/attributes_repo/.gitdir/hooks/update.sample similarity index 100% rename from test/assets/blamerepo/.gitdir/hooks/update.sample rename to test/assets/attributes_repo/.gitdir/hooks/update.sample diff --git a/test/assets/attributes_repo/.gitdir/index b/test/assets/attributes_repo/.gitdir/index new file mode 100644 index 0000000..baec139 Binary files /dev/null and b/test/assets/attributes_repo/.gitdir/index differ diff --git a/test/assets/blamerepo/.gitdir/info/exclude b/test/assets/attributes_repo/.gitdir/info/exclude similarity index 100% rename from test/assets/blamerepo/.gitdir/info/exclude rename to test/assets/attributes_repo/.gitdir/info/exclude diff --git a/test/assets/attributes_repo/.gitdir/logs/HEAD b/test/assets/attributes_repo/.gitdir/logs/HEAD new file mode 100644 index 0000000..280a875 --- /dev/null +++ b/test/assets/attributes_repo/.gitdir/logs/HEAD @@ -0,0 +1,12 @@ +0000000000000000000000000000000000000000 f17d0d48eae3aa08cecf29128a35e310c97b3521 Aleksey Kulikov 1626090830 +0300 commit (initial): init +f17d0d48eae3aa08cecf29128a35e310c97b3521 f17d0d48eae3aa08cecf29128a35e310c97b3521 Aleksey Kulikov 1626090891 +0300 checkout: moving from master to feature +f17d0d48eae3aa08cecf29128a35e310c97b3521 6cbc22e509d72758ab4c8d9f287ea846b90c448b Aleksey Kulikov 1626091020 +0300 commit: add feature file +6cbc22e509d72758ab4c8d9f287ea846b90c448b fc38877b2552ab554752d9a77e1f48f738cca79b Aleksey Kulikov 1626091054 +0300 commit: edit feature file +fc38877b2552ab554752d9a77e1f48f738cca79b f17d0d48eae3aa08cecf29128a35e310c97b3521 Aleksey Kulikov 1626091067 +0300 checkout: moving from feature to master +f17d0d48eae3aa08cecf29128a35e310c97b3521 c68ff54aabf660fcdd9a2838d401583fe31249e3 Aleksey Kulikov 1626091171 +0300 commit: add .gitignore +c68ff54aabf660fcdd9a2838d401583fe31249e3 78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 Aleksey Kulikov 1626091184 +0300 merge feature: Merge made by the 'recursive' strategy. +78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 fc38877b2552ab554752d9a77e1f48f738cca79b Aleksey Kulikov 1626091245 +0300 checkout: moving from master to feature +fc38877b2552ab554752d9a77e1f48f738cca79b 5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 Aleksey Kulikov 1626091274 +0300 commit: add another feature file +5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 Aleksey Kulikov 1626091285 +0300 checkout: moving from feature to master +78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 821ed6e80627b8769d170a293862f9fc60825226 Aleksey Kulikov 1630568461 +0300 commit: add subdirectory file +821ed6e80627b8769d170a293862f9fc60825226 d2f3abc9324a22a9f80fec2c131ec43c93430618 Aleksey Kulikov 1640009945 +0300 commit: add .gitattributes diff --git a/test/assets/blamerepo/.gitdir/logs/refs/heads/feature b/test/assets/attributes_repo/.gitdir/logs/refs/heads/feature similarity index 100% rename from test/assets/blamerepo/.gitdir/logs/refs/heads/feature rename to test/assets/attributes_repo/.gitdir/logs/refs/heads/feature diff --git a/test/assets/attributes_repo/.gitdir/logs/refs/heads/master b/test/assets/attributes_repo/.gitdir/logs/refs/heads/master new file mode 100644 index 0000000..aea5f3a --- /dev/null +++ b/test/assets/attributes_repo/.gitdir/logs/refs/heads/master @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 f17d0d48eae3aa08cecf29128a35e310c97b3521 Aleksey Kulikov 1626090830 +0300 commit (initial): init +f17d0d48eae3aa08cecf29128a35e310c97b3521 c68ff54aabf660fcdd9a2838d401583fe31249e3 Aleksey Kulikov 1626091171 +0300 commit: add .gitignore +c68ff54aabf660fcdd9a2838d401583fe31249e3 78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 Aleksey Kulikov 1626091184 +0300 merge feature: Merge made by the 'recursive' strategy. +78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 821ed6e80627b8769d170a293862f9fc60825226 Aleksey Kulikov 1630568461 +0300 commit: add subdirectory file +821ed6e80627b8769d170a293862f9fc60825226 d2f3abc9324a22a9f80fec2c131ec43c93430618 Aleksey Kulikov 1640009945 +0300 commit: add .gitattributes diff --git a/test/assets/mailmaprepo/.gitdir/logs/refs/notes/commits b/test/assets/attributes_repo/.gitdir/logs/refs/notes/commits similarity index 100% rename from test/assets/mailmaprepo/.gitdir/logs/refs/notes/commits rename to test/assets/attributes_repo/.gitdir/logs/refs/notes/commits diff --git a/test/assets/mailmaprepo/.gitdir/objects/00/eb1490ff4e39fa29c0ef352a9f93989b7018f8 b/test/assets/attributes_repo/.gitdir/objects/00/eb1490ff4e39fa29c0ef352a9f93989b7018f8 similarity index 100% rename from test/assets/mailmaprepo/.gitdir/objects/00/eb1490ff4e39fa29c0ef352a9f93989b7018f8 rename to test/assets/attributes_repo/.gitdir/objects/00/eb1490ff4e39fa29c0ef352a9f93989b7018f8 diff --git a/test/assets/blamerepo/.gitdir/objects/13/77554ebea6f98a2c748183bc5a96852af12ac2 b/test/assets/attributes_repo/.gitdir/objects/13/77554ebea6f98a2c748183bc5a96852af12ac2 similarity index 100% rename from test/assets/blamerepo/.gitdir/objects/13/77554ebea6f98a2c748183bc5a96852af12ac2 rename to test/assets/attributes_repo/.gitdir/objects/13/77554ebea6f98a2c748183bc5a96852af12ac2 diff --git a/test/assets/blamerepo/.gitdir/objects/47/d45fb10db26250b58f0678975a609031b7e427 b/test/assets/attributes_repo/.gitdir/objects/47/d45fb10db26250b58f0678975a609031b7e427 similarity index 100% rename from test/assets/blamerepo/.gitdir/objects/47/d45fb10db26250b58f0678975a609031b7e427 rename to test/assets/attributes_repo/.gitdir/objects/47/d45fb10db26250b58f0678975a609031b7e427 diff --git a/test/assets/blamerepo/.gitdir/objects/5a/ecfa0fb97eadaac050ccb99f03c3fb65460ad4 b/test/assets/attributes_repo/.gitdir/objects/5a/ecfa0fb97eadaac050ccb99f03c3fb65460ad4 similarity index 100% rename from test/assets/blamerepo/.gitdir/objects/5a/ecfa0fb97eadaac050ccb99f03c3fb65460ad4 rename to test/assets/attributes_repo/.gitdir/objects/5a/ecfa0fb97eadaac050ccb99f03c3fb65460ad4 diff --git a/test/assets/blamerepo/.gitdir/objects/66/bd6147704f78165d764ce8348ccaec81415db4 b/test/assets/attributes_repo/.gitdir/objects/66/bd6147704f78165d764ce8348ccaec81415db4 similarity index 100% rename from test/assets/blamerepo/.gitdir/objects/66/bd6147704f78165d764ce8348ccaec81415db4 rename to test/assets/attributes_repo/.gitdir/objects/66/bd6147704f78165d764ce8348ccaec81415db4 diff --git a/test/assets/blamerepo/.gitdir/objects/6c/bc22e509d72758ab4c8d9f287ea846b90c448b b/test/assets/attributes_repo/.gitdir/objects/6c/bc22e509d72758ab4c8d9f287ea846b90c448b similarity index 100% rename from test/assets/blamerepo/.gitdir/objects/6c/bc22e509d72758ab4c8d9f287ea846b90c448b rename to test/assets/attributes_repo/.gitdir/objects/6c/bc22e509d72758ab4c8d9f287ea846b90c448b diff --git a/test/assets/blamerepo/.gitdir/objects/77/96359a96eb722939c24bafdb1afe9f07f2f628 b/test/assets/attributes_repo/.gitdir/objects/77/96359a96eb722939c24bafdb1afe9f07f2f628 similarity index 100% rename from test/assets/blamerepo/.gitdir/objects/77/96359a96eb722939c24bafdb1afe9f07f2f628 rename to test/assets/attributes_repo/.gitdir/objects/77/96359a96eb722939c24bafdb1afe9f07f2f628 diff --git a/test/assets/blamerepo/.gitdir/objects/78/b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 b/test/assets/attributes_repo/.gitdir/objects/78/b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 similarity index 100% rename from test/assets/blamerepo/.gitdir/objects/78/b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 rename to test/assets/attributes_repo/.gitdir/objects/78/b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 diff --git a/test/assets/blamerepo/.gitdir/objects/82/1ed6e80627b8769d170a293862f9fc60825226 b/test/assets/attributes_repo/.gitdir/objects/82/1ed6e80627b8769d170a293862f9fc60825226 similarity index 100% rename from test/assets/blamerepo/.gitdir/objects/82/1ed6e80627b8769d170a293862f9fc60825226 rename to test/assets/attributes_repo/.gitdir/objects/82/1ed6e80627b8769d170a293862f9fc60825226 diff --git a/test/assets/blamerepo/.gitdir/objects/83/2ff991b09f5ee3d90dc42ad6db5de4eda92989 b/test/assets/attributes_repo/.gitdir/objects/83/2ff991b09f5ee3d90dc42ad6db5de4eda92989 similarity index 100% rename from test/assets/blamerepo/.gitdir/objects/83/2ff991b09f5ee3d90dc42ad6db5de4eda92989 rename to test/assets/attributes_repo/.gitdir/objects/83/2ff991b09f5ee3d90dc42ad6db5de4eda92989 diff --git a/test/assets/blamerepo/.gitdir/objects/94/3280edca05349fbc08286ab85bb7ec47e3610b b/test/assets/attributes_repo/.gitdir/objects/94/3280edca05349fbc08286ab85bb7ec47e3610b similarity index 100% rename from test/assets/blamerepo/.gitdir/objects/94/3280edca05349fbc08286ab85bb7ec47e3610b rename to test/assets/attributes_repo/.gitdir/objects/94/3280edca05349fbc08286ab85bb7ec47e3610b diff --git a/test/assets/blamerepo/.gitdir/objects/9c/78c21d6680a7ffebc76f7ac68cacc11d8f48bc b/test/assets/attributes_repo/.gitdir/objects/9c/78c21d6680a7ffebc76f7ac68cacc11d8f48bc similarity index 100% rename from test/assets/blamerepo/.gitdir/objects/9c/78c21d6680a7ffebc76f7ac68cacc11d8f48bc rename to test/assets/attributes_repo/.gitdir/objects/9c/78c21d6680a7ffebc76f7ac68cacc11d8f48bc diff --git a/test/assets/blamerepo/.gitdir/objects/a8/ae3dd59e6e1802c6f78e05e301bfd57c9f334f b/test/assets/attributes_repo/.gitdir/objects/a8/ae3dd59e6e1802c6f78e05e301bfd57c9f334f similarity index 100% rename from test/assets/blamerepo/.gitdir/objects/a8/ae3dd59e6e1802c6f78e05e301bfd57c9f334f rename to test/assets/attributes_repo/.gitdir/objects/a8/ae3dd59e6e1802c6f78e05e301bfd57c9f334f diff --git a/test/assets/mailmaprepo/.gitdir/objects/af/1bbb249ea750bbfa66c1e7fd879622c2dbfe3a b/test/assets/attributes_repo/.gitdir/objects/af/1bbb249ea750bbfa66c1e7fd879622c2dbfe3a similarity index 100% rename from test/assets/mailmaprepo/.gitdir/objects/af/1bbb249ea750bbfa66c1e7fd879622c2dbfe3a rename to test/assets/attributes_repo/.gitdir/objects/af/1bbb249ea750bbfa66c1e7fd879622c2dbfe3a diff --git a/test/assets/mailmaprepo/.gitdir/objects/b2/36335c81848293b04ac099b82a2843d5ce3423 b/test/assets/attributes_repo/.gitdir/objects/b2/36335c81848293b04ac099b82a2843d5ce3423 similarity index 100% rename from test/assets/mailmaprepo/.gitdir/objects/b2/36335c81848293b04ac099b82a2843d5ce3423 rename to test/assets/attributes_repo/.gitdir/objects/b2/36335c81848293b04ac099b82a2843d5ce3423 diff --git a/test/assets/blamerepo/.gitdir/objects/be/83750b8d9ca12d7f142a7060926e66b10db1c0 b/test/assets/attributes_repo/.gitdir/objects/be/83750b8d9ca12d7f142a7060926e66b10db1c0 similarity index 100% rename from test/assets/blamerepo/.gitdir/objects/be/83750b8d9ca12d7f142a7060926e66b10db1c0 rename to test/assets/attributes_repo/.gitdir/objects/be/83750b8d9ca12d7f142a7060926e66b10db1c0 diff --git a/test/assets/blamerepo/.gitdir/objects/c6/8ff54aabf660fcdd9a2838d401583fe31249e3 b/test/assets/attributes_repo/.gitdir/objects/c6/8ff54aabf660fcdd9a2838d401583fe31249e3 similarity index 100% rename from test/assets/blamerepo/.gitdir/objects/c6/8ff54aabf660fcdd9a2838d401583fe31249e3 rename to test/assets/attributes_repo/.gitdir/objects/c6/8ff54aabf660fcdd9a2838d401583fe31249e3 diff --git a/test/assets/attributes_repo/.gitdir/objects/d2/f3abc9324a22a9f80fec2c131ec43c93430618 b/test/assets/attributes_repo/.gitdir/objects/d2/f3abc9324a22a9f80fec2c131ec43c93430618 new file mode 100644 index 0000000..2d93331 --- /dev/null +++ b/test/assets/attributes_repo/.gitdir/objects/d2/f3abc9324a22a9f80fec2c131ec43c93430618 @@ -0,0 +1,2 @@ +xAn @Ѯ9#E{ +%$UB*;w/V;uoP;|cHfb"ɞeYJv\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/test/assets/test_repo/.gitdir/hooks/fsmonitor-watchman.sample b/test/assets/test_repo/.gitdir/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000..14ed0aa --- /dev/null +++ b/test/assets/test_repo/.gitdir/hooks/fsmonitor-watchman.sample @@ -0,0 +1,173 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + } + my $query = <<" END"; + ["query", "$git_work_tree", { + "since": $last_update_token, + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/test/assets/test_repo/.gitdir/hooks/post-update.sample b/test/assets/test_repo/.gitdir/hooks/post-update.sample new file mode 100755 index 0000000..ee496e3 --- /dev/null +++ b/test/assets/test_repo/.gitdir/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/usr/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/test/assets/test_repo/.gitdir/hooks/pre-applypatch.sample b/test/assets/test_repo/.gitdir/hooks/pre-applypatch.sample new file mode 100755 index 0000000..845130a --- /dev/null +++ b/test/assets/test_repo/.gitdir/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/usr/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/test/assets/test_repo/.gitdir/hooks/pre-commit.sample b/test/assets/test_repo/.gitdir/hooks/pre-commit.sample new file mode 100755 index 0000000..be32e5f --- /dev/null +++ b/test/assets/test_repo/.gitdir/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/usr/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/test/assets/test_repo/.gitdir/hooks/pre-merge-commit.sample b/test/assets/test_repo/.gitdir/hooks/pre-merge-commit.sample new file mode 100755 index 0000000..09b65a5 --- /dev/null +++ b/test/assets/test_repo/.gitdir/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/usr/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/test/assets/test_repo/.gitdir/hooks/pre-push.sample b/test/assets/test_repo/.gitdir/hooks/pre-push.sample new file mode 100755 index 0000000..d5e513d --- /dev/null +++ b/test/assets/test_repo/.gitdir/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/usr/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/test/assets/test_repo/.gitdir/hooks/pre-rebase.sample b/test/assets/test_repo/.gitdir/hooks/pre-rebase.sample new file mode 100755 index 0000000..36efc64 --- /dev/null +++ b/test/assets/test_repo/.gitdir/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/usr/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/test/assets/test_repo/.gitdir/hooks/pre-receive.sample b/test/assets/test_repo/.gitdir/hooks/pre-receive.sample new file mode 100755 index 0000000..6f473c3 --- /dev/null +++ b/test/assets/test_repo/.gitdir/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/usr/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/test/assets/test_repo/.gitdir/hooks/prepare-commit-msg.sample b/test/assets/test_repo/.gitdir/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..cd8e794 --- /dev/null +++ b/test/assets/test_repo/.gitdir/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/usr/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/test/assets/test_repo/.gitdir/hooks/push-to-checkout.sample b/test/assets/test_repo/.gitdir/hooks/push-to-checkout.sample new file mode 100755 index 0000000..badb4b4 --- /dev/null +++ b/test/assets/test_repo/.gitdir/hooks/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/usr/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/test/assets/testrepo/.gitdir/index b/test/assets/test_repo/.gitdir/index similarity index 100% rename from test/assets/testrepo/.gitdir/index rename to test/assets/test_repo/.gitdir/index diff --git a/test/assets/test_repo/.gitdir/info/exclude b/test/assets/test_repo/.gitdir/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/test/assets/test_repo/.gitdir/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/test/assets/testrepo/.gitdir/logs/HEAD b/test/assets/test_repo/.gitdir/logs/HEAD similarity index 100% rename from test/assets/testrepo/.gitdir/logs/HEAD rename to test/assets/test_repo/.gitdir/logs/HEAD diff --git a/test/assets/test_repo/.gitdir/logs/refs/heads/feature b/test/assets/test_repo/.gitdir/logs/refs/heads/feature new file mode 100644 index 0000000..44be747 --- /dev/null +++ b/test/assets/test_repo/.gitdir/logs/refs/heads/feature @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 f17d0d48eae3aa08cecf29128a35e310c97b3521 Aleksey Kulikov 1626090891 +0300 branch: Created from HEAD +f17d0d48eae3aa08cecf29128a35e310c97b3521 6cbc22e509d72758ab4c8d9f287ea846b90c448b Aleksey Kulikov 1626091020 +0300 commit: add feature file +6cbc22e509d72758ab4c8d9f287ea846b90c448b fc38877b2552ab554752d9a77e1f48f738cca79b Aleksey Kulikov 1626091054 +0300 commit: edit feature file +fc38877b2552ab554752d9a77e1f48f738cca79b 5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 Aleksey Kulikov 1626091274 +0300 commit: add another feature file diff --git a/test/assets/testrepo/.gitdir/logs/refs/heads/master b/test/assets/test_repo/.gitdir/logs/refs/heads/master similarity index 100% rename from test/assets/testrepo/.gitdir/logs/refs/heads/master rename to test/assets/test_repo/.gitdir/logs/refs/heads/master diff --git a/test/assets/test_repo/.gitdir/logs/refs/notes/commits b/test/assets/test_repo/.gitdir/logs/refs/notes/commits new file mode 100644 index 0000000..b0fdfb1 --- /dev/null +++ b/test/assets/test_repo/.gitdir/logs/refs/notes/commits @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 af1bbb249ea750bbfa66c1e7fd879622c2dbfe3a Aleksey Kulikov 1633093379 +0300 notes: Notes added by 'git notes add' +af1bbb249ea750bbfa66c1e7fd879622c2dbfe3a 00eb1490ff4e39fa29c0ef352a9f93989b7018f8 Aleksey Kulikov 1633093431 +0300 notes: Notes added by 'git notes add' diff --git a/test/assets/test_repo/.gitdir/objects/00/eb1490ff4e39fa29c0ef352a9f93989b7018f8 b/test/assets/test_repo/.gitdir/objects/00/eb1490ff4e39fa29c0ef352a9f93989b7018f8 new file mode 100644 index 0000000..884de42 Binary files /dev/null and b/test/assets/test_repo/.gitdir/objects/00/eb1490ff4e39fa29c0ef352a9f93989b7018f8 differ diff --git a/test/assets/test_repo/.gitdir/objects/13/77554ebea6f98a2c748183bc5a96852af12ac2 b/test/assets/test_repo/.gitdir/objects/13/77554ebea6f98a2c748183bc5a96852af12ac2 new file mode 100644 index 0000000..c8ea349 Binary files /dev/null and b/test/assets/test_repo/.gitdir/objects/13/77554ebea6f98a2c748183bc5a96852af12ac2 differ diff --git a/test/assets/test_repo/.gitdir/objects/47/d45fb10db26250b58f0678975a609031b7e427 b/test/assets/test_repo/.gitdir/objects/47/d45fb10db26250b58f0678975a609031b7e427 new file mode 100644 index 0000000..72e7af0 Binary files /dev/null and b/test/assets/test_repo/.gitdir/objects/47/d45fb10db26250b58f0678975a609031b7e427 differ diff --git a/test/assets/test_repo/.gitdir/objects/5a/ecfa0fb97eadaac050ccb99f03c3fb65460ad4 b/test/assets/test_repo/.gitdir/objects/5a/ecfa0fb97eadaac050ccb99f03c3fb65460ad4 new file mode 100644 index 0000000..f5dd41b --- /dev/null +++ b/test/assets/test_repo/.gitdir/objects/5a/ecfa0fb97eadaac050ccb99f03c3fb65460ad4 @@ -0,0 +1,3 @@ +xMN0 @a9H69;LԦAinO->2zol0/l&kA1j./&P!Z\J1f2RbO5T +E̊y|n> _ oߝv+YU;U) 1c/ +mcQ \ No newline at end of file diff --git a/test/assets/test_repo/.gitdir/objects/66/bd6147704f78165d764ce8348ccaec81415db4 b/test/assets/test_repo/.gitdir/objects/66/bd6147704f78165d764ce8348ccaec81415db4 new file mode 100644 index 0000000..2da87bd Binary files /dev/null and b/test/assets/test_repo/.gitdir/objects/66/bd6147704f78165d764ce8348ccaec81415db4 differ diff --git a/test/assets/test_repo/.gitdir/objects/6c/bc22e509d72758ab4c8d9f287ea846b90c448b b/test/assets/test_repo/.gitdir/objects/6c/bc22e509d72758ab4c8d9f287ea846b90c448b new file mode 100644 index 0000000..c34215c Binary files /dev/null and b/test/assets/test_repo/.gitdir/objects/6c/bc22e509d72758ab4c8d9f287ea846b90c448b differ diff --git a/test/assets/test_repo/.gitdir/objects/77/96359a96eb722939c24bafdb1afe9f07f2f628 b/test/assets/test_repo/.gitdir/objects/77/96359a96eb722939c24bafdb1afe9f07f2f628 new file mode 100644 index 0000000..7ff0396 Binary files /dev/null and b/test/assets/test_repo/.gitdir/objects/77/96359a96eb722939c24bafdb1afe9f07f2f628 differ diff --git a/test/assets/test_repo/.gitdir/objects/78/b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 b/test/assets/test_repo/.gitdir/objects/78/b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 new file mode 100644 index 0000000..552d0b8 Binary files /dev/null and b/test/assets/test_repo/.gitdir/objects/78/b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 differ diff --git a/test/assets/test_repo/.gitdir/objects/82/1ed6e80627b8769d170a293862f9fc60825226 b/test/assets/test_repo/.gitdir/objects/82/1ed6e80627b8769d170a293862f9fc60825226 new file mode 100644 index 0000000..091c359 --- /dev/null +++ b/test/assets/test_repo/.gitdir/objects/82/1ed6e80627b8769d170a293862f9fc60825226 @@ -0,0 +1 @@ +xAn F9#E`,EU)0TG;t^Nz;̰Ў`zILaN"cRa4-I=L^G-bS?E_DZ}%C-來nn,U_ s!.JyyP \ No newline at end of file diff --git a/test/assets/test_repo/.gitdir/objects/83/2ff991b09f5ee3d90dc42ad6db5de4eda92989 b/test/assets/test_repo/.gitdir/objects/83/2ff991b09f5ee3d90dc42ad6db5de4eda92989 new file mode 100644 index 0000000..f8a5d06 Binary files /dev/null and b/test/assets/test_repo/.gitdir/objects/83/2ff991b09f5ee3d90dc42ad6db5de4eda92989 differ diff --git a/test/assets/test_repo/.gitdir/objects/94/3280edca05349fbc08286ab85bb7ec47e3610b b/test/assets/test_repo/.gitdir/objects/94/3280edca05349fbc08286ab85bb7ec47e3610b new file mode 100644 index 0000000..5fff1f4 Binary files /dev/null and b/test/assets/test_repo/.gitdir/objects/94/3280edca05349fbc08286ab85bb7ec47e3610b differ diff --git a/test/assets/test_repo/.gitdir/objects/9c/78c21d6680a7ffebc76f7ac68cacc11d8f48bc b/test/assets/test_repo/.gitdir/objects/9c/78c21d6680a7ffebc76f7ac68cacc11d8f48bc new file mode 100644 index 0000000..5220751 Binary files /dev/null and b/test/assets/test_repo/.gitdir/objects/9c/78c21d6680a7ffebc76f7ac68cacc11d8f48bc differ diff --git a/test/assets/test_repo/.gitdir/objects/a8/ae3dd59e6e1802c6f78e05e301bfd57c9f334f b/test/assets/test_repo/.gitdir/objects/a8/ae3dd59e6e1802c6f78e05e301bfd57c9f334f new file mode 100644 index 0000000..540dbbc Binary files /dev/null and b/test/assets/test_repo/.gitdir/objects/a8/ae3dd59e6e1802c6f78e05e301bfd57c9f334f differ diff --git a/test/assets/test_repo/.gitdir/objects/af/1bbb249ea750bbfa66c1e7fd879622c2dbfe3a b/test/assets/test_repo/.gitdir/objects/af/1bbb249ea750bbfa66c1e7fd879622c2dbfe3a new file mode 100644 index 0000000..6e6f5fc Binary files /dev/null and b/test/assets/test_repo/.gitdir/objects/af/1bbb249ea750bbfa66c1e7fd879622c2dbfe3a differ diff --git a/test/assets/test_repo/.gitdir/objects/b2/36335c81848293b04ac099b82a2843d5ce3423 b/test/assets/test_repo/.gitdir/objects/b2/36335c81848293b04ac099b82a2843d5ce3423 new file mode 100644 index 0000000..fe5f2c7 Binary files /dev/null and b/test/assets/test_repo/.gitdir/objects/b2/36335c81848293b04ac099b82a2843d5ce3423 differ diff --git a/test/assets/test_repo/.gitdir/objects/be/83750b8d9ca12d7f142a7060926e66b10db1c0 b/test/assets/test_repo/.gitdir/objects/be/83750b8d9ca12d7f142a7060926e66b10db1c0 new file mode 100644 index 0000000..f259ce7 Binary files /dev/null and b/test/assets/test_repo/.gitdir/objects/be/83750b8d9ca12d7f142a7060926e66b10db1c0 differ diff --git a/test/assets/test_repo/.gitdir/objects/c6/8ff54aabf660fcdd9a2838d401583fe31249e3 b/test/assets/test_repo/.gitdir/objects/c6/8ff54aabf660fcdd9a2838d401583fe31249e3 new file mode 100644 index 0000000..e2a64e4 --- /dev/null +++ b/test/assets/test_repo/.gitdir/objects/c6/8ff54aabf660fcdd9a2838d401583fe31249e3 @@ -0,0 +1 @@ +xAn @Ѯ9+Y3 HQծ{.!rO2@[kGɉq661~$,Q]6`%1[/,}@ڳ࢙5)~!M{?rKkR_@^09O4U_C  VFZ?E=e9.:?>`0t wյ^]PEB?6RgQM \ No newline at end of file diff --git a/test/assets/test_repo/.gitdir/refs/heads/feature b/test/assets/test_repo/.gitdir/refs/heads/feature new file mode 100644 index 0000000..3584be2 --- /dev/null +++ b/test/assets/test_repo/.gitdir/refs/heads/feature @@ -0,0 +1 @@ +5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 diff --git a/test/assets/testrepo/.gitdir/refs/heads/master b/test/assets/test_repo/.gitdir/refs/heads/master similarity index 100% rename from test/assets/testrepo/.gitdir/refs/heads/master rename to test/assets/test_repo/.gitdir/refs/heads/master diff --git a/test/assets/test_repo/.gitdir/refs/notes/commits b/test/assets/test_repo/.gitdir/refs/notes/commits new file mode 100644 index 0000000..d275d7d --- /dev/null +++ b/test/assets/test_repo/.gitdir/refs/notes/commits @@ -0,0 +1 @@ +00eb1490ff4e39fa29c0ef352a9f93989b7018f8 diff --git a/test/assets/testrepo/.gitdir/refs/remotes/origin/master b/test/assets/test_repo/.gitdir/refs/remotes/origin/master similarity index 100% rename from test/assets/testrepo/.gitdir/refs/remotes/origin/master rename to test/assets/test_repo/.gitdir/refs/remotes/origin/master diff --git a/test/assets/test_repo/.gitdir/refs/tags/v0.1 b/test/assets/test_repo/.gitdir/refs/tags/v0.1 new file mode 100644 index 0000000..e4cb9a5 --- /dev/null +++ b/test/assets/test_repo/.gitdir/refs/tags/v0.1 @@ -0,0 +1 @@ +78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 diff --git a/test/assets/test_repo/.gitdir/refs/tags/v0.2 b/test/assets/test_repo/.gitdir/refs/tags/v0.2 new file mode 100644 index 0000000..3e0b1fd --- /dev/null +++ b/test/assets/test_repo/.gitdir/refs/tags/v0.2 @@ -0,0 +1 @@ +f0fdbf506397e9f58c59b88dfdd72778ec06cc0c diff --git a/test/assets/test_repo/dir/dir_file.txt b/test/assets/test_repo/dir/dir_file.txt new file mode 100644 index 0000000..e69de29 diff --git a/test/assets/test_repo/feature_file b/test/assets/test_repo/feature_file new file mode 100644 index 0000000..9c78c21 --- /dev/null +++ b/test/assets/test_repo/feature_file @@ -0,0 +1 @@ +Feature edit diff --git a/test/assets/test_repo/file b/test/assets/test_repo/file new file mode 100644 index 0000000..e69de29 diff --git a/test/assets/test_repo/gitignore b/test/assets/test_repo/gitignore new file mode 100644 index 0000000..1377554 --- /dev/null +++ b/test/assets/test_repo/gitignore @@ -0,0 +1 @@ +*.swp diff --git a/test/blame_test.dart b/test/blame_test.dart index 0a4aef6..a8328ea 100644 --- a/test/blame_test.dart +++ b/test/blame_test.dart @@ -13,7 +13,7 @@ void main() { var hunks = >[]; setUp(() { - tmpDir = setupRepo(Directory('test/assets/blamerepo/')); + tmpDir = setupRepo(Directory('test/assets/blame_repo/')); repo = Repository.open(tmpDir.path); sig1 = Signature.create( name: 'Aleksey Kulikov', diff --git a/test/blob_test.dart b/test/blob_test.dart index 5041a09..efc6124 100644 --- a/test/blob_test.dart +++ b/test/blob_test.dart @@ -14,7 +14,7 @@ void main() { const newBlobContent = 'New blob\n'; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/attributes_repo/')); repo = Repository.open(tmpDir.path); }); @@ -107,6 +107,55 @@ void main() { ); }); + test('duplicates blob', () { + final blob = repo.lookupBlob(repo[blobSHA]); + final dupBlob = blob.duplicate(); + + expect(blob.oid.sha, dupBlob.oid.sha); + + dupBlob.free(); + blob.free(); + }); + + test('filters content of a blob', () { + final blobOid = repo.createBlob('clrf\nclrf\n'); + final blob = repo.lookupBlob(blobOid); + + expect(blob.filterContent(asPath: 'file.crlf'), 'clrf\r\nclrf\r\n'); + + blob.free(); + }); + + test('filters content of a blob with provided commit for attributes', () { + repo.checkout(refName: 'refs/tags/v0.2'); + + final blobOid = repo.createBlob('clrf\nclrf\n'); + final blob = repo.lookupBlob(blobOid); + + final commit = repo.lookupCommit( + repo['d2f3abc9324a22a9f80fec2c131ec43c93430618'], + ); + + expect( + blob.filterContent( + asPath: 'file.crlf', + flags: {GitBlobFilter.attributesFromCommit}, + attributesCommit: commit, + ), + 'clrf\r\nclrf\r\n', + ); + + commit.free(); + blob.free(); + }); + + test('throws when trying to filter content of a blob and error occurs', () { + expect( + () => Blob(nullptr).filterContent(asPath: ''), + throwsA(isA()), + ); + }); + group('diff', () { const path = 'feature_file'; const blobPatch = """ diff --git a/test/branch_test.dart b/test/branch_test.dart index e5e8304..ed89725 100644 --- a/test/branch_test.dart +++ b/test/branch_test.dart @@ -13,7 +13,7 @@ void main() { late Oid featureCommit; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); lastCommit = repo['821ed6e80627b8769d170a293862f9fc60825226']; featureCommit = repo['5aecfa0fb97eadaac050ccb99f03c3fb65460ad4']; diff --git a/test/checkout_test.dart b/test/checkout_test.dart index db6363f..d9863a0 100644 --- a/test/checkout_test.dart +++ b/test/checkout_test.dart @@ -10,7 +10,7 @@ void main() { late Directory tmpDir; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/commit_test.dart b/test/commit_test.dart index 47c7f4b..6865a04 100644 --- a/test/commit_test.dart +++ b/test/commit_test.dart @@ -16,7 +16,7 @@ void main() { const message = "Commit message.\n\nSome description.\n"; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); author = Signature.create( name: 'Author Name', diff --git a/test/describe_test.dart b/test/describe_test.dart index 5029cd1..d208ceb 100644 --- a/test/describe_test.dart +++ b/test/describe_test.dart @@ -11,7 +11,7 @@ void main() { late Directory tmpDir; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/diff_test.dart b/test/diff_test.dart index f53529e..24eadcb 100644 --- a/test/diff_test.dart +++ b/test/diff_test.dart @@ -78,7 +78,7 @@ index e69de29..c217c63 100644 """; setUp(() { - tmpDir = setupRepo(Directory('test/assets/dirtyrepo/')); + tmpDir = setupRepo(Directory('test/assets/dirty_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/git_types_test.dart b/test/git_types_test.dart index 7fc3961..04e60bb 100644 --- a/test/git_types_test.dart +++ b/test/git_types_test.dart @@ -576,5 +576,20 @@ void main() { ); }); }); + + group('GitBlobFilter', () { + test('returns correct values', () { + const expected = [1, 2, 4, 8]; + final actual = GitBlobFilter.values.map((e) => e.value).toList(); + expect(actual, expected); + }); + + test('returns string representation of object', () { + expect( + GitBlobFilter.checkForBinary.toString(), + 'GitBlobFilter.checkForBinary', + ); + }); + }); }); } diff --git a/test/helpers/util.dart b/test/helpers/util.dart index d1862e0..344ce03 100644 --- a/test/helpers/util.dart +++ b/test/helpers/util.dart @@ -25,6 +25,8 @@ void copyRepo({required Directory from, required Directory to}) { } else if (entity is File) { if (p.basename(entity.path) == 'gitignore') { entity.copySync(p.join(to.path, '.gitignore')); + } else if (p.basename(entity.path) == 'gitattributes') { + entity.copySync(p.join(to.path, '.gitattributes')); } else { entity.copySync(p.join(to.path, p.basename(entity.path))); } diff --git a/test/index_test.dart b/test/index_test.dart index 2d5ea50..a373ddc 100644 --- a/test/index_test.dart +++ b/test/index_test.dart @@ -12,7 +12,7 @@ void main() { late Directory tmpDir; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); index = repo.index; }); @@ -306,7 +306,7 @@ void main() { }); test('throws when trying to write tree while index have conflicts', () { - final tmpDir = setupRepo(Directory('test/assets/mergerepo/')); + final tmpDir = setupRepo(Directory('test/assets/merge_repo/')); final repo = Repository.open(tmpDir.path); final conflictBranch = repo.lookupBranch(name: 'conflict-branch'); @@ -335,7 +335,7 @@ void main() { }); test('returns conflicts with ancestor, our and their present', () { - final repoDir = setupRepo(Directory('test/assets/mergerepo/')); + final repoDir = setupRepo(Directory('test/assets/merge_repo/')); final conflictRepo = Repository.open(repoDir.path); final conflictBranch = conflictRepo.lookupBranch( @@ -360,7 +360,7 @@ void main() { }); test('returns conflicts with our and their present and null ancestor', () { - final repoDir = setupRepo(Directory('test/assets/mergerepo/')); + final repoDir = setupRepo(Directory('test/assets/merge_repo/')); final conflictRepo = Repository.open(repoDir.path); final conflictBranch = conflictRepo.lookupBranch(name: 'conflict-branch'); @@ -381,7 +381,7 @@ void main() { }); test('returns conflicts with ancestor and their present and null our', () { - final repoDir = setupRepo(Directory('test/assets/mergerepo/')); + final repoDir = setupRepo(Directory('test/assets/merge_repo/')); final conflictRepo = Repository.open(repoDir.path); final conflictBranch = conflictRepo.lookupBranch( @@ -406,7 +406,7 @@ void main() { }); test('returns conflicts with ancestor and our present and null their', () { - final repoDir = setupRepo(Directory('test/assets/mergerepo/')); + final repoDir = setupRepo(Directory('test/assets/merge_repo/')); final conflictRepo = Repository.open(repoDir.path); final conflictBranch = conflictRepo.lookupBranch(name: 'their-conflict'); @@ -429,7 +429,7 @@ void main() { }); test('successfully removes conflict', () { - final repoDir = setupRepo(Directory('test/assets/mergerepo/')); + final repoDir = setupRepo(Directory('test/assets/merge_repo/')); final conflictRepo = Repository.open(repoDir.path); final conflictBranch = conflictRepo.lookupBranch(name: 'conflict-branch'); @@ -462,7 +462,7 @@ void main() { }); test('successfully removes all conflicts', () { - final repoDir = setupRepo(Directory('test/assets/mergerepo/')); + final repoDir = setupRepo(Directory('test/assets/merge_repo/')); final conflictRepo = Repository.open(repoDir.path); final conflictBranch = conflictRepo.lookupBranch(name: 'conflict-branch'); diff --git a/test/mailmap_test.dart b/test/mailmap_test.dart index b384de9..b8794be 100644 --- a/test/mailmap_test.dart +++ b/test/mailmap_test.dart @@ -130,7 +130,7 @@ Santa Claus late Directory tmpDir; setUp(() { - tmpDir = setupRepo(Directory('test/assets/mailmaprepo/')); + tmpDir = setupRepo(Directory('test/assets/mailmap_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/merge_test.dart b/test/merge_test.dart index 8ede70a..0bb865a 100644 --- a/test/merge_test.dart +++ b/test/merge_test.dart @@ -13,7 +13,7 @@ void main() { late Directory tmpDir; setUp(() { - tmpDir = setupRepo(Directory('test/assets/mergerepo/')); + tmpDir = setupRepo(Directory('test/assets/merge_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/note_test.dart b/test/note_test.dart index d8e7ceb..67b8926 100644 --- a/test/note_test.dart +++ b/test/note_test.dart @@ -23,7 +23,7 @@ void main() { ]; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/odb_test.dart b/test/odb_test.dart index 2dc8105..e7c84dc 100644 --- a/test/odb_test.dart +++ b/test/odb_test.dart @@ -14,7 +14,7 @@ void main() { const blobContent = 'Feature edit\n'; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/oid_test.dart b/test/oid_test.dart index ebbb9a1..eb9c2f7 100644 --- a/test/oid_test.dart +++ b/test/oid_test.dart @@ -14,7 +14,7 @@ void main() { const lesserSha = '78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e7'; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/packbuilder_test.dart b/test/packbuilder_test.dart index b48f33c..90042f6 100644 --- a/test/packbuilder_test.dart +++ b/test/packbuilder_test.dart @@ -11,7 +11,7 @@ void main() { late Directory tmpDir; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/patch_test.dart b/test/patch_test.dart index 7ce822e..a772897 100644 --- a/test/patch_test.dart +++ b/test/patch_test.dart @@ -42,7 +42,7 @@ index e69de29..0000000 """; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); oldBlobOid = repo['e69de29bb2d1d6434b8b29ae775ad8c2e48c5391']; newBlobOid = repo['9c78c21d6680a7ffebc76f7ac68cacc11d8f48bc']; diff --git a/test/rebase_test.dart b/test/rebase_test.dart index b06edd4..5394a4f 100644 --- a/test/rebase_test.dart +++ b/test/rebase_test.dart @@ -15,7 +15,7 @@ void main() { ]; setUp(() { - tmpDir = setupRepo(Directory('test/assets/mergerepo/')); + tmpDir = setupRepo(Directory('test/assets/merge_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/reference_test.dart b/test/reference_test.dart index 9d714fb..9f1d90a 100644 --- a/test/reference_test.dart +++ b/test/reference_test.dart @@ -13,7 +13,7 @@ void main() { const newCommit = 'c68ff54aabf660fcdd9a2838d401583fe31249e3'; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/reflog_test.dart b/test/reflog_test.dart index 377e036..b9fb9f4 100644 --- a/test/reflog_test.dart +++ b/test/reflog_test.dart @@ -12,7 +12,7 @@ void main() { late Directory tmpDir; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); head = repo.head; reflog = RefLog(head); diff --git a/test/remote_prune_test.dart b/test/remote_prune_test.dart index 55ebf98..abccbb0 100644 --- a/test/remote_prune_test.dart +++ b/test/remote_prune_test.dart @@ -13,7 +13,7 @@ void main() { final cloneDir = Directory('${Directory.systemTemp.path}/cloned'); setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); if (cloneDir.existsSync()) { cloneDir.deleteSync(recursive: true); } diff --git a/test/remote_test.dart b/test/remote_test.dart index 494f0a1..062055c 100644 --- a/test/remote_test.dart +++ b/test/remote_test.dart @@ -12,7 +12,7 @@ void main() { const remoteUrl = 'git://github.com/SkinnyMind/libgit2dart.git'; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/repository_clone_test.dart b/test/repository_clone_test.dart index 4cc4005..f5ca118 100644 --- a/test/repository_clone_test.dart +++ b/test/repository_clone_test.dart @@ -13,7 +13,7 @@ void main() { final cloneDir = Directory('${Directory.systemTemp.path}/cloned'); setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); if (cloneDir.existsSync()) { cloneDir.delete(recursive: true); diff --git a/test/repository_test.dart b/test/repository_test.dart index 13bcfe7..5e5b70f 100644 --- a/test/repository_test.dart +++ b/test/repository_test.dart @@ -13,7 +13,7 @@ void main() { const featureCommit = '5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/reset_test.dart b/test/reset_test.dart index 4d5b3b3..d9738d9 100644 --- a/test/reset_test.dart +++ b/test/reset_test.dart @@ -12,7 +12,7 @@ void main() { const sha = '6cbc22e509d72758ab4c8d9f287ea846b90c448b'; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); file = File('${tmpDir.path}/feature_file'); repo = Repository.open(tmpDir.path); }); diff --git a/test/revparse_test.dart b/test/revparse_test.dart index 5972a6e..290d4e4 100644 --- a/test/revparse_test.dart +++ b/test/revparse_test.dart @@ -12,7 +12,7 @@ void main() { const parentSHA = '78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8'; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/revwalk_test.dart b/test/revwalk_test.dart index ae94c07..3728e3d 100644 --- a/test/revwalk_test.dart +++ b/test/revwalk_test.dart @@ -18,7 +18,7 @@ void main() { ]; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/stash_test.dart b/test/stash_test.dart index c30220d..d7b054d 100644 --- a/test/stash_test.dart +++ b/test/stash_test.dart @@ -12,7 +12,7 @@ void main() { late Signature stasher; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); stasher = Signature.create( name: 'Stasher', diff --git a/test/submodule_test.dart b/test/submodule_test.dart index ab9ea40..29665ac 100644 --- a/test/submodule_test.dart +++ b/test/submodule_test.dart @@ -14,7 +14,7 @@ void main() { const submoduleHeadSha = '49322bb17d3acc9146f98c97d078513228bbf3c0'; setUp(() { - tmpDir = setupRepo(Directory('test/assets/submodulerepo/')); + tmpDir = setupRepo(Directory('test/assets/submodule_repo/')); repo = Repository.open(tmpDir.path); }); diff --git a/test/tag_test.dart b/test/tag_test.dart index fa56a32..3245e79 100644 --- a/test/tag_test.dart +++ b/test/tag_test.dart @@ -13,7 +13,7 @@ void main() { late Oid tagOid; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); tagOid = repo['f0fdbf506397e9f58c59b88dfdd72778ec06cc0c']; tag = repo.lookupTag(tagOid); diff --git a/test/tree_test.dart b/test/tree_test.dart index 0a34802..a086a69 100644 --- a/test/tree_test.dart +++ b/test/tree_test.dart @@ -12,7 +12,7 @@ void main() { const fileSHA = '1377554ebea6f98a2c748183bc5a96852af12ac2'; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); tree = repo.lookupTree( repo['a8ae3dd59e6e1802c6f78e05e301bfd57c9f334f'], diff --git a/test/treebuilder_test.dart b/test/treebuilder_test.dart index e53db6a..ec9e5e4 100644 --- a/test/treebuilder_test.dart +++ b/test/treebuilder_test.dart @@ -12,7 +12,7 @@ void main() { late Directory tmpDir; setUp(() { - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); tree = repo.lookupTree(repo['a8ae3dd59e6e1802c6f78e05e301bfd57c9f334f']); }); diff --git a/test/worktree_test.dart b/test/worktree_test.dart index 17c1a29..bda3850 100644 --- a/test/worktree_test.dart +++ b/test/worktree_test.dart @@ -16,7 +16,7 @@ void main() { if (worktreeDir.existsSync()) { worktreeDir.deleteSync(recursive: true); } - tmpDir = setupRepo(Directory('test/assets/testrepo/')); + tmpDir = setupRepo(Directory('test/assets/test_repo/')); repo = Repository.open(tmpDir.path); });