From: Alban Gruin <alban.gruin@gmail.com> To: Junio C Hamano <gitster@pobox.com> Cc: git@vger.kernel.org, phillip.wood@dunelm.org.uk Subject: Re: [PATCH v3 03/11] merge-index: libify merge_one_path() and merge_all() Date: Fri, 6 Nov 2020 20:53:08 +0100 [thread overview] Message-ID: <d6598312-00ba-9ec0-1f67-2b3977d7e308@gmail.com> (raw) In-Reply-To: <xmqqh7r4uhrn.fsf@gitster.c.googlers.com> Hi Junio, Le 09/10/2020 à 06:48, Junio C Hamano a écrit : > Alban Gruin <alban.gruin@gmail.com> writes: > >> diff --git a/merge-strategies.c b/merge-strategies.c >> index bbe6f48698..f0e30f5624 100644 >> --- a/merge-strategies.c >> +++ b/merge-strategies.c >> @@ -2,6 +2,7 @@ >> #include "dir.h" >> #include "ll-merge.h" >> #include "merge-strategies.h" >> +#include "run-command.h" >> #include "xdiff-interface.h" >> >> static int add_to_index_cacheinfo(struct index_state *istate, >> @@ -212,3 +213,101 @@ int merge_strategies_one_file(struct repository *r, >> >> return 0; >> } >> + >> +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, >> + unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode, >> + void *data) >> +{ >> + char ownbuf[3][GIT_MAX_HEXSZ] = {{0}}; >> + const char *arguments[] = { (char *)data, "", "", "", path, >> + ownbuf[0], ownbuf[1], ownbuf[2], >> + NULL }; >> + >> + if (orig_blob) >> + arguments[1] = oid_to_hex(orig_blob); >> + if (our_blob) >> + arguments[2] = oid_to_hex(our_blob); >> + if (their_blob) >> + arguments[3] = oid_to_hex(their_blob); > > oid_to_hex() uses 4-slot rotating buffer, no? Relying on the fact > that three would be available here without getting reused (or, > rather, our caller didn't make its own calls and/or does not mind > us invalidating all but one slot for them) feels a bit iffy. > > Extending ownbuf[] to 6 elements and using oid_to_hex_r() would be a > trivial way to clarify the code. > >> + xsnprintf(ownbuf[0], sizeof(ownbuf[0]), "%o", orig_mode); >> + xsnprintf(ownbuf[1], sizeof(ownbuf[1]), "%o", our_mode); >> + xsnprintf(ownbuf[2], sizeof(ownbuf[2]), "%o", their_mode); > > And these mode bits would not need GIT_MAX_HEXSZ to begin with. > This smells like a WIP that hasn't been carefullly proofread. > > char oidbuf[3][GIT_MAX_HEXSZ] = { 0 }; > char modebuf[3][8] = { 0 }; So here I picked GIT_MAX_HEXSZ + 1 and 10 for those buffers, they are already used by builtin/diff.c. > char *args[] = { > data, oidbuf[0], oidbuf[1], oidbuf[2], path, > modebuf[0], modebuf[1], modebuf[2], NULL, > }; > > if (orig_blob) > oid_to_hex_r(oidbuf[0], orig_blob); > ... > xsnprintf(modebuf[0], ...); > > > Eh, wait. Is this meant to be able to drive "git-merge-one-file", > i.e. a missing common/ours/theirs is indicated by an empty string > in both oiod and mode? If so, an unconditional xsnprintf() would > either give garbage or "0" at best, neither of which is an empty > string. So the body would be more like > > if (orig_blob) { > oid_to_hex_r(oidbuf[0], orig_blob); > xsnprintf(modebuf[0], "%o", orig_mode); > } > if (our_blob) { > oid_to_hex_r(oidbuf[1], our_blob); > xsnprintf(modebuf[1], "%o", our_mode); > } > ... > > wouldn't it? > Yes, especially since you suggested to error out if an empty oid has a non-empty mode in the second patch. >> + return run_command_v_opt(arguments, 0); >> +} >> + >> +static int merge_entry(struct index_state *istate, int quiet, int pos, >> + const char *path, merge_cb cb, void *data) > > When we use an identifier "cb", it typically means callback data, > not a callback function which is often called "fn". So, name the > type "merge_fn" (or "merge_func"), and call the parameter "fn". > >> +{ >> + int found = 0; >> + const struct object_id *oids[3] = {NULL}; >> + unsigned int modes[3] = {0}; >> + >> + do { >> + const struct cache_entry *ce = istate->cache[pos]; >> + int stage = ce_stage(ce); >> + >> + if (strcmp(ce->name, path)) >> + break; >> + found++; >> + oids[stage - 1] = &ce->oid; >> + modes[stage - 1] = ce->ce_mode; >> + } while (++pos < istate->cache_nr); >> + if (!found) >> + return error(_("%s is not in the cache"), path); >> + >> + if (cb(oids[0], oids[1], oids[2], path, modes[0], modes[1], modes[2], data)) { >> + if (!quiet) >> + error(_("Merge program failed")); >> + return -2; >> + } >> + >> + return found; >> +} > > This copies from builtin/merge-index.c::merge_entry(). > >> +int merge_one_path(struct index_state *istate, int oneshot, int quiet, >> + const char *path, merge_cb cb, void *data) >> +{ >> + int pos = index_name_pos(istate, path, strlen(path)), ret; >> + >> + /* >> + * If it already exists in the cache as stage0, it's >> + * already merged and there is nothing to do. >> + */ >> + if (pos < 0) { >> + ret = merge_entry(istate, quiet, -pos - 1, path, cb, data); >> + if (ret == -1) >> + return -1; >> + else if (ret == -2) >> + return 1; >> + } >> + return 0; >> +} > > Likewise from the same function in that file. > > Are we removing the "git merge-index" program? Reusing the same > identifier for these copied-and-pasted pairs of functions bothers > me for two reasons. > > - An indentifier that was clear and unique enough in the original > context as a file-scope static may not be a good name as a global > identifier. > > - Having two similar-looking functions with the same name makes > reading and learning the codebase starting at "git grep" hits > more difficult than necessary. > I don't plan to remove `git merge-index' -- nor any other program, for that matter. Why not renaming merge_one_path() and merge_all(), merge_index_path() and merge_all_index()? >> +int merge_all(struct index_state *istate, int oneshot, int quiet, >> + merge_cb cb, void *data) >> +{ >> + int err = 0, i, ret; >> + for (i = 0; i < istate->cache_nr; i++) { >> + const struct cache_entry *ce = istate->cache[i]; >> + if (!ce_stage(ce)) >> + continue; >> + >> + ret = merge_entry(istate, quiet, i, ce->name, cb, data); >> + if (ret > 0) >> + i += ret - 1; >> + else if (ret == -1) >> + return -1; >> + else if (ret == -2) { >> + if (oneshot) >> + err++; >> + else >> + return 1; >> + } >> + } >> + >> + return err; >> +} > > Likewise. > >> diff --git a/merge-strategies.h b/merge-strategies.h >> index b527d145c7..cf78d7eaf4 100644 >> --- a/merge-strategies.h >> +++ b/merge-strategies.h >> @@ -10,4 +10,21 @@ int merge_strategies_one_file(struct repository *r, >> unsigned int orig_mode, unsigned int our_mode, >> unsigned int their_mode); >> >> +typedef int (*merge_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); > > Call it "merge_one_file_func", probably. > >> +int merge_program_cb(const struct object_id *orig_blob, > > Call it spawn_merge_one_file() perhaps? > >> + 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_one_path(struct index_state *istate, int oneshot, int quiet, >> + const char *path, merge_cb cb, void *data); >> +int merge_all(struct index_state *istate, int oneshot, int quiet, >> + merge_cb cb, void *data); >> #endif /* MERGE_STRATEGIES_H */ Ack for the rest, the two function names are the only thing I am still missing on this patch right now. Alban
next prev parent reply other threads:[~2020-11-06 19:53 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 ` [RFC PATCH v1 08/17] merge-resolve: remove calls to external processes Alban Gruin 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 [this message] 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=d6598312-00ba-9ec0-1f67-2b3977d7e308@gmail.com \ --to=alban.gruin@gmail.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=phillip.wood@dunelm.org.uk \ --subject='Re: [PATCH v3 03/11] merge-index: libify merge_one_path() and merge_all()' \ /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).