From: Alban Gruin <alban.gruin@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Alban Gruin <alban.gruin@gmail.com> Subject: [RFC PATCH v1 08/17] merge-resolve: remove calls to external processes Date: Thu, 25 Jun 2020 14:19:44 +0200 [thread overview] Message-ID: <20200625121953.16991-9-alban.gruin@gmail.com> (raw) In-Reply-To: <20200625121953.16991-1-alban.gruin@gmail.com> This removes calls to external processes to avoid reading and writing the index over and over again. - The call to `update-index -q --refresh' is replaced by a call to refresh_index(). - The call to `read-tree' is replaced by a call to unpack_trees() (and all the setup needed). - The call to `write-tree' is replaced by a call to write_index_as_tree(). - The call to `merge-index', needed to invoke `git merge-one-file', is replaced by a call to the new merge_all() function. A callback function, merge_one_file_cb(), is added to allow it to call merge_one_file() without forking. Here too, the index is read in cmd_merge_resolve(), but merge_resolve() takes care of writing it back to the disk. Signed-off-by: Alban Gruin <alban.gruin@gmail.com> --- builtin/merge-resolve.c | 103 ++++++++++++++++++++++++++++------------ merge-strategies.c | 11 +++++ merge-strategies.h | 6 +++ 3 files changed, 89 insertions(+), 31 deletions(-) diff --git a/builtin/merge-resolve.c b/builtin/merge-resolve.c index c66fef7b7f..2c364fcdb0 100644 --- a/builtin/merge-resolve.c +++ b/builtin/merge-resolve.c @@ -10,54 +10,91 @@ */ #include "cache.h" +#include "cache-tree.h" #include "builtin.h" -#include "run-command.h" +#include "lockfile.h" +#include "merge-strategies.h" +#include "unpack-trees.h" + +static int add_tree(const struct object_id *oid, struct tree_desc *t) +{ + struct tree *tree; + + tree = parse_tree_indirect(oid); + if (parse_tree(tree)) + return -1; + + init_tree_desc(t, tree->buffer, tree->size); + return 0; +} static int merge_resolve(struct commit_list *bases, const char *head_arg, struct commit_list *remote) { + int i = 0; + struct lock_file lock = LOCK_INIT; + struct tree_desc t[MAX_UNPACK_TREES]; + struct unpack_trees_options opts; + struct object_id head, oid; struct commit_list *j; - struct child_process cp_update = CHILD_PROCESS_INIT, - cp_read = CHILD_PROCESS_INIT, - cp_write = CHILD_PROCESS_INIT; - - cp_update.git_cmd = 1; - argv_array_pushl(&cp_update.args, "update-index", "-q", "--refresh", NULL); - run_command(&cp_update); - - cp_read.git_cmd = 1; - argv_array_pushl(&cp_read.args, "read-tree", "-u", "-m", "--aggressive", NULL); - - for (j = bases; j && j->item; j = j->next) - argv_array_push(&cp_read.args, oid_to_hex(&j->item->object.oid)); if (head_arg) - argv_array_push(&cp_read.args, head_arg); - if (remote && remote->item) - argv_array_push(&cp_read.args, oid_to_hex(&remote->item->object.oid)); + get_oid(head_arg, &head); - if (run_command(&cp_read)) - return 2; + repo_hold_locked_index(the_repository, &lock, LOCK_DIE_ON_ERROR); + refresh_index(the_repository->index, 0, NULL, NULL, NULL); + + memset(&opts, 0, sizeof(opts)); + opts.head_idx = 1; + opts.src_index = the_repository->index; + opts.dst_index = the_repository->index; + opts.update = 1; + opts.merge = 1; + opts.aggressive = 1; + + for (j = bases; j; j = j->next) { + if (add_tree(&j->item->object.oid, t + (i++))) + goto out; + } + + if (head_arg && add_tree(&head, t + (i++))) + goto out; + if (remote && add_tree(&remote->item->object.oid, t + (i++))) + goto out; + + if (i == 1) + opts.fn = oneway_merge; + else if (i == 2) { + opts.fn = twoway_merge; + opts.initial_checkout = is_index_unborn(the_repository->index); + } else if (i >= 3) { + opts.fn = threeway_merge; + opts.head_idx = i - 1; + } + + if (unpack_trees(i, t, &opts)) + goto out; puts("Trying simple merge."); + write_locked_index(the_repository->index, &lock, COMMIT_LOCK); - cp_write.git_cmd = 1; - cp_write.no_stdout = 1; - cp_write.no_stderr = 1; - argv_array_push(&cp_write.args, "write-tree"); - if (run_command(&cp_write)) { - struct child_process cp_merge = CHILD_PROCESS_INIT; + if (write_index_as_tree(&oid, the_repository->index, + the_repository->index_file, 0, NULL)) { + int ret; - puts("Simple merge failed, trying Automatic merge."); + repo_hold_locked_index(the_repository, &lock, LOCK_DIE_ON_ERROR); + ret = merge_all(the_repository->index, 0, 0, + merge_one_file_cb, the_repository); - cp_merge.git_cmd = 1; - argv_array_pushl(&cp_merge.args, "merge-index", "-o", - "git-merge-one-file", "-a", NULL); - if (run_command(&cp_merge)) - return 1; + write_locked_index(the_repository->index, &lock, COMMIT_LOCK); + return !!ret; } return 0; + + out: + rollback_lock_file(&lock); + return 2; } static const char builtin_merge_resolve_usage[] = @@ -73,6 +110,10 @@ int cmd_merge_resolve(int argc, const char **argv, const char *prefix) if (argc < 5) usage(builtin_merge_resolve_usage); + setup_work_tree(); + if (repo_read_index(the_repository) < 0) + die("invalid index"); + /* The first parameters up to -- are merge bases; the rest are * heads. */ for (i = 1; i < argc; i++) { diff --git a/merge-strategies.c b/merge-strategies.c index f4c0b4acd6..39bfa1af7b 100644 --- a/merge-strategies.c +++ b/merge-strategies.c @@ -191,6 +191,17 @@ int merge_strategies_one_file(struct repository *r, return 0; } +int merge_one_file_cb(const struct object_id *orig_blob, + const struct object_id *our_blob, + const struct object_id *their_blob, const char *path, + unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode, + void *data) +{ + return merge_strategies_one_file((struct repository *)data, + orig_blob, our_blob, their_blob, path, + orig_mode, our_mode, their_mode); +} + int merge_program_cb(const struct object_id *orig_blob, const struct object_id *our_blob, const struct object_id *their_blob, const char *path, diff --git a/merge-strategies.h b/merge-strategies.h index cf78d7eaf4..40e175ca39 100644 --- a/merge-strategies.h +++ b/merge-strategies.h @@ -16,6 +16,12 @@ typedef int (*merge_cb)(const struct object_id *orig_blob, unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode, void *data); +int merge_one_file_cb(const struct object_id *orig_blob, + const struct object_id *our_blob, + const struct object_id *their_blob, const char *path, + unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode, + void *data); + int merge_program_cb(const struct object_id *orig_blob, const struct object_id *our_blob, const struct object_id *their_blob, const char *path, -- 2.27.0.139.gc9c318d6bf
next prev parent reply other threads:[~2020-06-25 12:49 UTC|newest] Thread overview: 156+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-25 12:19 [RFC PATCH v1 00/17] Rewrite the remaining merge strategies from shell to C Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 01/17] t6027: modernise tests Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 02/17] merge-one-file: rewrite in C Alban Gruin 2020-06-25 14:55 ` Chris Torek 2020-06-25 15:16 ` Phillip Wood 2020-06-25 18:17 ` Phillip Wood 2020-06-26 14:33 ` Phillip Wood 2020-07-12 11:22 ` Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 03/17] merge-one-file: remove calls to external processes Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 04/17] merge-one-file: use error() instead of fprintf(stderr, ...) Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 05/17] merge-one-file: libify merge_one_file() Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 06/17] merge-index: libify merge_one_path() and merge_all() Alban Gruin 2020-06-26 10:13 ` Phillip Wood 2020-06-26 14:32 ` Phillip Wood 2020-07-12 11:36 ` Alban Gruin 2020-07-12 18:02 ` Phillip Wood 2020-07-12 20:10 ` Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 07/17] merge-resolve: rewrite in C Alban Gruin 2020-06-25 12:19 ` Alban Gruin [this message] 2020-06-25 12:19 ` [RFC PATCH v1 09/17] merge-resolve: libify merge_resolve() Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 10/17] merge-recursive: move better_branch_name() to merge.c Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 11/17] merge-octopus: rewrite in C Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 12/17] merge-octopus: remove calls to external processes Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 13/17] merge-octopus: libify merge_octopus() Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 14/17] merge: use the "resolve" strategy without forking Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 15/17] merge: use the "octopus" " Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 16/17] sequencer: use the "resolve" " Alban Gruin 2020-06-25 16:11 ` Phillip Wood 2020-07-12 11:27 ` Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 17/17] sequencer: use the "octopus" merge " Alban Gruin 2020-09-01 10:56 ` [PATCH v2 00/11] Rewrite the remaining merge strategies from shell to C Alban Gruin 2020-09-01 10:56 ` [PATCH v2 01/11] t6027: modernise tests Alban Gruin 2020-09-01 10:56 ` [PATCH v2 02/11] merge-one-file: rewrite in C Alban Gruin 2020-09-01 21:06 ` Junio C Hamano 2020-09-02 14:50 ` Alban Gruin 2020-09-01 10:56 ` [PATCH v2 03/11] merge-index: libify merge_one_path() and merge_all() Alban Gruin 2020-09-01 21:11 ` Junio C Hamano 2020-09-02 15:37 ` Alban Gruin 2020-09-01 10:56 ` [PATCH v2 04/11] merge-index: don't fork if the requested program is `git-merge-one-file' Alban Gruin 2020-09-01 10:56 ` [PATCH v2 05/11] merge-resolve: rewrite in C Alban Gruin 2020-09-01 10:57 ` [PATCH v2 06/11] merge-recursive: move better_branch_name() to merge.c Alban Gruin 2020-09-01 10:57 ` [PATCH v2 07/11] merge-octopus: rewrite in C Alban Gruin 2020-09-01 10:57 ` [PATCH v2 08/11] merge: use the "resolve" strategy without forking Alban Gruin 2020-09-01 10:57 ` [PATCH v2 09/11] merge: use the "octopus" " Alban Gruin 2020-09-01 10:57 ` [PATCH v2 10/11] sequencer: use the "resolve" " Alban Gruin 2020-09-01 10:57 ` [PATCH v2 11/11] sequencer: use the "octopus" merge " Alban Gruin 2020-10-05 12:26 ` [PATCH v3 00/11] Rewrite the remaining merge strategies from shell to C Alban Gruin 2020-10-05 12:26 ` [PATCH v3 01/11] t6027: modernise tests Alban Gruin 2020-10-06 20:50 ` Junio C Hamano 2020-10-05 12:26 ` [PATCH v3 02/11] merge-one-file: rewrite in C Alban Gruin 2020-10-06 22:01 ` Junio C Hamano 2020-10-21 19:47 ` Alban Gruin 2020-10-21 20:28 ` Junio C Hamano 2020-10-21 21:20 ` Junio C Hamano 2020-10-21 20:30 ` Junio C Hamano 2020-10-05 12:26 ` [PATCH v3 03/11] merge-index: libify merge_one_path() and merge_all() Alban Gruin 2020-10-09 4:48 ` Junio C Hamano 2020-11-06 19:53 ` Alban Gruin 2020-10-05 12:26 ` [PATCH v3 04/11] merge-index: don't fork if the requested program is `git-merge-one-file' Alban Gruin 2020-10-16 19:07 ` Junio C Hamano 2020-10-05 12:26 ` [PATCH v3 05/11] merge-resolve: rewrite in C Alban Gruin 2020-10-16 19:19 ` Junio C Hamano 2020-11-06 19:53 ` Alban Gruin 2020-10-05 12:26 ` [PATCH v3 06/11] merge-recursive: move better_branch_name() to merge.c Alban Gruin 2020-10-05 12:26 ` [PATCH v3 07/11] merge-octopus: rewrite in C Alban Gruin 2020-10-05 12:26 ` [PATCH v3 08/11] merge: use the "resolve" strategy without forking Alban Gruin 2020-10-05 12:26 ` [PATCH v3 09/11] merge: use the "octopus" " Alban Gruin 2020-10-05 12:26 ` [PATCH v3 10/11] sequencer: use the "resolve" " Alban Gruin 2020-10-05 12:26 ` [PATCH v3 11/11] sequencer: use the "octopus" merge " Alban Gruin 2020-10-07 6:57 ` [PATCH v3 00/11] Rewrite the remaining merge strategies from shell to C Johannes Schindelin 2020-11-13 11:04 ` [PATCH v4 00/12] " Alban Gruin 2020-11-13 11:04 ` [PATCH v4 01/12] t6027: modernise tests Alban Gruin 2020-11-13 11:04 ` [PATCH v4 02/12] update-index: move add_cacheinfo() to read-cache.c Alban Gruin 2020-11-13 11:04 ` [PATCH v4 03/12] merge-one-file: rewrite in C Alban Gruin 2020-11-13 11:04 ` [PATCH v4 04/12] merge-index: libify merge_one_path() and merge_all() Alban Gruin 2020-11-13 11:04 ` [PATCH v4 05/12] merge-index: don't fork if the requested program is `git-merge-one-file' Alban Gruin 2020-11-13 11:04 ` [PATCH v4 06/12] merge-resolve: rewrite in C Alban Gruin 2020-11-13 11:04 ` [PATCH v4 07/12] merge-recursive: move better_branch_name() to merge.c Alban Gruin 2020-11-13 11:04 ` [PATCH v4 08/12] merge-octopus: rewrite in C Alban Gruin 2020-11-13 11:04 ` [PATCH v4 09/12] merge: use the "resolve" strategy without forking Alban Gruin 2020-11-13 11:04 ` [PATCH v4 10/12] merge: use the "octopus" " Alban Gruin 2020-11-13 11:04 ` [PATCH v4 11/12] sequencer: use the "resolve" " Alban Gruin 2020-11-13 11:04 ` [PATCH v4 12/12] sequencer: use the "octopus" merge " Alban Gruin 2020-11-16 10:21 ` [PATCH v5 00/12] Rewrite the remaining merge strategies from shell to C Alban Gruin 2020-11-16 10:21 ` [PATCH v5 01/12] t6027: modernise tests Alban Gruin 2020-11-16 10:21 ` [PATCH v5 02/12] update-index: move add_cacheinfo() to read-cache.c Alban Gruin 2020-11-16 10:21 ` [PATCH v5 03/12] merge-one-file: rewrite in C Alban Gruin 2020-11-16 10:21 ` [PATCH v5 04/12] merge-index: libify merge_one_path() and merge_all() Alban Gruin 2020-11-16 10:21 ` [PATCH v5 05/12] merge-index: don't fork if the requested program is `git-merge-one-file' Alban Gruin 2020-11-16 10:21 ` [PATCH v5 06/12] merge-resolve: rewrite in C Alban Gruin 2020-11-16 10:21 ` [PATCH v5 07/12] merge-recursive: move better_branch_name() to merge.c Alban Gruin 2020-11-16 10:21 ` [PATCH v5 08/12] merge-octopus: rewrite in C Alban Gruin 2020-11-16 10:21 ` [PATCH v5 09/12] merge: use the "resolve" strategy without forking Alban Gruin 2020-11-16 10:21 ` [PATCH v5 10/12] merge: use the "octopus" " Alban Gruin 2020-11-16 10:21 ` [PATCH v5 11/12] sequencer: use the "resolve" " Alban Gruin 2020-11-16 10:21 ` [PATCH v5 12/12] sequencer: use the "octopus" merge " Alban Gruin 2020-11-24 11:53 ` [PATCH v6 00/13] Rewrite the remaining merge strategies from shell to C Alban Gruin 2020-11-24 11:53 ` [PATCH v6 01/13] t6407: modernise tests Alban Gruin 2020-11-24 11:53 ` [PATCH v6 02/13] t6060: modify multiple files to expose a possible issue with merge-index Alban Gruin 2020-11-24 11:53 ` [PATCH v6 03/13] update-index: move add_cacheinfo() to read-cache.c Alban Gruin 2020-12-22 20:54 ` Junio C Hamano 2020-11-24 11:53 ` [PATCH v6 04/13] merge-one-file: rewrite in C Alban Gruin 2020-12-22 21:36 ` Junio C Hamano 2021-01-03 22:41 ` Alban Gruin 2021-01-08 6:54 ` Junio C Hamano 2020-11-24 11:53 ` [PATCH v6 05/13] merge-index: libify merge_one_path() and merge_all() Alban Gruin 2021-01-05 15:59 ` Derrick Stolee 2021-01-05 23:20 ` Alban Gruin 2020-11-24 11:53 ` [PATCH v6 06/13] merge-index: don't fork if the requested program is `git-merge-one-file' Alban Gruin 2021-01-05 16:11 ` Derrick Stolee 2021-01-05 17:35 ` Martin Ågren 2021-01-05 23:20 ` Alban Gruin 2021-01-05 23:20 ` Alban Gruin 2021-01-06 2:04 ` Junio C Hamano 2021-01-10 17:15 ` Alban Gruin 2021-01-10 20:51 ` Junio C Hamano 2021-03-08 20:32 ` Alban Gruin 2020-11-24 11:53 ` [PATCH v6 07/13] merge-resolve: rewrite in C Alban Gruin 2020-11-24 11:53 ` [PATCH v6 08/13] merge-recursive: move better_branch_name() to merge.c Alban Gruin 2021-01-05 16:19 ` Derrick Stolee 2020-11-24 11:53 ` [PATCH v6 09/13] merge-octopus: rewrite in C Alban Gruin 2021-01-05 16:40 ` Derrick Stolee 2020-11-24 11:53 ` [PATCH v6 10/13] merge: use the "resolve" strategy without forking Alban Gruin 2021-01-05 16:45 ` Derrick Stolee 2020-11-24 11:53 ` [PATCH v6 11/13] merge: use the "octopus" " Alban Gruin 2020-11-24 11:53 ` [PATCH v6 12/13] sequencer: use the "resolve" " Alban Gruin 2020-11-24 11:53 ` [PATCH v6 13/13] sequencer: use the "octopus" merge " Alban Gruin 2020-11-24 19:34 ` [PATCH v6 00/13] Rewrite the remaining merge strategies from shell to C SZEDER Gábor 2021-01-05 16:50 ` Derrick Stolee 2021-03-17 20:49 ` [PATCH v7 00/15] " Alban Gruin 2021-03-17 20:49 ` [PATCH v7 01/15] t6407: modernise tests Alban Gruin 2021-03-17 20:49 ` [PATCH v7 02/15] t6060: modify multiple files to expose a possible issue with merge-index Alban Gruin 2021-03-17 20:49 ` [PATCH v7 03/15] t6060: add tests for removed files Alban Gruin 2021-03-22 21:36 ` Johannes Schindelin 2021-03-23 20:43 ` Alban Gruin 2021-03-17 20:49 ` [PATCH v7 04/15] merge-index: libify merge_one_path() and merge_all() Alban Gruin 2021-03-17 20:49 ` [PATCH v7 05/15] merge-index: drop the index Alban Gruin 2021-03-17 20:49 ` [PATCH v7 06/15] merge-index: add a new way to invoke `git-merge-one-file' Alban Gruin 2021-03-17 20:49 ` [PATCH v7 07/15] update-index: move add_cacheinfo() to read-cache.c Alban Gruin 2021-03-22 21:59 ` Johannes Schindelin 2021-03-23 20:45 ` Alban Gruin 2021-03-17 20:49 ` [PATCH v7 08/15] merge-one-file: rewrite in C Alban Gruin 2021-03-22 22:20 ` Johannes Schindelin 2021-03-23 20:53 ` Alban Gruin 2021-03-24 9:10 ` Johannes Schindelin 2021-04-10 14:17 ` Alban Gruin 2021-03-17 20:49 ` [PATCH v7 09/15] merge-resolve: " Alban Gruin 2021-03-23 22:21 ` Johannes Schindelin 2021-04-10 14:17 ` Alban Gruin 2021-03-17 20:49 ` [PATCH v7 10/15] merge-recursive: move better_branch_name() to merge.c Alban Gruin 2021-03-17 20:49 ` [PATCH v7 11/15] merge-octopus: rewrite in C Alban Gruin 2021-03-23 23:58 ` Johannes Schindelin 2021-03-17 20:49 ` [PATCH v7 12/15] merge: use the "resolve" strategy without forking Alban Gruin 2021-03-17 20:49 ` [PATCH v7 13/15] merge: use the "octopus" " Alban Gruin 2021-03-17 20:49 ` [PATCH v7 14/15] sequencer: use the "resolve" " Alban Gruin 2021-03-17 20:49 ` [PATCH v7 15/15] sequencer: use the "octopus" merge " Alban Gruin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200625121953.16991-9-alban.gruin@gmail.com \ --to=alban.gruin@gmail.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --subject='Re: [RFC PATCH v1 08/17] merge-resolve: remove calls to external processes' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).