diff --git a/lib/libgit2dart.dart b/lib/libgit2dart.dart index 58095a2..8fcad97 100644 --- a/lib/libgit2dart.dart +++ b/lib/libgit2dart.dart @@ -21,6 +21,7 @@ export 'src/remote.dart'; export 'src/refspec.dart'; export 'src/callbacks.dart'; export 'src/credentials.dart'; +export 'src/blame.dart'; export 'src/features.dart'; export 'src/error.dart'; export 'src/git_types.dart'; diff --git a/lib/src/bindings/blame.dart b/lib/src/bindings/blame.dart new file mode 100644 index 0000000..6fbb7fc --- /dev/null +++ b/lib/src/bindings/blame.dart @@ -0,0 +1,104 @@ +import 'dart:ffi'; +import 'package:ffi/ffi.dart'; +import '../error.dart'; +import '../oid.dart'; +import '../util.dart'; +import 'libgit2_bindings.dart'; + +/// Get the blame for a single file. +/// +/// Throws a [LibGit2Error] if error occured. +Pointer file({ + required Pointer repoPointer, + required String path, + int? flags, + int? minMatchCharacters, + Oid? newestCommit, + Oid? oldestCommit, + int? minLine, + int? maxLine, +}) { + final out = calloc>(); + final pathC = path.toNativeUtf8().cast(); + final options = calloc(); + final optionsError = libgit2.git_blame_options_init( + options, + GIT_BLAME_OPTIONS_VERSION, + ); + + if (optionsError < 0) { + throw LibGit2Error(libgit2.git_error_last()); + } + + if (flags != null) { + options.ref.flags = flags; + } + + if (minMatchCharacters != null) { + options.ref.min_match_characters = minMatchCharacters; + } + + if (newestCommit != null) { + options.ref.newest_commit = newestCommit.pointer.ref; + } + + if (oldestCommit != null) { + options.ref.oldest_commit = oldestCommit.pointer.ref; + } + + if (minLine != null) { + options.ref.min_line = minLine; + } + + if (maxLine != null) { + options.ref.max_line = maxLine; + } + + final error = libgit2.git_blame_file(out, repoPointer, pathC, options); + + if (error < 0) { + throw LibGit2Error(libgit2.git_error_last()); + } else { + return out.value; + } +} + +/// Gets the number of hunks that exist in the blame structure. +int hunkCount(Pointer blame) { + return libgit2.git_blame_get_hunk_count(blame); +} + +/// Gets the blame hunk at the given index. +/// +/// Throws [RangeError] if index out of range. +Pointer getHunkByIndex({ + required Pointer blamePointer, + required int index, +}) { + final result = libgit2.git_blame_get_hunk_byindex(blamePointer, index); + + if (result == nullptr) { + throw RangeError('$index is out of bounds'); + } else { + return result; + } +} + +/// Gets the hunk that relates to the given line number (1-based) in the newest commit. +/// +/// Throws [RangeError] if [lineNumber] is out of range. +Pointer getHunkByLine({ + required Pointer blamePointer, + required int lineNumber, +}) { + final result = libgit2.git_blame_get_hunk_byline(blamePointer, lineNumber); + + if (result == nullptr) { + throw RangeError('$lineNumber is out of bounds'); + } else { + return result; + } +} + +/// Free memory allocated for blame object. +void free(Pointer blame) => libgit2.git_blame_free(blame); diff --git a/lib/src/blame.dart b/lib/src/blame.dart new file mode 100644 index 0000000..c9520f7 --- /dev/null +++ b/lib/src/blame.dart @@ -0,0 +1,172 @@ +import 'dart:collection'; +import 'dart:ffi'; +import 'package:ffi/ffi.dart'; +import 'bindings/libgit2_bindings.dart'; +import 'bindings/blame.dart' as bindings; +import 'util.dart'; +import 'git_types.dart'; +import 'oid.dart'; +import 'repository.dart'; +import 'signature.dart'; + +class Blame with IterableMixin { + /// Initializes a new instance of the [Blame] class from + /// provided pointer to blame object in memory. + Blame(this._blamePointer); + + /// Initializes a new instance of the [Blame] class by getting + /// the blame for a single file. + /// + /// [flags] is a combination of [GitBlameFlag]s. + /// + /// [minMatchCharacters] is the lower bound on the number of alphanumeric + /// characters that must be detected as moving/copying within a file for + /// it to associate those lines with the parent commit. The default value is 20. + /// This value only takes effect if any of the [GitBlameFlag.trackCopies*] + /// flags are specified. + /// + /// [newestCommit] is the id of the newest commit to consider. The default is HEAD. + /// + /// [oldestCommit] is the id of the oldest commit to consider. The default is the + /// first commit encountered with no parent. + /// + /// [minLine] is the first line in the file to blame. The default is 1 + /// (line numbers start with 1). + /// + /// [maxLine] is the last line in the file to blame. The default is the last + /// line of the file. + /// + /// Throws a [LibGit2Error] if error occured. + Blame.file({ + required Repository repo, + required String path, + Set flags = const {GitBlameFlag.normal}, + int? minMatchCharacters, + Oid? newestCommit, + Oid? oldestCommit, + int? minLine, + int? maxLine, + }) { + libgit2.git_libgit2_init(); + + final int flagsInt = + flags.fold(0, (previousValue, e) => previousValue | e.value); + + _blamePointer = bindings.file( + repoPointer: repo.pointer, + path: path, + flags: flagsInt, + minMatchCharacters: minMatchCharacters, + newestCommit: newestCommit, + oldestCommit: oldestCommit, + minLine: minLine, + maxLine: maxLine, + ); + } + + /// Pointer to memory address for allocated blame object. + late final Pointer _blamePointer; + + /// Returns the blame hunk at the given index. + /// + /// Throws [RangeError] if index out of range. + BlameHunk operator [](int index) { + return BlameHunk(bindings.getHunkByIndex( + blamePointer: _blamePointer, + index: index, + )); + } + + /// Gets the hunk that relates to the given line number (1-based) in the newest commit. + /// + /// Throws [RangeError] if [lineNumber] is out of range. + BlameHunk forLine(int lineNumber) { + return BlameHunk(bindings.getHunkByLine( + blamePointer: _blamePointer, + lineNumber: lineNumber, + )); + } + + /// Releases memory allocated for blame object. + void free() => bindings.free(_blamePointer); + + @override + Iterator get iterator => _BlameIterator(_blamePointer); +} + +class BlameHunk { + /// Initializes a new instance of the [BlameHunk] class from + /// provided pointer to blame hunk object in memory. + const BlameHunk(this._blameHunkPointer); + + /// Pointer to memory address for allocated blame hunk object. + final Pointer _blameHunkPointer; + + /// Returns the number of lines in this hunk. + int get linesCount => _blameHunkPointer.ref.lines_in_hunk; + + /// Checks if the hunk has been tracked to a boundary commit + /// (the root, or the commit specified in [oldestCommit] argument) + bool get isBoundary { + return _blameHunkPointer.ref.boundary == 1 ? true : false; + } + + /// Returns the 1-based line number where this hunk begins, in the final + /// version of the file. + int get finalStartLineNumber => _blameHunkPointer.ref.final_start_line_number; + + /// Returns the author of [finalCommitId]. If [GitBlameFlag.useMailmap] has been + /// specified, it will contain the canonical real name and email address. + Signature get finalCommitter => + Signature(_blameHunkPointer.ref.final_signature); + + /// Returns the [Oid] of the commit where this line was last changed. + Oid get finalCommitId => Oid.fromRaw(_blameHunkPointer.ref.final_commit_id); + + /// Returns the 1-based line number where this hunk begins, in the file + /// named by [originPath] in the commit specified by [originCommitId]. + int get originStartLineNumber => _blameHunkPointer.ref.orig_start_line_number; + + /// Returns the author of [originCommitId]. If [GitBlameFlag.useMailmap] has been + /// specified, it will contain the canonical real name and email address. + Signature get originCommitter => + Signature(_blameHunkPointer.ref.orig_signature); + + /// Returns the [Oid] of the commit where this hunk was found. This will usually be + /// the same as [finalCommitId], except when [GitBlameFlag.trackCopiesAnyCommitCopies] + /// been specified. + Oid get originCommitId => Oid.fromRaw(_blameHunkPointer.ref.orig_commit_id); + + /// Returns the path to the file where this hunk originated, as of the commit + /// specified by [originCommitId]. + String get originPath => + _blameHunkPointer.ref.orig_path.cast().toDartString(); +} + +class _BlameIterator implements Iterator { + _BlameIterator(this._blamePointer) { + count = bindings.hunkCount(_blamePointer); + } + + final Pointer _blamePointer; + BlameHunk? currentHunk; + late final int count; + int index = 0; + + @override + BlameHunk get current => currentHunk!; + + @override + bool moveNext() { + if (index == count) { + return false; + } else { + currentHunk = BlameHunk(bindings.getHunkByIndex( + blamePointer: _blamePointer, + index: index, + )); + index++; + return true; + } + } +} diff --git a/lib/src/git_types.dart b/lib/src/git_types.dart index f6d6bc1..cd81aa9 100644 --- a/lib/src/git_types.dart +++ b/lib/src/git_types.dart @@ -1384,3 +1384,72 @@ class GitAttributeCheck { @override String toString() => 'GitAttributeCheck.$_name'; } + +/// Flags for indicating option behavior for git blame APIs. +class GitBlameFlag { + const GitBlameFlag._(this._value, this._name); + final int _value; + final String _name; + + /// Normal blame, the default. + static const normal = GitBlameFlag._(0, 'normal'); + + /// Track lines that have moved within a file (like `git blame -M`). + /// + /// This is not yet implemented and reserved for future use. + static const trackCopiesSameFile = GitBlameFlag._(1, 'trackCopiesSameFile'); + + /// Track lines that have moved across files in the same commit + /// (like `git blame -C`). + /// + /// This is not yet implemented and reserved for future use. + static const trackCopiesSameCommitMoves = + GitBlameFlag._(2, 'trackCopiesSameCommitMoves'); + + /// Track lines that have been copied from another file that exists + /// in the same commit (like `git blame -CC`). Implies SAME_FILE. + /// + /// This is not yet implemented and reserved for future use. + static const trackCopiesSameCommitCopies = GitBlameFlag._( + 4, + 'trackCopiesSameCommitCopies', + ); + + /// Track lines that have been copied from another file that exists in + /// *any* commit (like `git blame -CCC`). Implies SAME_COMMIT_COPIES. + /// + /// This is not yet implemented and reserved for future use. + static const trackCopiesAnyCommitCopies = GitBlameFlag._( + 8, + 'trackCopiesAnyCommitCopies', + ); + + /// Restrict the search of commits to those reachable following only + /// the first parents. + static const firstParent = GitBlameFlag._(16, 'firstParent'); + + /// Use mailmap file to map author and committer names and email + /// addresses to canonical real names and email addresses. The + /// mailmap will be read from the working directory, or HEAD in a + /// bare repository. + static const useMailmap = GitBlameFlag._(32, 'useMailmap'); + + /// Ignore whitespace differences. + static const ignoreWhitespace = GitBlameFlag._(64, 'ignoreWhitespace'); + + static const List values = [ + normal, + trackCopiesSameFile, + trackCopiesSameCommitMoves, + trackCopiesSameCommitCopies, + trackCopiesAnyCommitCopies, + firstParent, + useMailmap, + ignoreWhitespace, + ]; + + int get value => _value; + + @override + String toString() => 'GitBlameFlag.$_name'; +} diff --git a/lib/src/remote.dart b/lib/src/remote.dart index 0edf207..1c90c2f 100644 --- a/lib/src/remote.dart +++ b/lib/src/remote.dart @@ -1,15 +1,14 @@ import 'dart:ffi'; -import 'package:libgit2dart/libgit2dart.dart'; - import 'bindings/libgit2_bindings.dart'; import 'bindings/remote.dart' as bindings; +import 'callbacks.dart'; import 'git_types.dart'; import 'refspec.dart'; import 'repository.dart'; class Remotes { - /// Initializes a new instance of the [References] class - /// from provided [Repository] object. + /// Initializes a new instance of the [Remotes] class from + /// provided [Repository] object. Remotes(Repository repo) { _repoPointer = repo.pointer; } diff --git a/lib/src/repository.dart b/lib/src/repository.dart index cca4663..8e311eb 100644 --- a/lib/src/repository.dart +++ b/lib/src/repository.dart @@ -1075,4 +1075,47 @@ class Repository { name: name, ); } + + /// Gets the blame for a single file. + /// + /// [flags] is a combination of [GitBlameFlag]s. + /// + /// [minMatchCharacters] is the lower bound on the number of alphanumeric + /// characters that must be detected as moving/copying within a file for + /// it to associate those lines with the parent commit. The default value is 20. + /// This value only takes effect if any of the [GitBlameFlag.trackCopies*] + /// flags are specified. + /// + /// [newestCommit] is the id of the newest commit to consider. The default is HEAD. + /// + /// [oldestCommit] is the id of the oldest commit to consider. The default is the + /// first commit encountered with no parent. + /// + /// [minLine] is the first line in the file to blame. The default is 1 + /// (line numbers start with 1). + /// + /// [maxLine] is the last line in the file to blame. The default is the last + /// line of the file. + /// + /// Throws a [LibGit2Error] if error occured. + Blame blame({ + required String path, + Set flags = const {GitBlameFlag.normal}, + int? minMatchCharacters, + Oid? newestCommit, + Oid? oldestCommit, + int? minLine, + int? maxLine, + }) { + return Blame.file( + repo: this, + path: path, + flags: flags, + minMatchCharacters: minMatchCharacters, + newestCommit: newestCommit, + oldestCommit: oldestCommit, + minLine: minLine, + maxLine: maxLine, + ); + } } diff --git a/lib/src/signature.dart b/lib/src/signature.dart index eaf6eb6..4562d31 100644 --- a/lib/src/signature.dart +++ b/lib/src/signature.dart @@ -80,4 +80,9 @@ class Signature { /// Releases memory allocated for signature object. void free() => bindings.free(_signaturePointer); + + @override + String toString() { + return 'Signature{name: $name, email: $email, time: $time, offset: $offset}'; + } } diff --git a/test/assets/blamerepo/.gitdir/COMMIT_EDITMSG b/test/assets/blamerepo/.gitdir/COMMIT_EDITMSG new file mode 100644 index 0000000..136002a --- /dev/null +++ b/test/assets/blamerepo/.gitdir/COMMIT_EDITMSG @@ -0,0 +1 @@ +blame edit diff --git a/test/assets/blamerepo/.gitdir/HEAD b/test/assets/blamerepo/.gitdir/HEAD new file mode 100644 index 0000000..cb089cd --- /dev/null +++ b/test/assets/blamerepo/.gitdir/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/assets/blamerepo/.gitdir/ORIG_HEAD b/test/assets/blamerepo/.gitdir/ORIG_HEAD new file mode 100644 index 0000000..911edc4 --- /dev/null +++ b/test/assets/blamerepo/.gitdir/ORIG_HEAD @@ -0,0 +1 @@ +c68ff54aabf660fcdd9a2838d401583fe31249e3 diff --git a/test/assets/blamerepo/.gitdir/branches/empty_marker b/test/assets/blamerepo/.gitdir/branches/empty_marker new file mode 100644 index 0000000..e69de29 diff --git a/test/assets/blamerepo/.gitdir/config b/test/assets/blamerepo/.gitdir/config new file mode 100644 index 0000000..51f9253 --- /dev/null +++ b/test/assets/blamerepo/.gitdir/config @@ -0,0 +1,9 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + editor = vim +[remote "origin"] + url = git://github.com/SkinnyMind/libgit2dart.git + fetch = +refs/heads/*:refs/remotes/origin/* diff --git a/test/assets/blamerepo/.gitdir/description b/test/assets/blamerepo/.gitdir/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/test/assets/blamerepo/.gitdir/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/assets/blamerepo/.gitdir/hooks/applypatch-msg.sample b/test/assets/blamerepo/.gitdir/hooks/applypatch-msg.sample new file mode 100755 index 0000000..09b38a8 --- /dev/null +++ b/test/assets/blamerepo/.gitdir/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/usr/bin/sh +# +# An example hook script to check the commit log message taken 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. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/test/assets/blamerepo/.gitdir/hooks/commit-msg.sample b/test/assets/blamerepo/.gitdir/hooks/commit-msg.sample new file mode 100755 index 0000000..3ced146 --- /dev/null +++ b/test/assets/blamerepo/.gitdir/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/usr/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/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/blamerepo/.gitdir/hooks/fsmonitor-watchman.sample b/test/assets/blamerepo/.gitdir/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000..14ed0aa --- /dev/null +++ b/test/assets/blamerepo/.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/blamerepo/.gitdir/hooks/post-update.sample b/test/assets/blamerepo/.gitdir/hooks/post-update.sample new file mode 100755 index 0000000..ee496e3 --- /dev/null +++ b/test/assets/blamerepo/.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/blamerepo/.gitdir/hooks/pre-applypatch.sample b/test/assets/blamerepo/.gitdir/hooks/pre-applypatch.sample new file mode 100755 index 0000000..845130a --- /dev/null +++ b/test/assets/blamerepo/.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/blamerepo/.gitdir/hooks/pre-commit.sample b/test/assets/blamerepo/.gitdir/hooks/pre-commit.sample new file mode 100755 index 0000000..be32e5f --- /dev/null +++ b/test/assets/blamerepo/.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/blamerepo/.gitdir/hooks/pre-merge-commit.sample b/test/assets/blamerepo/.gitdir/hooks/pre-merge-commit.sample new file mode 100755 index 0000000..09b65a5 --- /dev/null +++ b/test/assets/blamerepo/.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/blamerepo/.gitdir/hooks/pre-push.sample b/test/assets/blamerepo/.gitdir/hooks/pre-push.sample new file mode 100755 index 0000000..d5e513d --- /dev/null +++ b/test/assets/blamerepo/.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/blamerepo/.gitdir/hooks/pre-rebase.sample b/test/assets/blamerepo/.gitdir/hooks/pre-rebase.sample new file mode 100755 index 0000000..36efc64 --- /dev/null +++ b/test/assets/blamerepo/.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/blamerepo/.gitdir/hooks/pre-receive.sample b/test/assets/blamerepo/.gitdir/hooks/pre-receive.sample new file mode 100755 index 0000000..6f473c3 --- /dev/null +++ b/test/assets/blamerepo/.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/blamerepo/.gitdir/hooks/prepare-commit-msg.sample b/test/assets/blamerepo/.gitdir/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..cd8e794 --- /dev/null +++ b/test/assets/blamerepo/.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/blamerepo/.gitdir/hooks/push-to-checkout.sample b/test/assets/blamerepo/.gitdir/hooks/push-to-checkout.sample new file mode 100755 index 0000000..badb4b4 --- /dev/null +++ b/test/assets/blamerepo/.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/blamerepo/.gitdir/index b/test/assets/blamerepo/.gitdir/index new file mode 100644 index 0000000..ff0b004 Binary files /dev/null and b/test/assets/blamerepo/.gitdir/index differ diff --git a/test/assets/blamerepo/.gitdir/info/exclude b/test/assets/blamerepo/.gitdir/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/test/assets/blamerepo/.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/blamerepo/.gitdir/logs/HEAD b/test/assets/blamerepo/.gitdir/logs/HEAD new file mode 100644 index 0000000..c5711a3 --- /dev/null +++ b/test/assets/blamerepo/.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 a07a01e325c2c04e05d2450ad37785fbfe0a0014 Aleksey Kulikov 1633081062 +0300 commit: blame edit diff --git a/test/assets/blamerepo/.gitdir/logs/refs/heads/feature b/test/assets/blamerepo/.gitdir/logs/refs/heads/feature new file mode 100644 index 0000000..44be747 --- /dev/null +++ b/test/assets/blamerepo/.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/blamerepo/.gitdir/logs/refs/heads/master b/test/assets/blamerepo/.gitdir/logs/refs/heads/master new file mode 100644 index 0000000..305b357 --- /dev/null +++ b/test/assets/blamerepo/.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 a07a01e325c2c04e05d2450ad37785fbfe0a0014 Aleksey Kulikov 1633081062 +0300 commit: blame edit diff --git a/test/assets/blamerepo/.gitdir/objects/13/77554ebea6f98a2c748183bc5a96852af12ac2 b/test/assets/blamerepo/.gitdir/objects/13/77554ebea6f98a2c748183bc5a96852af12ac2 new file mode 100644 index 0000000..c8ea349 Binary files /dev/null and b/test/assets/blamerepo/.gitdir/objects/13/77554ebea6f98a2c748183bc5a96852af12ac2 differ diff --git a/test/assets/blamerepo/.gitdir/objects/47/d45fb10db26250b58f0678975a609031b7e427 b/test/assets/blamerepo/.gitdir/objects/47/d45fb10db26250b58f0678975a609031b7e427 new file mode 100644 index 0000000..72e7af0 Binary files /dev/null and b/test/assets/blamerepo/.gitdir/objects/47/d45fb10db26250b58f0678975a609031b7e427 differ diff --git a/test/assets/blamerepo/.gitdir/objects/55/86adc6e9f473bb8fd01b52752b4eb339d6efbc b/test/assets/blamerepo/.gitdir/objects/55/86adc6e9f473bb8fd01b52752b4eb339d6efbc new file mode 100644 index 0000000..db7181c Binary files /dev/null and b/test/assets/blamerepo/.gitdir/objects/55/86adc6e9f473bb8fd01b52752b4eb339d6efbc differ diff --git a/test/assets/blamerepo/.gitdir/objects/5a/ecfa0fb97eadaac050ccb99f03c3fb65460ad4 b/test/assets/blamerepo/.gitdir/objects/5a/ecfa0fb97eadaac050ccb99f03c3fb65460ad4 new file mode 100644 index 0000000..f5dd41b --- /dev/null +++ b/test/assets/blamerepo/.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/blamerepo/.gitdir/objects/66/bd6147704f78165d764ce8348ccaec81415db4 b/test/assets/blamerepo/.gitdir/objects/66/bd6147704f78165d764ce8348ccaec81415db4 new file mode 100644 index 0000000..2da87bd Binary files /dev/null and b/test/assets/blamerepo/.gitdir/objects/66/bd6147704f78165d764ce8348ccaec81415db4 differ diff --git a/test/assets/blamerepo/.gitdir/objects/6c/bc22e509d72758ab4c8d9f287ea846b90c448b b/test/assets/blamerepo/.gitdir/objects/6c/bc22e509d72758ab4c8d9f287ea846b90c448b new file mode 100644 index 0000000..c34215c Binary files /dev/null and b/test/assets/blamerepo/.gitdir/objects/6c/bc22e509d72758ab4c8d9f287ea846b90c448b differ diff --git a/test/assets/blamerepo/.gitdir/objects/77/96359a96eb722939c24bafdb1afe9f07f2f628 b/test/assets/blamerepo/.gitdir/objects/77/96359a96eb722939c24bafdb1afe9f07f2f628 new file mode 100644 index 0000000..7ff0396 Binary files /dev/null and b/test/assets/blamerepo/.gitdir/objects/77/96359a96eb722939c24bafdb1afe9f07f2f628 differ diff --git a/test/assets/blamerepo/.gitdir/objects/78/b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 b/test/assets/blamerepo/.gitdir/objects/78/b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 new file mode 100644 index 0000000..552d0b8 Binary files /dev/null and b/test/assets/blamerepo/.gitdir/objects/78/b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 differ diff --git a/test/assets/blamerepo/.gitdir/objects/82/1ed6e80627b8769d170a293862f9fc60825226 b/test/assets/blamerepo/.gitdir/objects/82/1ed6e80627b8769d170a293862f9fc60825226 new file mode 100644 index 0000000..091c359 --- /dev/null +++ b/test/assets/blamerepo/.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/blamerepo/.gitdir/objects/83/2ff991b09f5ee3d90dc42ad6db5de4eda92989 b/test/assets/blamerepo/.gitdir/objects/83/2ff991b09f5ee3d90dc42ad6db5de4eda92989 new file mode 100644 index 0000000..f8a5d06 Binary files /dev/null and b/test/assets/blamerepo/.gitdir/objects/83/2ff991b09f5ee3d90dc42ad6db5de4eda92989 differ diff --git a/test/assets/blamerepo/.gitdir/objects/8e/3585160447a326c1514fdd513277fdd43963b3 b/test/assets/blamerepo/.gitdir/objects/8e/3585160447a326c1514fdd513277fdd43963b3 new file mode 100644 index 0000000..1fda57a Binary files /dev/null and b/test/assets/blamerepo/.gitdir/objects/8e/3585160447a326c1514fdd513277fdd43963b3 differ diff --git a/test/assets/blamerepo/.gitdir/objects/94/3280edca05349fbc08286ab85bb7ec47e3610b b/test/assets/blamerepo/.gitdir/objects/94/3280edca05349fbc08286ab85bb7ec47e3610b new file mode 100644 index 0000000..5fff1f4 Binary files /dev/null and b/test/assets/blamerepo/.gitdir/objects/94/3280edca05349fbc08286ab85bb7ec47e3610b differ diff --git a/test/assets/blamerepo/.gitdir/objects/9c/78c21d6680a7ffebc76f7ac68cacc11d8f48bc b/test/assets/blamerepo/.gitdir/objects/9c/78c21d6680a7ffebc76f7ac68cacc11d8f48bc new file mode 100644 index 0000000..5220751 Binary files /dev/null and b/test/assets/blamerepo/.gitdir/objects/9c/78c21d6680a7ffebc76f7ac68cacc11d8f48bc differ diff --git a/test/assets/blamerepo/.gitdir/objects/a0/7a01e325c2c04e05d2450ad37785fbfe0a0014 b/test/assets/blamerepo/.gitdir/objects/a0/7a01e325c2c04e05d2450ad37785fbfe0a0014 new file mode 100644 index 0000000..88635b3 Binary files /dev/null and b/test/assets/blamerepo/.gitdir/objects/a0/7a01e325c2c04e05d2450ad37785fbfe0a0014 differ diff --git a/test/assets/blamerepo/.gitdir/objects/a8/ae3dd59e6e1802c6f78e05e301bfd57c9f334f b/test/assets/blamerepo/.gitdir/objects/a8/ae3dd59e6e1802c6f78e05e301bfd57c9f334f new file mode 100644 index 0000000..540dbbc Binary files /dev/null and b/test/assets/blamerepo/.gitdir/objects/a8/ae3dd59e6e1802c6f78e05e301bfd57c9f334f differ diff --git a/test/assets/blamerepo/.gitdir/objects/be/83750b8d9ca12d7f142a7060926e66b10db1c0 b/test/assets/blamerepo/.gitdir/objects/be/83750b8d9ca12d7f142a7060926e66b10db1c0 new file mode 100644 index 0000000..f259ce7 Binary files /dev/null and b/test/assets/blamerepo/.gitdir/objects/be/83750b8d9ca12d7f142a7060926e66b10db1c0 differ diff --git a/test/assets/blamerepo/.gitdir/objects/c6/8ff54aabf660fcdd9a2838d401583fe31249e3 b/test/assets/blamerepo/.gitdir/objects/c6/8ff54aabf660fcdd9a2838d401583fe31249e3 new file mode 100644 index 0000000..e2a64e4 --- /dev/null +++ b/test/assets/blamerepo/.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/blamerepo/.gitdir/refs/heads/feature b/test/assets/blamerepo/.gitdir/refs/heads/feature new file mode 100644 index 0000000..3584be2 --- /dev/null +++ b/test/assets/blamerepo/.gitdir/refs/heads/feature @@ -0,0 +1 @@ +5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 diff --git a/test/assets/blamerepo/.gitdir/refs/heads/master b/test/assets/blamerepo/.gitdir/refs/heads/master new file mode 100644 index 0000000..40e83ef --- /dev/null +++ b/test/assets/blamerepo/.gitdir/refs/heads/master @@ -0,0 +1 @@ +a07a01e325c2c04e05d2450ad37785fbfe0a0014 diff --git a/test/assets/blamerepo/.gitdir/refs/tags/v0.1 b/test/assets/blamerepo/.gitdir/refs/tags/v0.1 new file mode 100644 index 0000000..e4cb9a5 --- /dev/null +++ b/test/assets/blamerepo/.gitdir/refs/tags/v0.1 @@ -0,0 +1 @@ +78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 diff --git a/test/assets/blamerepo/.gitdir/refs/tags/v0.2 b/test/assets/blamerepo/.gitdir/refs/tags/v0.2 new file mode 100644 index 0000000..3e0b1fd --- /dev/null +++ b/test/assets/blamerepo/.gitdir/refs/tags/v0.2 @@ -0,0 +1 @@ +f0fdbf506397e9f58c59b88dfdd72778ec06cc0c diff --git a/test/assets/blamerepo/dir/dir_file.txt b/test/assets/blamerepo/dir/dir_file.txt new file mode 100644 index 0000000..e69de29 diff --git a/test/assets/blamerepo/feature_file b/test/assets/blamerepo/feature_file new file mode 100644 index 0000000..5586adc --- /dev/null +++ b/test/assets/blamerepo/feature_file @@ -0,0 +1,2 @@ +Feature edit +Another line for blame diff --git a/test/assets/blamerepo/file b/test/assets/blamerepo/file new file mode 100644 index 0000000..e69de29 diff --git a/test/assets/blamerepo/gitignore b/test/assets/blamerepo/gitignore new file mode 100644 index 0000000..1377554 --- /dev/null +++ b/test/assets/blamerepo/gitignore @@ -0,0 +1 @@ +*.swp diff --git a/test/blame_test.dart b/test/blame_test.dart new file mode 100644 index 0000000..0b5fb2d --- /dev/null +++ b/test/blame_test.dart @@ -0,0 +1,150 @@ +import 'dart:io'; +import 'package:test/test.dart'; +import 'package:libgit2dart/libgit2dart.dart'; +import 'helpers/util.dart'; + +void main() { + late Repository repo; + late Directory tmpDir; + late Signature sig1; + late Signature sig2; + var hunks = >[]; + + setUp(() async { + tmpDir = await setupRepo(Directory('test/assets/blamerepo/')); + repo = Repository.open(tmpDir.path); + sig1 = Signature.create( + name: 'Aleksey Kulikov', + email: 'skinny.mind@gmail.com', + time: 1626091054, + offset: 180, + ); + sig2 = Signature.create( + name: 'Aleksey Kulikov', + email: 'skinny.mind@gmail.com', + time: 1633081062, + offset: 180, + ); + + hunks = [ + { + 'finalCommitId': 'fc38877b2552ab554752d9a77e1f48f738cca79b', + 'finalStartLineNumber': 1, + 'finalCommitter': sig1, + 'originCommitId': 'fc38877b2552ab554752d9a77e1f48f738cca79b', + 'originStartLineNumber': 1, + 'originCommitter': sig1, + 'isBoundary': false, + }, + { + 'finalCommitId': 'a07a01e325c2c04e05d2450ad37785fbfe0a0014', + 'finalStartLineNumber': 2, + 'finalCommitter': sig2, + 'originCommitId': 'a07a01e325c2c04e05d2450ad37785fbfe0a0014', + 'originStartLineNumber': 2, + 'originCommitter': sig2, + 'isBoundary': false, + }, + ]; + }); + + tearDown(() async { + sig1.free(); + sig2.free(); + repo.free(); + await tmpDir.delete(recursive: true); + }); + + group('Blame', () { + test('successfully gets the blame for provided file', () { + final blame = repo.blame(path: 'feature_file'); + + expect(blame.length, 2); + + for (var i = 0; i < blame.length; i++) { + expect(blame[i].linesCount, 1); + expect(blame[i].finalCommitId.sha, hunks[i]['finalCommitId']); + expect(blame[i].finalStartLineNumber, hunks[i]['finalStartLineNumber']); + expect(blame[i].finalCommitter, hunks[i]['finalCommitter']); + expect(blame[i].originCommitId.sha, hunks[i]['originCommitId']); + expect( + blame[i].originStartLineNumber, + hunks[i]['originStartLineNumber'], + ); + expect(blame[i].originCommitter, hunks[i]['originCommitter']); + expect(blame[i].isBoundary, hunks[i]['isBoundary']); + expect(blame[i].originPath, 'feature_file'); + } + + blame.free(); + }); + + test('successfully gets the blame for provided line', () { + final blame = repo.blame(path: 'feature_file'); + + final hunk = blame.forLine(1); + + expect(hunk.linesCount, 1); + expect(hunk.finalCommitId.sha, hunks[0]['finalCommitId']); + expect(hunk.finalStartLineNumber, hunks[0]['finalStartLineNumber']); + expect(hunk.finalCommitter, hunks[0]['finalCommitter']); + expect(hunk.originCommitId.sha, hunks[0]['originCommitId']); + expect( + hunk.originStartLineNumber, + hunks[0]['originStartLineNumber'], + ); + expect(hunk.originCommitter, hunks[0]['originCommitter']); + expect(hunk.isBoundary, hunks[0]['isBoundary']); + expect(hunk.originPath, 'feature_file'); + + blame.free(); + }); + + test('throws when provided index for hunk is invalid', () { + final blame = repo.blame(path: 'feature_file'); + expect(() => blame[10], throwsA(isA())); + + blame.free(); + }); + + test('throws when provided line number for hunk is invalid', () { + final blame = repo.blame(path: 'feature_file'); + expect(() => blame.forLine(10), throwsA(isA())); + + blame.free(); + }); + + test( + 'successfully gets the blame for provided file with newestCommit argument', + () { + final newestCommit = Oid.fromSHA( + repo: repo, + sha: 'fc38877b2552ab554752d9a77e1f48f738cca79b', + ); + final blame = repo.blame( + path: 'feature_file', + newestCommit: newestCommit, + flags: {GitBlameFlag.ignoreWhitespace}, + ); + + expect(blame.length, 1); + + final hunk = blame.first; + + expect(hunk.linesCount, 1); + expect(hunk.finalCommitId.sha, hunks[0]['finalCommitId']); + expect(hunk.finalStartLineNumber, hunks[0]['finalStartLineNumber']); + expect(hunk.finalCommitter, hunks[0]['finalCommitter']); + expect(hunk.originCommitId.sha, hunks[0]['originCommitId']); + expect( + hunk.originStartLineNumber, + hunks[0]['originStartLineNumber'], + ); + expect(hunk.originCommitter, hunks[0]['originCommitter']); + expect(hunk.isBoundary, hunks[0]['isBoundary']); + expect(hunk.originPath, 'feature_file'); + + blame.free(); + }); + }); +}