From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>, Taylor Blau <me@ttaylorr.com>,
Peter Baumann <peter.baumann@gmail.com>,
Jonathan Tan <jonathantanmy@google.com>,
Elijah Newren <newren@gmail.com>
Subject: [PATCH v3 0/4] Beginning of new merge strategy: New API, empty implementation
Date: Tue, 27 Oct 2020 02:08:06 +0000 [thread overview]
Message-ID: <pull.895.v3.git.git.1603764490.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.895.v2.git.git.1603731448.gitgitgadget@gmail.com>
In this series, I show the new merge API I have developed in merge-ort, and
show how it differs from that provided by merge-recursive. I do this in four
steps, each corresponding to a patch.
Changes since v2:
* Extended comments in struct merge_result and in front of function
definitions to make API usage clearer; in particular, noting how this
merge backend differs in not using the index (and only updating it as
part of merge_switch_to_result()).
* Drop the other private field of struct merge_result, for now.
* Rename merge_inmemory_* to merge_incore_*
Elijah Newren (4):
merge-ort: barebones API of new merge strategy with empty
implementation
merge-ort-wrappers: new convience wrappers to mimic the old merge API
fast-rebase: demonstrate merge-ort's API via temporary/hidden command
merge,rebase,revert: select ort or recursive by config or environment
Makefile | 3 +
builtin.h | 1 +
builtin/fast-rebase.c | 210 ++++++++++++++++++++++++++++++++++++++++++
builtin/merge.c | 26 +++++-
builtin/rebase.c | 9 +-
builtin/revert.c | 2 +
git.c | 1 +
merge-ort-wrappers.c | 62 +++++++++++++
merge-ort-wrappers.h | 25 +++++
merge-ort.c | 52 +++++++++++
merge-ort.h | 58 ++++++++++++
sequencer.c | 71 +++++++++++---
12 files changed, 505 insertions(+), 15 deletions(-)
create mode 100644 builtin/fast-rebase.c
create mode 100644 merge-ort-wrappers.c
create mode 100644 merge-ort-wrappers.h
create mode 100644 merge-ort.c
create mode 100644 merge-ort.h
base-commit: 69986e19ffcfb9af674ae5180689ab7bbf92ed28
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-895%2Fnewren%2Fort-api-with-empty-implementation-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-895/newren/ort-api-with-empty-implementation-v3
Pull-Request: https://github.com/git/git/pull/895
Range-diff vs v2:
1: b9e73975ea ! 1: 3357ea415e merge-ort: barebones API of new merge strategy with empty implementation
@@ merge-ort.c (new)
+ die("Not yet implemented");
+}
+
-+void merge_inmemory_nonrecursive(struct merge_options *opt,
-+ struct tree *merge_base,
-+ struct tree *side1,
-+ struct tree *side2,
-+ struct merge_result *result)
++void merge_incore_nonrecursive(struct merge_options *opt,
++ struct tree *merge_base,
++ struct tree *side1,
++ struct tree *side2,
++ struct merge_result *result)
+{
+ die("Not yet implemented");
+}
+
-+void merge_inmemory_recursive(struct merge_options *opt,
-+ struct commit_list *merge_bases,
-+ struct commit *side1,
-+ struct commit *side2,
-+ struct merge_result *result)
++void merge_incore_recursive(struct merge_options *opt,
++ struct commit_list *merge_bases,
++ struct commit *side1,
++ struct commit *side2,
++ struct merge_result *result)
+{
+ die("Not yet implemented");
+}
@@ merge-ort.h (new)
+struct tree;
+
+struct merge_result {
-+ /* whether the merge is clean */
++ /* Whether the merge is clean */
+ int clean;
+
-+ /* Result of merge. If !clean, represents what would go in worktree */
++ /*
++ * Result of merge. If !clean, represents what would go in worktree
++ * (thus possibly including files containing conflict markers).
++ */
+ struct tree *tree;
+
+ /*
+ * Additional metadata used by merge_switch_to_result() or future calls
-+ * to merge_inmemory_*(). Not for external use.
++ * to merge_incore_*(). Includes data needed to update the index (if
++ * !clean) and to print "CONFLICT" messages. Not for external use.
+ */
+ void *priv;
-+ unsigned ate;
+};
+
-+/* rename-detecting three-way merge with recursive ancestor consolidation. */
-+void merge_inmemory_recursive(struct merge_options *opt,
-+ struct commit_list *merge_bases,
-+ struct commit *side1,
-+ struct commit *side2,
-+ struct merge_result *result);
++/*
++ * rename-detecting three-way merge with recursive ancestor consolidation.
++ * working tree and index are untouched.
++ */
++void merge_incore_recursive(struct merge_options *opt,
++ struct commit_list *merge_bases,
++ struct commit *side1,
++ struct commit *side2,
++ struct merge_result *result);
+
-+/* rename-detecting three-way merge, no recursion. */
-+void merge_inmemory_nonrecursive(struct merge_options *opt,
-+ struct tree *merge_base,
-+ struct tree *side1,
-+ struct tree *side2,
-+ struct merge_result *result);
++/*
++ * rename-detecting three-way merge, no recursion.
++ * working tree and index are untouched.
++ */
++void merge_incore_nonrecursive(struct merge_options *opt,
++ struct tree *merge_base,
++ struct tree *side1,
++ struct tree *side2,
++ struct merge_result *result);
+
-+/* Update the working tree and index from head to result after inmemory merge */
++/* Update the working tree and index from head to result after incore merge */
+void merge_switch_to_result(struct merge_options *opt,
+ struct tree *head,
+ struct merge_result *result,
2: a9fff811a2 ! 2: d7f6a834ab merge-ort-wrappers: new convience wrappers to mimic the old merge API
@@ merge-ort-wrappers.c (new)
+ }
+
+ memset(&result, 0, sizeof(result));
-+ merge_inmemory_nonrecursive(opt, merge_base, head, merge, &result);
++ merge_incore_nonrecursive(opt, merge_base, head, merge, &result);
+ merge_switch_to_result(opt, head, &result, 1, 1);
+
+ return result.clean;
@@ merge-ort-wrappers.c (new)
+ return -1;
+
+ memset(&tmp, 0, sizeof(tmp));
-+ merge_inmemory_recursive(opt, merge_bases, side1, side2, &tmp);
++ merge_incore_recursive(opt, merge_bases, side1, side2, &tmp);
+ merge_switch_to_result(opt, head, &tmp, 1, 1);
+ *result = NULL;
+
3: f38d140c15 ! 3: 27ad756600 fast-rebase: demonstrate merge-ort's API via temporary/hidden command
@@ builtin/fast-rebase.c (new)
+ merge_opt.branch2 = short_commit_name(commit);
+ merge_opt.ancestor = xstrfmt("parent of %s", merge_opt.branch2);
+
-+ merge_inmemory_nonrecursive(&merge_opt,
-+ base_tree,
-+ result.tree,
-+ next_tree,
-+ &result);
++ merge_incore_nonrecursive(&merge_opt,
++ base_tree,
++ result.tree,
++ next_tree,
++ &result);
+
+ free((char*)merge_opt.ancestor);
+ merge_opt.ancestor = NULL;
4: 5f6c97b889 ! 4: 0479d59c33 merge,rebase,revert: select ort or recursive by config or environment
@@ sequencer.c: static int do_recursive_merge(struct repository *r,
- strbuf_release(&o.obuf);
+ if (opts->strategy && !strcmp(opts->strategy, "ort")) {
+ memset(&result, 0, sizeof(result));
-+ merge_inmemory_nonrecursive(&o, base_tree, head_tree, next_tree,
++ merge_incore_nonrecursive(&o, base_tree, head_tree, next_tree,
+ &result);
+ show_output = !is_rebase_i(opts) || !result.clean;
+ /*
@@ sequencer.c: static int do_merge(struct repository *r,
- ret = merge_recursive(&o, head_commit, merge_commit, reversed, &i);
+ if (opts->strategy && !strcmp(opts->strategy, "ort")) {
+ /*
-+ * TODO: Should use merge_inmemory_recursive() and
++ * TODO: Should use merge_incore_recursive() and
+ * merge_switch_to_result(), skipping the call to
+ * merge_switch_to_result() when we don't actually need to
+ * update the index and working copy immediately.
--
gitgitgadget
next prev parent reply other threads:[~2020-10-27 2:08 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 13:22 [PATCH 0/4] Beginning of new merge strategy: New API, empty implementation Elijah Newren via GitGitGadget
2020-10-21 13:22 ` [PATCH 1/4] merge-ort: barebones API of new merge strategy with " Elijah Newren via GitGitGadget
2020-10-23 18:12 ` Taylor Blau
2020-10-23 19:02 ` Elijah Newren
2020-10-24 10:46 ` Peter Baumann
[not found] ` <CAJm9OHczJJyn=Oq2RBGvTit4hedqs6vaYH1gto-z6emo6=n2dw@mail.gmail.com>
[not found] ` <CAJm9OHdfxh8SGdteD48eDCA=ihGZmKJD-E67PFhCdFR63RSSTA@mail.gmail.com>
2020-10-24 14:54 ` Elijah Newren
2020-10-21 13:22 ` [PATCH 2/4] merge-ort-wrappers: new convience wrappers to mimic the old merge API Elijah Newren via GitGitGadget
2020-10-21 13:22 ` [PATCH 3/4] fast-rebase: demonstrate merge-ort's API via temporary/hidden command Elijah Newren via GitGitGadget
2020-10-21 13:22 ` [PATCH 4/4] merge,rebase,revert: select ort or recursive by config or environment Elijah Newren via GitGitGadget
2020-10-22 0:16 ` [PATCH 0/4] Beginning of new merge strategy: New API, empty implementation Elijah Newren
2020-10-26 21:56 ` Jonathan Tan
2020-10-27 0:52 ` Elijah Newren
2020-10-26 16:57 ` [PATCH v2 " Elijah Newren via GitGitGadget
2020-10-26 16:57 ` [PATCH v2 1/4] merge-ort: barebones API of new merge strategy with " Elijah Newren via GitGitGadget
2020-10-26 20:45 ` Junio C Hamano
2020-10-26 21:18 ` Elijah Newren
2020-10-26 22:10 ` Junio C Hamano
2020-10-26 22:28 ` Elijah Newren
2020-10-26 16:57 ` [PATCH v2 2/4] merge-ort-wrappers: new convience wrappers to mimic the old merge API Elijah Newren via GitGitGadget
2020-10-26 16:57 ` [PATCH v2 3/4] fast-rebase: demonstrate merge-ort's API via temporary/hidden command Elijah Newren via GitGitGadget
2020-10-26 16:57 ` [PATCH v2 4/4] merge,rebase,revert: select ort or recursive by config or environment Elijah Newren via GitGitGadget
2020-10-27 2:08 ` Elijah Newren via GitGitGadget [this message]
2020-10-27 2:08 ` [PATCH v3 1/4] merge-ort: barebones API of new merge strategy with empty implementation Elijah Newren via GitGitGadget
2020-10-27 2:33 ` Eric Sunshine
2020-10-27 4:57 ` Elijah Newren
2020-10-27 7:54 ` Eric Sunshine
2020-10-27 2:08 ` [PATCH v3 2/4] merge-ort-wrappers: new convience wrappers to mimic the old merge API Elijah Newren via GitGitGadget
2020-10-27 2:08 ` [PATCH v3 3/4] fast-rebase: demonstrate merge-ort's API via temporary/hidden command Elijah Newren via GitGitGadget
2020-10-27 9:47 ` SZEDER Gábor
2020-10-27 2:08 ` [PATCH v3 4/4] merge,rebase,revert: select ort or recursive by config or environment Elijah Newren via GitGitGadget
2020-10-29 20:32 ` [PATCH v4 0/4] Beginning of new merge strategy: New API, empty implementation Elijah Newren via GitGitGadget
2020-10-29 20:32 ` [PATCH v4 1/4] merge-ort: barebones API of new merge strategy with " Elijah Newren via GitGitGadget
2020-10-29 20:32 ` [PATCH v4 2/4] merge-ort-wrappers: new convience wrappers to mimic the old merge API Elijah Newren via GitGitGadget
2020-10-29 20:32 ` [PATCH v4 3/4] fast-rebase: demonstrate merge-ort's API via new test-tool command Elijah Newren via GitGitGadget
2020-10-29 20:32 ` [PATCH v4 4/4] merge,rebase,revert: select ort or recursive by config or environment Elijah Newren via GitGitGadget
2020-11-02 9:27 ` [PATCH v4 0/4] Beginning of new merge strategy: New API, empty implementation Jacob Keller
2020-11-02 18:52 ` Elijah Newren
2020-11-07 6:09 ` Elijah Newren
2020-11-02 23:45 ` [PATCH v5 " Elijah Newren via GitGitGadget
2020-11-02 23:45 ` [PATCH v5 1/4] merge-ort: barebones API of new merge strategy with " Elijah Newren via GitGitGadget
2020-11-02 23:45 ` [PATCH v5 2/4] merge-ort-wrappers: new convience wrappers to mimic the old merge API Elijah Newren via GitGitGadget
2020-11-02 23:45 ` [PATCH v5 3/4] fast-rebase: demonstrate merge-ort's API via new test-tool command Elijah Newren via GitGitGadget
2020-11-02 23:45 ` [PATCH v5 4/4] merge,rebase,revert: select ort or recursive by config or environment Elijah Newren via GitGitGadget
2020-11-03 1:03 ` [PATCH v5 0/4] Beginning of new merge strategy: New API, empty implementation Junio C Hamano
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=pull.895.v3.git.git.1603764490.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=me@ttaylorr.com \
--cc=newren@gmail.com \
--cc=peter.baumann@gmail.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public 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).