From 63dabcdd2ca507b768c217069549a292c3b4540f Mon Sep 17 00:00:00 2001 From: Aleksey Kulikov Date: Thu, 9 Sep 2021 14:39:40 +0300 Subject: [PATCH] feat(merge): add more bindings and api methods --- lib/src/bindings/index.dart | 85 +++++++++ lib/src/bindings/merge.dart | 112 ++++++++++++ lib/src/git_types.dart | 114 ++++++++++++ lib/src/index.dart | 78 +++++++- lib/src/repository.dart | 93 +++++++++- test/assets/mergerepo/.gitdir/COMMIT_EDITMSG | 1 + test/assets/mergerepo/.gitdir/HEAD | 1 + test/assets/mergerepo/.gitdir/ORIG_HEAD | 1 + .../mergerepo/.gitdir/branches/empty_marker | 0 test/assets/mergerepo/.gitdir/config | 9 + test/assets/mergerepo/.gitdir/description | 1 + .../.gitdir/hooks/applypatch-msg.sample | 15 ++ .../mergerepo/.gitdir/hooks/commit-msg.sample | 24 +++ .../.gitdir/hooks/fsmonitor-watchman.sample | 173 ++++++++++++++++++ .../.gitdir/hooks/post-update.sample | 8 + .../.gitdir/hooks/pre-applypatch.sample | 14 ++ .../mergerepo/.gitdir/hooks/pre-commit.sample | 49 +++++ .../.gitdir/hooks/pre-merge-commit.sample | 13 ++ .../mergerepo/.gitdir/hooks/pre-push.sample | 53 ++++++ .../mergerepo/.gitdir/hooks/pre-rebase.sample | 169 +++++++++++++++++ .../.gitdir/hooks/pre-receive.sample | 24 +++ .../.gitdir/hooks/prepare-commit-msg.sample | 42 +++++ .../.gitdir/hooks/push-to-checkout.sample | 78 ++++++++ .../mergerepo/.gitdir/hooks/update.sample | 128 +++++++++++++ test/assets/mergerepo/.gitdir/index | Bin 0 -> 485 bytes test/assets/mergerepo/.gitdir/info/exclude | 6 + test/assets/mergerepo/.gitdir/logs/HEAD | 15 ++ .../.gitdir/logs/refs/heads/conflict-branch | 2 + .../mergerepo/.gitdir/logs/refs/heads/feature | 4 + .../mergerepo/.gitdir/logs/refs/heads/master | 5 + .../13/77554ebea6f98a2c748183bc5a96852af12ac2 | Bin 0 -> 21 bytes .../14/905459d775f3f56a39ebc2ff081163f7da3529 | Bin 0 -> 176 bytes .../47/af50e6a799d7d0dde6630d2644f9484fb670f7 | 6 + .../47/d45fb10db26250b58f0678975a609031b7e427 | Bin 0 -> 82 bytes .../5a/ecfa0fb97eadaac050ccb99f03c3fb65460ad4 | 3 + .../66/bd6147704f78165d764ce8348ccaec81415db4 | Bin 0 -> 57 bytes .../6c/bc22e509d72758ab4c8d9f287ea846b90c448b | Bin 0 -> 171 bytes .../77/96359a96eb722939c24bafdb1afe9f07f2f628 | Bin 0 -> 117 bytes .../78/b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 | Bin 0 -> 207 bytes .../79/0b86f5fb50db485586370f27c5f90bada97d83 | Bin 0 -> 37 bytes .../82/1ed6e80627b8769d170a293862f9fc60825226 | 1 + .../83/2ff991b09f5ee3d90dc42ad6db5de4eda92989 | Bin 0 -> 96 bytes .../94/3280edca05349fbc08286ab85bb7ec47e3610b | Bin 0 -> 83 bytes .../9c/78c21d6680a7ffebc76f7ac68cacc11d8f48bc | Bin 0 -> 29 bytes .../a8/ae3dd59e6e1802c6f78e05e301bfd57c9f334f | Bin 0 -> 146 bytes .../be/83750b8d9ca12d7f142a7060926e66b10db1c0 | Bin 0 -> 61 bytes .../c6/8ff54aabf660fcdd9a2838d401583fe31249e3 | 1 + .../ca/157c10a6da9c7f10c04b7dd1afe401ba20c496 | Bin 0 -> 180 bytes .../df/2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078 | Bin 0 -> 49 bytes .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 0 -> 15 bytes .../e8/129e2a346c0522357e81d173721833b5e89082 | Bin 0 -> 180 bytes .../f0/fdbf506397e9f58c59b88dfdd72778ec06cc0c | Bin 0 -> 142 bytes .../f1/7d0d48eae3aa08cecf29128a35e310c97b3521 | Bin 0 -> 133 bytes .../fa/1bd3448c1930b9fdc0d5b39a7df04b2137493b | Bin 0 -> 37 bytes .../fc/38877b2552ab554752d9a77e1f48f738cca79b | 1 + .../.gitdir/refs/heads/conflict-branch | 1 + .../mergerepo/.gitdir/refs/heads/feature | 1 + .../mergerepo/.gitdir/refs/heads/master | 1 + test/assets/mergerepo/.gitdir/refs/tags/v0.1 | 1 + test/assets/mergerepo/.gitdir/refs/tags/v0.2 | 1 + test/assets/mergerepo/conflict_file | 1 + test/assets/mergerepo/dir/dir_file.txt | 0 test/assets/mergerepo/feature_file | 1 + test/assets/mergerepo/file | 0 test/assets/mergerepo/gitignore | 1 + test/merge_test.dart | 173 +++++++++++++++++- 66 files changed, 1502 insertions(+), 8 deletions(-) create mode 100644 test/assets/mergerepo/.gitdir/COMMIT_EDITMSG create mode 100644 test/assets/mergerepo/.gitdir/HEAD create mode 100644 test/assets/mergerepo/.gitdir/ORIG_HEAD create mode 100644 test/assets/mergerepo/.gitdir/branches/empty_marker create mode 100644 test/assets/mergerepo/.gitdir/config create mode 100644 test/assets/mergerepo/.gitdir/description create mode 100755 test/assets/mergerepo/.gitdir/hooks/applypatch-msg.sample create mode 100755 test/assets/mergerepo/.gitdir/hooks/commit-msg.sample create mode 100755 test/assets/mergerepo/.gitdir/hooks/fsmonitor-watchman.sample create mode 100755 test/assets/mergerepo/.gitdir/hooks/post-update.sample create mode 100755 test/assets/mergerepo/.gitdir/hooks/pre-applypatch.sample create mode 100755 test/assets/mergerepo/.gitdir/hooks/pre-commit.sample create mode 100755 test/assets/mergerepo/.gitdir/hooks/pre-merge-commit.sample create mode 100755 test/assets/mergerepo/.gitdir/hooks/pre-push.sample create mode 100755 test/assets/mergerepo/.gitdir/hooks/pre-rebase.sample create mode 100755 test/assets/mergerepo/.gitdir/hooks/pre-receive.sample create mode 100755 test/assets/mergerepo/.gitdir/hooks/prepare-commit-msg.sample create mode 100755 test/assets/mergerepo/.gitdir/hooks/push-to-checkout.sample create mode 100755 test/assets/mergerepo/.gitdir/hooks/update.sample create mode 100644 test/assets/mergerepo/.gitdir/index create mode 100644 test/assets/mergerepo/.gitdir/info/exclude create mode 100644 test/assets/mergerepo/.gitdir/logs/HEAD create mode 100644 test/assets/mergerepo/.gitdir/logs/refs/heads/conflict-branch create mode 100644 test/assets/mergerepo/.gitdir/logs/refs/heads/feature create mode 100644 test/assets/mergerepo/.gitdir/logs/refs/heads/master create mode 100644 test/assets/mergerepo/.gitdir/objects/13/77554ebea6f98a2c748183bc5a96852af12ac2 create mode 100644 test/assets/mergerepo/.gitdir/objects/14/905459d775f3f56a39ebc2ff081163f7da3529 create mode 100644 test/assets/mergerepo/.gitdir/objects/47/af50e6a799d7d0dde6630d2644f9484fb670f7 create mode 100644 test/assets/mergerepo/.gitdir/objects/47/d45fb10db26250b58f0678975a609031b7e427 create mode 100644 test/assets/mergerepo/.gitdir/objects/5a/ecfa0fb97eadaac050ccb99f03c3fb65460ad4 create mode 100644 test/assets/mergerepo/.gitdir/objects/66/bd6147704f78165d764ce8348ccaec81415db4 create mode 100644 test/assets/mergerepo/.gitdir/objects/6c/bc22e509d72758ab4c8d9f287ea846b90c448b create mode 100644 test/assets/mergerepo/.gitdir/objects/77/96359a96eb722939c24bafdb1afe9f07f2f628 create mode 100644 test/assets/mergerepo/.gitdir/objects/78/b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 create mode 100644 test/assets/mergerepo/.gitdir/objects/79/0b86f5fb50db485586370f27c5f90bada97d83 create mode 100644 test/assets/mergerepo/.gitdir/objects/82/1ed6e80627b8769d170a293862f9fc60825226 create mode 100644 test/assets/mergerepo/.gitdir/objects/83/2ff991b09f5ee3d90dc42ad6db5de4eda92989 create mode 100644 test/assets/mergerepo/.gitdir/objects/94/3280edca05349fbc08286ab85bb7ec47e3610b create mode 100644 test/assets/mergerepo/.gitdir/objects/9c/78c21d6680a7ffebc76f7ac68cacc11d8f48bc create mode 100644 test/assets/mergerepo/.gitdir/objects/a8/ae3dd59e6e1802c6f78e05e301bfd57c9f334f create mode 100644 test/assets/mergerepo/.gitdir/objects/be/83750b8d9ca12d7f142a7060926e66b10db1c0 create mode 100644 test/assets/mergerepo/.gitdir/objects/c6/8ff54aabf660fcdd9a2838d401583fe31249e3 create mode 100644 test/assets/mergerepo/.gitdir/objects/ca/157c10a6da9c7f10c04b7dd1afe401ba20c496 create mode 100644 test/assets/mergerepo/.gitdir/objects/df/2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078 create mode 100644 test/assets/mergerepo/.gitdir/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 create mode 100644 test/assets/mergerepo/.gitdir/objects/e8/129e2a346c0522357e81d173721833b5e89082 create mode 100644 test/assets/mergerepo/.gitdir/objects/f0/fdbf506397e9f58c59b88dfdd72778ec06cc0c create mode 100644 test/assets/mergerepo/.gitdir/objects/f1/7d0d48eae3aa08cecf29128a35e310c97b3521 create mode 100644 test/assets/mergerepo/.gitdir/objects/fa/1bd3448c1930b9fdc0d5b39a7df04b2137493b create mode 100644 test/assets/mergerepo/.gitdir/objects/fc/38877b2552ab554752d9a77e1f48f738cca79b create mode 100644 test/assets/mergerepo/.gitdir/refs/heads/conflict-branch create mode 100644 test/assets/mergerepo/.gitdir/refs/heads/feature create mode 100644 test/assets/mergerepo/.gitdir/refs/heads/master create mode 100644 test/assets/mergerepo/.gitdir/refs/tags/v0.1 create mode 100644 test/assets/mergerepo/.gitdir/refs/tags/v0.2 create mode 100644 test/assets/mergerepo/conflict_file create mode 100644 test/assets/mergerepo/dir/dir_file.txt create mode 100644 test/assets/mergerepo/feature_file create mode 100644 test/assets/mergerepo/file create mode 100644 test/assets/mergerepo/gitignore diff --git a/lib/src/bindings/index.dart b/lib/src/bindings/index.dart index bc1e1ea..54375af 100644 --- a/lib/src/bindings/index.dart +++ b/lib/src/bindings/index.dart @@ -60,6 +60,28 @@ Pointer writeTree(Pointer index) { } } +/// Write the index as a tree to the given repository. +/// +/// This method will do the same as [writeTree], but letting the user choose the repository +/// where the tree will be written. +/// +/// The index must not contain any file in conflict. +/// +/// Throws a [LibGit2Error] if error occured. +Pointer writeTreeTo( + Pointer index, + Pointer repo, +) { + final out = calloc(); + final error = libgit2.git_index_write_tree_to(out, index, repo); + + if (error < 0) { + throw LibGit2Error(libgit2.git_error_last()); + } else { + return out; + } +} + /// Find the first position of any entries which point to given path in the Git index. bool find(Pointer index, String path) { final pathC = path.toNativeUtf8().cast(); @@ -262,6 +284,69 @@ void removeAll(Pointer index, List pathspec) { } } +/// Determine if the index contains entries representing file conflicts. +bool hasConflicts(Pointer index) { + return libgit2.git_index_has_conflicts(index) == 1 ? true : false; +} + +/// Return list of conflicts in the index. +/// +/// Throws a [LibGit2Error] if error occured. +List>> conflictList( + Pointer index) { + final iterator = calloc>(); + final iteratorError = + libgit2.git_index_conflict_iterator_new(iterator, index); + + if (iteratorError < 0) { + throw LibGit2Error(libgit2.git_error_last()); + } + + var result = >>[]; + var error = 0; + + while (error >= 0) { + final ancestorOut = calloc>(); + final ourOut = calloc>(); + final theirOut = calloc>(); + error = libgit2.git_index_conflict_next( + ancestorOut, + ourOut, + theirOut, + iterator.value, + ); + if (error >= 0) { + result.add({ + 'ancestor': ancestorOut.value, + 'our': ourOut.value, + 'their': theirOut.value, + }); + calloc.free(ancestorOut); + calloc.free(ourOut); + calloc.free(theirOut); + } else { + break; + } + } + + libgit2.git_index_conflict_iterator_free(iterator.value); + return result; +} + +/// Removes the index entries that represent a conflict of a single file. +/// +/// Throws a [LibGit2Error] if error occured. +void conflictRemove(Pointer index, String path) { + final pathC = path.toNativeUtf8().cast(); + final error = libgit2.git_index_conflict_remove(index, pathC); + + calloc.free(pathC); + + if (error < 0) { + throw LibGit2Error(libgit2.git_error_last()); + } +} + /// Get the repository this index relates to. Pointer owner(Pointer index) => libgit2.git_index_owner(index); diff --git a/lib/src/bindings/merge.dart b/lib/src/bindings/merge.dart index 02932aa..6bf16a8 100644 --- a/lib/src/bindings/merge.dart +++ b/lib/src/bindings/merge.dart @@ -54,3 +54,115 @@ List analysis( return result; } } + +/// Merges the given commit(s) into HEAD, writing the results into the working directory. +/// Any changes are staged for commit and any conflicts are written to the index. Callers +/// should inspect the repository's index after this completes, resolve any conflicts and +/// prepare a commit. +/// +/// Throws a [LibGit2Error] if error occured. +void merge( + Pointer repo, + Pointer> theirHeads, + int theirHeadsLen, +) { + final mergeOpts = calloc(sizeOf()); + libgit2.git_merge_options_init(mergeOpts, 1); + + final checkoutOpts = + calloc(sizeOf()); + libgit2.git_checkout_options_init(checkoutOpts, 1); + checkoutOpts.ref.checkout_strategy = + git_checkout_strategy_t.GIT_CHECKOUT_SAFE + + git_checkout_strategy_t.GIT_CHECKOUT_RECREATE_MISSING; + + final error = libgit2.git_merge( + repo, + theirHeads, + theirHeadsLen, + mergeOpts, + checkoutOpts, + ); + + if (error < 0) { + throw LibGit2Error(libgit2.git_error_last()); + } +} + +/// Merge two commits, producing a git_index that reflects the result of the merge. +/// The index may be written as-is to the working directory or checked out. If the index +/// is to be converted to a tree, the caller should resolve any conflicts that arose as +/// part of the merge. +/// +/// The returned index must be freed explicitly. +/// +/// Throws a [LibGit2Error] if error occured. +Pointer mergeCommits( + Pointer repo, + Pointer ourCommit, + Pointer theirCommit, + Map opts, +) { + final out = calloc>(); + final optsC = calloc(sizeOf()); + optsC.ref.file_favor = opts['favor']!; + optsC.ref.flags = opts['mergeFlags']!; + optsC.ref.file_flags = opts['fileFlags']!; + optsC.ref.version = GIT_MERGE_OPTIONS_VERSION; + + final error = libgit2.git_merge_commits( + out, + repo, + ourCommit, + theirCommit, + optsC, + ); + + calloc.free(optsC); + + if (error < 0) { + throw LibGit2Error(libgit2.git_error_last()); + } else { + return out.value; + } +} + +/// Merge two trees, producing a git_index that reflects the result of the merge. +/// The index may be written as-is to the working directory or checked out. If the index +/// is to be converted to a tree, the caller should resolve any conflicts that arose as part +/// of the merge. +/// +/// The returned index must be freed explicitly. +/// +/// Throws a [LibGit2Error] if error occured. +Pointer mergeTrees( + Pointer repo, + Pointer ancestorTree, + Pointer ourTree, + Pointer theirTree, + Map opts, +) { + final out = calloc>(); + final optsC = calloc(sizeOf()); + optsC.ref.file_favor = opts['favor']!; + optsC.ref.flags = opts['mergeFlags']!; + optsC.ref.file_flags = opts['fileFlags']!; + optsC.ref.version = GIT_MERGE_OPTIONS_VERSION; + + final error = libgit2.git_merge_trees( + out, + repo, + ancestorTree, + ourTree, + theirTree, + optsC, + ); + + calloc.free(optsC); + + if (error < 0) { + throw LibGit2Error(libgit2.git_error_last()); + } else { + return out.value; + } +} diff --git a/lib/src/git_types.dart b/lib/src/git_types.dart index 7303680..b241f76 100644 --- a/lib/src/git_types.dart +++ b/lib/src/git_types.dart @@ -195,3 +195,117 @@ class GitMergePreference { int get value => _value; } + +/// Repository state. +/// +/// These values represent possible states for the repository to be in, +/// based on the current operation which is ongoing. +class GitRepositoryState { + const GitRepositoryState._(this._value); + final int _value; + + static const none = GitRepositoryState._(0); + static const merge = GitRepositoryState._(1); + static const revert = GitRepositoryState._(2); + static const reverSequence = GitRepositoryState._(3); + static const cherrypick = GitRepositoryState._(4); + static const cherrypickSequence = GitRepositoryState._(5); + static const bisect = GitRepositoryState._(6); + static const rebase = GitRepositoryState._(7); + static const rebaseInteractive = GitRepositoryState._(8); + static const rebaseMerge = GitRepositoryState._(9); + static const applyMailbox = GitRepositoryState._(10); + static const applyMailboxOrRebase = GitRepositoryState._(11); + + int get value => _value; +} + +/// Flags for merge options. +class GitMergeFlag { + const GitMergeFlag._(this._value); + final int _value; + + /// Detect renames that occur between the common ancestor and the "ours" + /// side or the common ancestor and the "theirs" side. This will enable + /// the ability to merge between a modified and renamed file. + static const findRenames = GitMergeFlag._(1); + + /// If a conflict occurs, exit immediately instead of attempting to + /// continue resolving conflicts. The merge operation will fail with + /// and no index will be returned. + static const failOnConflict = GitMergeFlag._(2); + + /// Do not write the REUC extension on the generated index. + static const skipREUC = GitMergeFlag._(4); + + /// If the commits being merged have multiple merge bases, do not build + /// a recursive merge base (by merging the multiple merge bases), + /// instead simply use the first base. + static const noRecursive = GitMergeFlag._(8); + + int get value => _value; +} + +/// Merge file favor options to instruct the file-level merging functionality +/// on how to deal with conflicting regions of the files. +class GitMergeFileFavor { + const GitMergeFileFavor._(this._value); + final int _value; + + /// When a region of a file is changed in both branches, a conflict + /// will be recorded in the index. This is the default. + static const normal = GitMergeFileFavor._(0); + + /// When a region of a file is changed in both branches, the file + /// created in the index will contain the "ours" side of any conflicting + /// region. The index will not record a conflict. + static const ours = GitMergeFileFavor._(1); + + /// When a region of a file is changed in both branches, the file + /// created in the index will contain the "theirs" side of any conflicting + /// region. The index will not record a conflict. + static const theirs = GitMergeFileFavor._(2); + + /// When a region of a file is changed in both branches, the file + /// created in the index will contain each unique line from each side, + /// which has the result of combining both files. The index will not + /// record a conflict. + static const union = GitMergeFileFavor._(3); + + int get value => _value; +} + +/// File merging flags. +class GitMergeFileFlag { + const GitMergeFileFlag._(this._value); + final int _value; + + /// Defaults. + static const defaults = GitMergeFileFlag._(0); + + /// Create standard conflicted merge files. + static const styleMerge = GitMergeFileFlag._(1); + + /// Create diff3-style files. + static const styleDiff3 = GitMergeFileFlag._(2); + + /// Condense non-alphanumeric regions for simplified diff file. + static const simplifyAlnum = GitMergeFileFlag._(4); + + /// Ignore all whitespace. + static const ignoreWhitespace = GitMergeFileFlag._(8); + + /// Ignore changes in amount of whitespace. + static const ignoreWhitespaceChange = GitMergeFileFlag._(16); + + /// Ignore whitespace at end of line. + static const ignoreWhitespaceEOL = GitMergeFileFlag._(32); + + /// Use the "patience diff" algorithm. + static const diffPatience = GitMergeFileFlag._(64); + + /// Take extra time to find minimal diff. + static const diffMinimal = GitMergeFileFlag._(128); + + int get value => _value; +} diff --git a/lib/src/index.dart b/lib/src/index.dart index 7df2ea4..5fb27e5 100644 --- a/lib/src/index.dart +++ b/lib/src/index.dart @@ -37,6 +37,43 @@ class Index { /// Returns the count of entries currently in the index. int get count => bindings.entryCount(_indexPointer); + /// Checks if the index contains entries representing file conflicts. + bool get hasConflicts => bindings.hasConflicts(_indexPointer); + + /// Returns map of conflicts in the index with key as conflicted file path and + /// value as [ConflictEntry] object. + /// + /// Throws a [LibGit2Error] if error occured. + Map get conflicts { + final conflicts = bindings.conflictList(_indexPointer); + var result = {}; + + for (var entry in conflicts) { + IndexEntry? ancestor, our, their; + String path; + + entry['ancestor'] == nullptr + ? ancestor = null + : ancestor = IndexEntry(entry['ancestor']!); + entry['our'] == nullptr ? our = null : our = IndexEntry(entry['our']!); + entry['their'] == nullptr + ? their = null + : their = IndexEntry(entry['their']!); + + if (ancestor != null) { + path = ancestor.path; + } else if (our != null) { + path = our.path; + } else { + path = their!.path; + } + + result[path] = ConflictEntry(_indexPointer, path, ancestor, our, their); + } + + return result; + } + /// Clears the contents (all the entries) of an index object. /// /// This clears the index object in memory; changes must be explicitly written to @@ -124,7 +161,15 @@ class Index { /// returns the OID of the root tree. This is the OID that can be used e.g. to create a commit. /// /// The index must not contain any file in conflict. - Oid writeTree() => Oid(bindings.writeTree(_indexPointer)); + /// + /// Throws a [LibGit2Error] if error occured or there is no associated repository and no [repo] passed. + Oid writeTree([Repository? repo]) { + if (repo == null) { + return Oid(bindings.writeTree(_indexPointer)); + } else { + return Oid(bindings.writeTreeTo(_indexPointer, repo.pointer)); + } + } /// Removes an entry from the index. /// @@ -176,3 +221,34 @@ class IndexEntry { return hex.toString(); } } + +class ConflictEntry { + /// Initializes a new instance of [ConflictEntry] class. + const ConflictEntry( + this._indexPointer, + this._path, + this.ancestor, + this.our, + this.their, + ); + + /// Common ancestor. + final IndexEntry? ancestor; + + /// "Our" side of the conflict. + final IndexEntry? our; + + /// "Their" side of the conflict. + final IndexEntry? their; + + /// Pointer to memory address for allocated index object. + final Pointer _indexPointer; + + /// Path to conflicted file. + final String _path; + + /// Removes the index entry that represent a conflict of a single file. + /// + /// Throws a [LibGit2Error] if error occured. + void remove() => bindings.conflictRemove(_indexPointer, _path); +} diff --git a/lib/src/repository.dart b/lib/src/repository.dart index 7bc3e6c..e48cf71 100644 --- a/lib/src/repository.dart +++ b/lib/src/repository.dart @@ -1,5 +1,6 @@ import 'dart:ffi'; import 'package:ffi/ffi.dart'; +import 'package:libgit2dart/libgit2dart.dart'; import 'bindings/libgit2_bindings.dart'; import 'bindings/repository.dart' as bindings; import 'bindings/merge.dart' as merge_bindings; @@ -192,7 +193,6 @@ class Repository { /// Returns the status of a git repository - ie, whether an operation /// (merge, cherry-pick, etc) is in progress. - // git_repository_state_t from libgit2_bindings.dart represents possible states int get state => bindings.state(_repoPointer); /// Removes all the metadata associated with an ongoing command like @@ -517,4 +517,95 @@ class Repository { return result; } + + /// Merges the given commit(s) oid into HEAD, writing the results into the working directory. + /// Any changes are staged for commit and any conflicts are written to the index. Callers + /// should inspect the repository's index after this completes, resolve any conflicts and + /// prepare a commit. + /// + /// Throws a [LibGit2Error] if error occured. + void merge(Oid oid) { + final theirHead = commit_bindings.annotatedLookup( + _repoPointer, + oid.pointer, + ); + + merge_bindings.merge(_repoPointer, theirHead, 1); + + commit_bindings.annotatedFree(theirHead.value); + } + + /// Merges two commits, producing a git_index that reflects the result of the merge. + /// The index may be written as-is to the working directory or checked out. If the index + /// is to be converted to a tree, the caller should resolve any conflicts that arose as + /// part of the merge. + /// + /// The returned index must be freed explicitly. + /// + /// Throws a [LibGit2Error] if error occured. + Index mergeCommits({ + required Commit ourCommit, + required Commit theirCommit, + GitMergeFileFavor favor = GitMergeFileFavor.normal, + List mergeFlags = const [GitMergeFlag.findRenames], + List fileFlags = const [GitMergeFileFlag.defaults], + }) { + var opts = {}; + opts['favor'] = favor.value; + opts['mergeFlags'] = mergeFlags.fold( + 0, + (previousValue, element) => previousValue + element.value, + ); + opts['fileFlags'] = fileFlags.fold( + 0, + (previousValue, element) => previousValue + element.value, + ); + + final result = merge_bindings.mergeCommits( + _repoPointer, + ourCommit.pointer, + theirCommit.pointer, + opts, + ); + + return Index(result); + } + + /// Merge two trees, producing a git_index that reflects the result of the merge. + /// The index may be written as-is to the working directory or checked out. If the index + /// is to be converted to a tree, the caller should resolve any conflicts that arose as part + /// of the merge. + /// + /// The returned index must be freed explicitly. + /// + /// Throws a [LibGit2Error] if error occured. + Index mergeTrees({ + required Tree ancestorTree, + required Tree ourTree, + required Tree theirTree, + GitMergeFileFavor favor = GitMergeFileFavor.normal, + List mergeFlags = const [GitMergeFlag.findRenames], + List fileFlags = const [GitMergeFileFlag.defaults], + }) { + var opts = {}; + opts['favor'] = favor.value; + opts['mergeFlags'] = mergeFlags.fold( + 0, + (previousValue, element) => previousValue + element.value, + ); + opts['fileFlags'] = fileFlags.fold( + 0, + (previousValue, element) => previousValue + element.value, + ); + + final result = merge_bindings.mergeTrees( + _repoPointer, + ancestorTree.pointer, + ourTree.pointer, + theirTree.pointer, + opts, + ); + + return Index(result); + } } diff --git a/test/assets/mergerepo/.gitdir/COMMIT_EDITMSG b/test/assets/mergerepo/.gitdir/COMMIT_EDITMSG new file mode 100644 index 0000000..d87a0dd --- /dev/null +++ b/test/assets/mergerepo/.gitdir/COMMIT_EDITMSG @@ -0,0 +1 @@ +master conflict commit diff --git a/test/assets/mergerepo/.gitdir/HEAD b/test/assets/mergerepo/.gitdir/HEAD new file mode 100644 index 0000000..cb089cd --- /dev/null +++ b/test/assets/mergerepo/.gitdir/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/assets/mergerepo/.gitdir/ORIG_HEAD b/test/assets/mergerepo/.gitdir/ORIG_HEAD new file mode 100644 index 0000000..911edc4 --- /dev/null +++ b/test/assets/mergerepo/.gitdir/ORIG_HEAD @@ -0,0 +1 @@ +c68ff54aabf660fcdd9a2838d401583fe31249e3 diff --git a/test/assets/mergerepo/.gitdir/branches/empty_marker b/test/assets/mergerepo/.gitdir/branches/empty_marker new file mode 100644 index 0000000..e69de29 diff --git a/test/assets/mergerepo/.gitdir/config b/test/assets/mergerepo/.gitdir/config new file mode 100644 index 0000000..51f9253 --- /dev/null +++ b/test/assets/mergerepo/.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/mergerepo/.gitdir/description b/test/assets/mergerepo/.gitdir/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/test/assets/mergerepo/.gitdir/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/assets/mergerepo/.gitdir/hooks/applypatch-msg.sample b/test/assets/mergerepo/.gitdir/hooks/applypatch-msg.sample new file mode 100755 index 0000000..09b38a8 --- /dev/null +++ b/test/assets/mergerepo/.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/mergerepo/.gitdir/hooks/commit-msg.sample b/test/assets/mergerepo/.gitdir/hooks/commit-msg.sample new file mode 100755 index 0000000..3ced146 --- /dev/null +++ b/test/assets/mergerepo/.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/mergerepo/.gitdir/hooks/fsmonitor-watchman.sample b/test/assets/mergerepo/.gitdir/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000..14ed0aa --- /dev/null +++ b/test/assets/mergerepo/.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/mergerepo/.gitdir/hooks/post-update.sample b/test/assets/mergerepo/.gitdir/hooks/post-update.sample new file mode 100755 index 0000000..ee496e3 --- /dev/null +++ b/test/assets/mergerepo/.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/mergerepo/.gitdir/hooks/pre-applypatch.sample b/test/assets/mergerepo/.gitdir/hooks/pre-applypatch.sample new file mode 100755 index 0000000..845130a --- /dev/null +++ b/test/assets/mergerepo/.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/mergerepo/.gitdir/hooks/pre-commit.sample b/test/assets/mergerepo/.gitdir/hooks/pre-commit.sample new file mode 100755 index 0000000..be32e5f --- /dev/null +++ b/test/assets/mergerepo/.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/mergerepo/.gitdir/hooks/pre-merge-commit.sample b/test/assets/mergerepo/.gitdir/hooks/pre-merge-commit.sample new file mode 100755 index 0000000..09b65a5 --- /dev/null +++ b/test/assets/mergerepo/.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/mergerepo/.gitdir/hooks/pre-push.sample b/test/assets/mergerepo/.gitdir/hooks/pre-push.sample new file mode 100755 index 0000000..d5e513d --- /dev/null +++ b/test/assets/mergerepo/.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/mergerepo/.gitdir/hooks/pre-rebase.sample b/test/assets/mergerepo/.gitdir/hooks/pre-rebase.sample new file mode 100755 index 0000000..36efc64 --- /dev/null +++ b/test/assets/mergerepo/.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/mergerepo/.gitdir/hooks/pre-receive.sample b/test/assets/mergerepo/.gitdir/hooks/pre-receive.sample new file mode 100755 index 0000000..6f473c3 --- /dev/null +++ b/test/assets/mergerepo/.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/mergerepo/.gitdir/hooks/prepare-commit-msg.sample b/test/assets/mergerepo/.gitdir/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..cd8e794 --- /dev/null +++ b/test/assets/mergerepo/.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/mergerepo/.gitdir/hooks/push-to-checkout.sample b/test/assets/mergerepo/.gitdir/hooks/push-to-checkout.sample new file mode 100755 index 0000000..badb4b4 --- /dev/null +++ b/test/assets/mergerepo/.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/mergerepo/.gitdir/index b/test/assets/mergerepo/.gitdir/index new file mode 100644 index 0000000000000000000000000000000000000000..92efebc444c440a400f7b6d02f2d95844bc68682 GIT binary patch literal 485 zcmZ?q402{*U|<4b)0l^Gx!sVfU z`aE0Gj8fV9ezKqk)1T^X8zLCtAtf z_VstbZI944bAI)sKe^YgtZioCP0r6t%gIbGiBHSSffxyP-xZgWK=)mhUBAN+YF;Ip zc?{3yKAOGh;x%XQZq0S&Q8x}f=?R|5Adr$-qz}Yk{T_Q5c+yf6OG=AU5zfP9UMZS+*xknh_a;L~kgF@uZ>9{U3Wi*# zL~8_=-I`M`aKO9v;`%3yyA+O01A2qOP{DvJZEvD`fq#WqY?;pslb%y=8XaS|%&d=^ W{O0`1cf3DL0?lNSEw)Rm2?GFq<)N4W literal 0 HcmV?d00001 diff --git a/test/assets/mergerepo/.gitdir/info/exclude b/test/assets/mergerepo/.gitdir/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/test/assets/mergerepo/.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/mergerepo/.gitdir/logs/HEAD b/test/assets/mergerepo/.gitdir/logs/HEAD new file mode 100644 index 0000000..366633c --- /dev/null +++ b/test/assets/mergerepo/.gitdir/logs/HEAD @@ -0,0 +1,15 @@ +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 821ed6e80627b8769d170a293862f9fc60825226 Aleksey Kulikov 1631172121 +0300 checkout: moving from master to conflict-branch +821ed6e80627b8769d170a293862f9fc60825226 47af50e6a799d7d0dde6630d2644f9484fb670f7 Aleksey Kulikov 1631172155 +0300 commit: conflict branch commit +47af50e6a799d7d0dde6630d2644f9484fb670f7 821ed6e80627b8769d170a293862f9fc60825226 Aleksey Kulikov 1631172159 +0300 checkout: moving from conflict-branch to master +821ed6e80627b8769d170a293862f9fc60825226 14905459d775f3f56a39ebc2ff081163f7da3529 Aleksey Kulikov 1631172175 +0300 commit: master conflict commit diff --git a/test/assets/mergerepo/.gitdir/logs/refs/heads/conflict-branch b/test/assets/mergerepo/.gitdir/logs/refs/heads/conflict-branch new file mode 100644 index 0000000..a9cce60 --- /dev/null +++ b/test/assets/mergerepo/.gitdir/logs/refs/heads/conflict-branch @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 821ed6e80627b8769d170a293862f9fc60825226 Aleksey Kulikov 1631172121 +0300 branch: Created from HEAD +821ed6e80627b8769d170a293862f9fc60825226 47af50e6a799d7d0dde6630d2644f9484fb670f7 Aleksey Kulikov 1631172155 +0300 commit: conflict branch commit diff --git a/test/assets/mergerepo/.gitdir/logs/refs/heads/feature b/test/assets/mergerepo/.gitdir/logs/refs/heads/feature new file mode 100644 index 0000000..44be747 --- /dev/null +++ b/test/assets/mergerepo/.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/mergerepo/.gitdir/logs/refs/heads/master b/test/assets/mergerepo/.gitdir/logs/refs/heads/master new file mode 100644 index 0000000..7f829a9 --- /dev/null +++ b/test/assets/mergerepo/.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 14905459d775f3f56a39ebc2ff081163f7da3529 Aleksey Kulikov 1631172175 +0300 commit: master conflict commit diff --git a/test/assets/mergerepo/.gitdir/objects/13/77554ebea6f98a2c748183bc5a96852af12ac2 b/test/assets/mergerepo/.gitdir/objects/13/77554ebea6f98a2c748183bc5a96852af12ac2 new file mode 100644 index 0000000000000000000000000000000000000000..c8ea349a9ff4ccfec9ea95676821b28e50244584 GIT binary patch literal 21 ccmbYS#|7)B6S>v+Dm;QaMd1+65*_T}F>s)dT-?zefJxeQBjb=c!gm%&= e7y#5!kE1<)K&Zm|8<1Ahnx!A(ZK{9$b5J3=lT_mX literal 0 HcmV?d00001 diff --git a/test/assets/mergerepo/.gitdir/objects/47/af50e6a799d7d0dde6630d2644f9484fb670f7 b/test/assets/mergerepo/.gitdir/objects/47/af50e6a799d7d0dde6630d2644f9484fb670f7 new file mode 100644 index 0000000..b0d4eae --- /dev/null +++ b/test/assets/mergerepo/.gitdir/objects/47/af50e6a799d7d0dde6630d2644f9484fb670f7 @@ -0,0 +1,6 @@ +xK +0Ego.]EjhJ +ݽp8%X{w+u +Q*(4("E+ +,hkk*8)涌f~e{y{6R.2ޞԅ%_Ah)DT +\rmG+h2* /&wND \ No newline at end of file diff --git a/test/assets/mergerepo/.gitdir/objects/47/d45fb10db26250b58f0678975a609031b7e427 b/test/assets/mergerepo/.gitdir/objects/47/d45fb10db26250b58f0678975a609031b7e427 new file mode 100644 index 0000000000000000000000000000000000000000..72e7af068da7a04c65bf0d67fe3258f497338974 GIT binary patch literal 82 zcmV-Y0ImOc0V^p=O;s>AVlXr?Ff%bxNJ~vDDJ@EkPs_|nWtdZONH(ou`Ty6)^Q(^a otT`y#@39A_4kZ62zol0/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/mergerepo/.gitdir/objects/66/bd6147704f78165d764ce8348ccaec81415db4 b/test/assets/mergerepo/.gitdir/objects/66/bd6147704f78165d764ce8348ccaec81415db4 new file mode 100644 index 0000000000000000000000000000000000000000..2da87bdba5a6c81c0e3786e51e9e824ae2ac8c24 GIT binary patch literal 57 zcmb&wu$Y;z$P*E#_A!#Z+5eKoO zTEaB>Xh$X^M}KTPd@VY^^bOy~Qs?a#Zm+qn>-*a3nm>P<)a9DCb_a5NCJ7ng11+LC Z={ef<9||KmLs99+u2AZt<_}CsP1laZP>%or literal 0 HcmV?d00001 diff --git a/test/assets/mergerepo/.gitdir/objects/77/96359a96eb722939c24bafdb1afe9f07f2f628 b/test/assets/mergerepo/.gitdir/objects/77/96359a96eb722939c24bafdb1afe9f07f2f628 new file mode 100644 index 0000000000000000000000000000000000000000..7ff03960015f01cff2fc21915c07d02f96e5c386 GIT binary patch literal 117 zcmV-*0E+*30V^p=O;s>7G+;0^FfcPQQP4}zEXhpI%P&f05H1h(+qdjzmrhAz^PZ?_ zty&+o4nb9=r6!h?7Ny3gW#*(Z%&9meo7S-W|Lf!VRmXbP9F*<%*aK4sl7BY$(d@AV%O4W55Vc1yP)atmt#Cj8q0b`fYFKW0CnT5A%5})4czf z%YB}n8iYbk^dNU^#?njf; J@C(EWUEp2eWuO26 literal 0 HcmV?d00001 diff --git a/test/assets/mergerepo/.gitdir/objects/79/0b86f5fb50db485586370f27c5f90bada97d83 b/test/assets/mergerepo/.gitdir/objects/79/0b86f5fb50db485586370f27c5f90bada97d83 new file mode 100644 index 0000000000000000000000000000000000000000..aead81b27a7f41edcd9b75ab9b283477110147ab GIT binary patch literal 37 tcmb7GGH(?FfcPQQAo_oFUd$Picd>TEGaEYjZe$WNo9C8_tET4 z7q2;ccWbUIkGgT_Nl)-ZsCpE2b1DwWrZp`8|N3}-)v=y62W9&`_Q2HPG6w)Y{y4A* Caw+}* literal 0 HcmV?d00001 diff --git a/test/assets/mergerepo/.gitdir/objects/94/3280edca05349fbc08286ab85bb7ec47e3610b b/test/assets/mergerepo/.gitdir/objects/94/3280edca05349fbc08286ab85bb7ec47e3610b new file mode 100644 index 0000000000000000000000000000000000000000..5fff1f49c8a48a2a6d3444d7381b27da6a9f1289 GIT binary patch literal 83 zcmV-Z0IdIb0V^p=O;s>AU@$Z=Ff%bx&`ZxO$xP47FG^()E)VtFx9n$^PDx|)o~UW9 pS|7CzK~<$?=A<$_oBL??ri<5{y}LEnl}Ft;^rR7F<>w>FfcPQQP4}zEXhpI%P&f05H1h(+qdjzmrhAz^PZ?_ zty&+o4w)DLfkH}V5kuPEME3&!3bEKSpBE-Qr`|L=#%_U{k(QcRQd*Q6pO%@E$}p$m zkZfAR^8c@o=T{x;S#waf-(wF<9Z3G!+()xFUA*S(-L1Kn*Fxv)5_&?<#!Z R>HooHhE>cb2IdLM#Q=a~7i0hc literal 0 HcmV?d00001 diff --git a/test/assets/mergerepo/.gitdir/objects/c6/8ff54aabf660fcdd9a2838d401583fe31249e3 b/test/assets/mergerepo/.gitdir/objects/c6/8ff54aabf660fcdd9a2838d401583fe31249e3 new file mode 100644 index 0000000..e2a64e4 --- /dev/null +++ b/test/assets/mergerepo/.gitdir/objects/c6/8ff54aabf660fcdd9a2838d401583fe31249e3 @@ -0,0 +1 @@ +xAn @Ѯ9+Y3 HQծ{.!rO2@[kGɉq661~$,Q]6`%1[/,}@ڳ࢙5)~!M{?rKkR_@^09O4U_C  VFZ?E=N8o>Olc9b>mZjY&&QEGaEYg_ts@;*e}w!}9;HkLOn%>sfP9w%=n9 iOdZIUXLBFT-gNPrvv;@Vy7H(Sho1BVPXquNl1_=&i&UTh literal 0 HcmV?d00001 diff --git a/test/assets/mergerepo/.gitdir/objects/df/2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078 b/test/assets/mergerepo/.gitdir/objects/df/2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078 new file mode 100644 index 0000000000000000000000000000000000000000..27ab3ea6d67e0ad2f45441b734a717d429e5bb77 GIT binary patch literal 49 zcmbn*Fxv)5_&?<#!Z>HoonL1nR^ FEW65jv- literal 0 HcmV?d00001 diff --git a/test/assets/mergerepo/.gitdir/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/test/assets/mergerepo/.gitdir/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 new file mode 100644 index 0000000000000000000000000000000000000000..711223894375fe1186ac5bfffdc48fb1fa1e65cc GIT binary patch literal 15 Wcmb&l~U9D33dJP`m$@lN8wbXOz* literal 0 HcmV?d00001 diff --git a/test/assets/mergerepo/.gitdir/objects/f0/fdbf506397e9f58c59b88dfdd72778ec06cc0c b/test/assets/mergerepo/.gitdir/objects/f0/fdbf506397e9f58c59b88dfdd72778ec06cc0c new file mode 100644 index 0000000000000000000000000000000000000000..88a7b3e3605ae9f665946e25a53e2cb7992fa52e GIT binary patch literal 142 zcmV;90CE3#0Ts+m4#FT1Kw;OMV)iD@Fj#&PV|48)Xqh(H0>)w!Zg1Va&HJjKL0;^s z3@;ulSdttxThwF*YqSf}peLuSrpZmCMoT@B7PY+@#*$L3q8`SM9sOhG4?I?0Hg53z wu5l?lT(>3W+`1HVxX;PQwL8umNUgAU&X9sLDnucC&ZYXw0S-$103$vx2ldTCM*si- literal 0 HcmV?d00001 diff --git a/test/assets/mergerepo/.gitdir/objects/f1/7d0d48eae3aa08cecf29128a35e310c97b3521 b/test/assets/mergerepo/.gitdir/objects/f1/7d0d48eae3aa08cecf29128a35e310c97b3521 new file mode 100644 index 0000000000000000000000000000000000000000..a6a581a5f419464ab5a040e08469d440e9188f24 GIT binary patch literal 133 zcmV;00DAv;0j14B4#FT1KvCD6V)iD@04;^Y7+re`3WH8sAZe*dZ*TA5_AlNKHD_)h zt-iFC2x3x`O~E;mLB>8#0lgji=+daJDVUj54WdJC<4=(@! literal 0 HcmV?d00001 diff --git a/test/assets/mergerepo/.gitdir/objects/fc/38877b2552ab554752d9a77e1f48f738cca79b b/test/assets/mergerepo/.gitdir/objects/fc/38877b2552ab554752d9a77e1f48f738cca79b new file mode 100644 index 0000000..47886e5 --- /dev/null +++ b/test/assets/mergerepo/.gitdir/objects/fc/38877b2552ab554752d9a77e1f48f738cca79b @@ -0,0 +1 @@ +xKn0 )4]P`.l9o_ߡ۷jbMf%#+hV!Za7lt0)&"%]\DEZ7ec>e9.:?>`0t wյ^]PEB?6RgQM \ No newline at end of file diff --git a/test/assets/mergerepo/.gitdir/refs/heads/conflict-branch b/test/assets/mergerepo/.gitdir/refs/heads/conflict-branch new file mode 100644 index 0000000..4d565f0 --- /dev/null +++ b/test/assets/mergerepo/.gitdir/refs/heads/conflict-branch @@ -0,0 +1 @@ +47af50e6a799d7d0dde6630d2644f9484fb670f7 diff --git a/test/assets/mergerepo/.gitdir/refs/heads/feature b/test/assets/mergerepo/.gitdir/refs/heads/feature new file mode 100644 index 0000000..3584be2 --- /dev/null +++ b/test/assets/mergerepo/.gitdir/refs/heads/feature @@ -0,0 +1 @@ +5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 diff --git a/test/assets/mergerepo/.gitdir/refs/heads/master b/test/assets/mergerepo/.gitdir/refs/heads/master new file mode 100644 index 0000000..e1a432c --- /dev/null +++ b/test/assets/mergerepo/.gitdir/refs/heads/master @@ -0,0 +1 @@ +14905459d775f3f56a39ebc2ff081163f7da3529 diff --git a/test/assets/mergerepo/.gitdir/refs/tags/v0.1 b/test/assets/mergerepo/.gitdir/refs/tags/v0.1 new file mode 100644 index 0000000..e4cb9a5 --- /dev/null +++ b/test/assets/mergerepo/.gitdir/refs/tags/v0.1 @@ -0,0 +1 @@ +78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 diff --git a/test/assets/mergerepo/.gitdir/refs/tags/v0.2 b/test/assets/mergerepo/.gitdir/refs/tags/v0.2 new file mode 100644 index 0000000..3e0b1fd --- /dev/null +++ b/test/assets/mergerepo/.gitdir/refs/tags/v0.2 @@ -0,0 +1 @@ +f0fdbf506397e9f58c59b88dfdd72778ec06cc0c diff --git a/test/assets/mergerepo/conflict_file b/test/assets/mergerepo/conflict_file new file mode 100644 index 0000000..790b86f --- /dev/null +++ b/test/assets/mergerepo/conflict_file @@ -0,0 +1 @@ +master conflict edit diff --git a/test/assets/mergerepo/dir/dir_file.txt b/test/assets/mergerepo/dir/dir_file.txt new file mode 100644 index 0000000..e69de29 diff --git a/test/assets/mergerepo/feature_file b/test/assets/mergerepo/feature_file new file mode 100644 index 0000000..9c78c21 --- /dev/null +++ b/test/assets/mergerepo/feature_file @@ -0,0 +1 @@ +Feature edit diff --git a/test/assets/mergerepo/file b/test/assets/mergerepo/file new file mode 100644 index 0000000..e69de29 diff --git a/test/assets/mergerepo/gitignore b/test/assets/mergerepo/gitignore new file mode 100644 index 0000000..1377554 --- /dev/null +++ b/test/assets/mergerepo/gitignore @@ -0,0 +1 @@ +*.swp diff --git a/test/merge_test.dart b/test/merge_test.dart index 9d96bcf..22f58bd 100644 --- a/test/merge_test.dart +++ b/test/merge_test.dart @@ -1,18 +1,19 @@ import 'dart:io'; import 'package:test/test.dart'; import 'package:libgit2dart/libgit2dart.dart'; +import 'package:libgit2dart/src/git_types.dart'; import 'helpers/util.dart'; void main() { late Repository repo; - final tmpDir = '${Directory.systemTemp.path}/merge_testrepo/'; + final tmpDir = '${Directory.systemTemp.path}/mergerepo/'; setUp(() async { if (await Directory(tmpDir).exists()) { await Directory(tmpDir).delete(recursive: true); } await copyRepo( - from: Directory('test/assets/testrepo/'), + from: Directory('test/assets/mergerepo/'), to: await Directory(tmpDir).create(), ); repo = Repository.open(tmpDir); @@ -28,8 +29,8 @@ void main() { test('is up to date when no reference is provided', () { final commit = repo['c68ff54aabf660fcdd9a2838d401583fe31249e3'] as Commit; - final result = repo.mergeAnalysis(commit.id); + final result = repo.mergeAnalysis(commit.id); expect(result[0], GitMergeAnalysis.upToDate.value); expect(repo.status, isEmpty); @@ -39,8 +40,8 @@ void main() { test('is up to date for provided ref', () { final commit = repo['c68ff54aabf660fcdd9a2838d401583fe31249e3'] as Commit; - final result = repo.mergeAnalysis(commit.id, 'refs/tags/v0.1'); + final result = repo.mergeAnalysis(commit.id, 'refs/tags/v0.1'); expect(result[0], GitMergeAnalysis.upToDate.value); expect(repo.status, isEmpty); @@ -58,7 +59,6 @@ void main() { ); final result = repo.mergeAnalysis(theirHead.id, ffBranch.name); - expect( result[0], GitMergeAnalysis.fastForward.value + GitMergeAnalysis.normal.value, @@ -73,13 +73,174 @@ void main() { test('is not fast forward and there is no conflicts', () { final commit = repo['5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'] as Commit; - final result = repo.mergeAnalysis(commit.id); + final result = repo.mergeAnalysis(commit.id); expect(result[0], GitMergeAnalysis.normal.value); expect(repo.status, isEmpty); commit.free(); }); }); + + test('writes conflicts to index', () { + final conflictBranch = repo.branches['conflict-branch']; + final index = repo.index; + + final result = repo.mergeAnalysis(conflictBranch.target); + expect(result[0], GitMergeAnalysis.normal.value); + + repo.merge(conflictBranch.target); + expect(index.hasConflicts, true); + expect(index.conflicts.length, 1); + expect(repo.state, GitRepositoryState.merge.value); + expect(repo.status, {'conflict_file': GitStatus.conflicted.value}); + + final conflictedFile = index.conflicts['conflict_file']!; + expect(conflictedFile.ancestor, null); + expect(conflictedFile.our?.path, 'conflict_file'); + expect(conflictedFile.their?.path, 'conflict_file'); + + index.add('conflict_file'); + index.write(); + expect(index.hasConflicts, false); + expect(index.conflicts, isEmpty); + expect(repo.status, {'conflict_file': GitStatus.indexModified.value}); + + index.free(); + conflictBranch.free(); + }); + + test('successfully removes conflicts', () { + final conflictBranch = repo.branches['conflict-branch']; + final index = repo.index; + + repo.merge(conflictBranch.target); + expect(index.hasConflicts, true); + expect(index.conflicts.length, 1); + + final conflictedFile = index.conflicts['conflict_file']!; + conflictedFile.remove(); + expect(index.hasConflicts, false); + expect(index.conflicts, isEmpty); + expect(index.conflicts['conflict_file'], null); + + index.free(); + conflictBranch.free(); + }); + + group('merge commits', () { + test('successfully merges with default values', () { + final theirCommit = + repo['5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'] as Commit; + final ourCommit = + repo['14905459d775f3f56a39ebc2ff081163f7da3529'] as Commit; + + final mergeIndex = repo.mergeCommits( + ourCommit: ourCommit, + theirCommit: theirCommit, + ); + expect(mergeIndex.conflicts, isEmpty); + final mergeCommitsTree = mergeIndex.writeTree(repo); + + repo.merge(theirCommit.id); + final index = repo.index; + expect(index.conflicts, isEmpty); + final mergeTree = index.writeTree(); + + expect(mergeCommitsTree == mergeTree, true); + + index.free(); + mergeIndex.free(); + ourCommit.free(); + theirCommit.free(); + }); + + test('successfully merges with provided favor', () { + final theirCommit = + repo['5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'] as Commit; + final ourCommit = + repo['14905459d775f3f56a39ebc2ff081163f7da3529'] as Commit; + + final mergeIndex = repo.mergeCommits( + ourCommit: ourCommit, + theirCommit: theirCommit, + favor: GitMergeFileFavor.ours, + ); + expect(mergeIndex.conflicts, isEmpty); + + mergeIndex.free(); + ourCommit.free(); + theirCommit.free(); + }); + }); + + group('merge trees', () { + test('successfully merges with default values', () { + final theirCommit = + repo['5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'] as Commit; + final ourCommit = + repo['14905459d775f3f56a39ebc2ff081163f7da3529'] as Commit; + final baseCommit = + repo[repo.mergeBase(ourCommit.id.sha, theirCommit.id.sha).sha] + as Commit; + final theirTree = repo[theirCommit.tree.sha] as Tree; + final ourTree = repo[ourCommit.tree.sha] as Tree; + final ancestorTree = repo[baseCommit.tree.sha] as Tree; + + final mergeIndex = repo.mergeTrees( + ancestorTree: ancestorTree, + ourTree: ourTree, + theirTree: theirTree, + ); + expect(mergeIndex.conflicts, isEmpty); + final mergeTreesTree = mergeIndex.writeTree(repo); + + repo.setHead('14905459d775f3f56a39ebc2ff081163f7da3529'); + repo.merge(theirCommit.id); + final index = repo.index; + expect(index.conflicts, isEmpty); + final mergeTree = index.writeTree(); + + expect(mergeTreesTree == mergeTree, true); + + index.free(); + mergeIndex.free(); + ancestorTree.free(); + ourTree.free(); + theirTree.free(); + baseCommit.free(); + ourCommit.free(); + theirCommit.free(); + }); + + test('successfully merges with provided favor', () { + final theirCommit = + repo['5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'] as Commit; + final ourCommit = + repo['14905459d775f3f56a39ebc2ff081163f7da3529'] as Commit; + final baseCommit = + repo[repo.mergeBase(ourCommit.id.sha, theirCommit.id.sha).sha] + as Commit; + final theirTree = repo[theirCommit.tree.sha] as Tree; + final ourTree = repo[ourCommit.tree.sha] as Tree; + final ancestorTree = repo[baseCommit.tree.sha] as Tree; + + final mergeIndex = repo.mergeTrees( + ancestorTree: ancestorTree, + ourTree: ourTree, + theirTree: theirTree, + favor: GitMergeFileFavor.ours, + ); + expect(mergeIndex.conflicts, isEmpty); + + mergeIndex.free(); + ancestorTree.free(); + ourTree.free(); + theirTree.free(); + baseCommit.free(); + ourCommit.free(); + theirCommit.free(); + }); + }); }); }