From: Junio C Hamano <gitster@pobox.com>
To: Pratik Karki <predatoramigo@gmail.com>
Cc: git@vger.kernel.org, christian.couder@gmail.com,
Johannes.Schindelin@gmx.de, sbeller@google.com,
alban.gruin@gmail.com
Subject: Re: [PATCH v3 4/4] builtin/rebase: support running "git rebase <upstream>"
Date: Fri, 06 Jul 2018 14:30:14 -0700 [thread overview]
Message-ID: <xmqqsh4whx21.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180706120815.17851-5-predatoramigo@gmail.com> (Pratik Karki's message of "Fri, 6 Jul 2018 17:53:15 +0545")
Pratik Karki <predatoramigo@gmail.com> writes:
> +static void add_var(struct strbuf *buf, const char *name, const char *value)
> +{
> + strbuf_addstr(buf, name);
> + strbuf_addstr(buf, "=");
> + sq_quote_buf(buf, value);
> + strbuf_addstr(buf, "; ");
> +}
> +
> +static int run_specific_rebase(struct rebase_options *opts)
> +{
> + const char *argv[] = { NULL, NULL };
> + struct strbuf script_snippet = STRBUF_INIT;
> + int status;
> + const char *backend, *backend_func;
> +
> + add_var(&script_snippet, "GIT_DIR", absolute_path(get_git_dir()));
> +
> + add_var(&script_snippet, "upstream_name", opts->upstream_name);
> + add_var(&script_snippet, "upstream",
> + oid_to_hex(&opts->upstream->object.oid));
> + add_var(&script_snippet, "head_name", opts->head_name);
> + add_var(&script_snippet, "orig_head", oid_to_hex(&opts->orig_head));
> + add_var(&script_snippet, "onto", oid_to_hex(&opts->onto->object.oid));
> + add_var(&script_snippet, "onto_name", opts->onto_name);
> + add_var(&script_snippet, "revisions", opts->revisions);
Looks alright.
> + switch (opts->type) {
> + case REBASE_AM:
> +...
> + default:
> + BUG("Unhandled rebase type %d", opts->type);
> + break;
> + }
Better.
> + strbuf_addf(&script_snippet,
> + ". git-rebase--common && . %s && %s",
> + backend, backend_func);
> + argv[0] = script_snippet.buf;
> +
> + status = run_command_v_opt(argv, RUN_USING_SHELL);
This used to use run_command_v_opt_cd_env() to pass extra
environment but now we can do a simpler one. As cmd_rebase()
has called setup_git_directory() to chdir to the top level of
the working tree, we just want to .-source the backend within
the current working directory, so loss of cd is also good ;-)
> + if (status == 0)
> + finish_rebase(opts);
> + else if (status == 2) {
> + struct strbuf dir = STRBUF_INIT;
> +
> + apply_autostash();
> + strbuf_addstr(&dir, opts->state_dir);
> + remove_dir_recursively(&dir, 0);
> + strbuf_release(&dir);
> + die("Nothing to do");
> + }
> +
> + strbuf_release(&script_snippet);
> +
> + return status ? -1 : 0;
> +}
> +
> int cmd_rebase(int argc, const char **argv, const char *prefix)
> {
> + struct rebase_options options = { -1 };
The first field of this struct is "enum rebase_type" defined without
"REBASE_TYPE_UNSPECIFIED = -1" in it. It probably makes sense to
add that constant there so that you can spell this value out.
> @@ -52,5 +194,98 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> trace_repo_setup(prefix);
> setup_work_tree();
>
> - die("TODO");
> + options.type = REBASE_AM;
> +
> + switch (options.type) {
> + case REBASE_AM:
> + options.state_dir = apply_dir();
> + break;
> + case REBASE_MERGE:
> + case REBASE_INTERACTIVE:
> + case REBASE_PRESERVE_MERGES:
> + options.state_dir = merge_dir();
> + break;
Have "default:" here that barfs with BUG() to help future
introduction of bugs as the code to set options.type grows
complexity over time.
> + }
> + if (!options.root) {
> + if (argc != 2)
> + die("TODO: handle @{upstream}");
> + else {
> + options.upstream_name = argv[1];
> + argc--;
> + argv++;
> + if (!strcmp(options.upstream_name, "-"))
> + options.upstream_name = "@{-1}";
> + }
> + options.upstream = peel_committish(options.upstream_name);
> + if (!options.upstream)
> + die(_("invalid upstream '%s'"), options.upstream_name);
> + } else
> + die("TODO: upstream for --root");
> +
> + /* Make sure the branch to rebase onto is valid. */
> + if (!options.onto_name)
> + options.onto_name = options.upstream_name;
> + if (strstr(options.onto_name, "...")) {
> + die("TODO");
> + } else {
> + options.onto = peel_committish(options.onto_name);
> + if (!options.onto)
> + die(_("Does not point to a valid commit '%s'"),
> + options.onto_name);
> + }
> +
> + /*
> + * If the branch to rebase is given, that is the branch we will rebase
Style: align asterisks.
> + * branch_name -- branch/commit being rebased, or HEAD (already detached)
> + * orig_head -- commit object name of tip of the branch before rebasing
> + * head_name -- refs/heads/<that-branch> or "detached HEAD"
> + */
> + if (argc > 1)
> + die ("TODO: handle switch_to");
Style: no SP between "die" and "("
next prev parent reply other threads:[~2018-07-06 21:30 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-28 7:46 [GSoC] [PATCH 0/5] rebase: rewrite rebase in C Pratik Karki
2018-06-28 7:46 ` [PATCH 1/5] Start TODO-rebase.sh Pratik Karki
2018-06-28 9:17 ` Pratik Karki
2018-06-28 7:46 ` [PATCH 2/5] rebase: start implementing it as a builtin Pratik Karki
2018-06-28 8:08 ` Christian Couder
2018-06-28 18:49 ` Stefan Beller
2018-06-28 7:46 ` [PATCH 3/5] rebase: refactor common shell functions into their own file Pratik Karki
2018-06-28 8:02 ` Christian Couder
2018-06-28 19:17 ` Stefan Beller
2018-06-28 7:46 ` [PATCH 4/5] sequencer: refactor the code to detach HEAD to checkout.c Pratik Karki
2018-06-28 8:14 ` Christian Couder
2018-06-28 21:19 ` Stefan Beller
2018-06-28 7:46 ` [PATCH 5/5] builtin/rebase: support running "git rebase <upstream>" Pratik Karki
2018-06-28 21:58 ` Stefan Beller
2018-07-02 9:15 ` [GSoC] [PATCH v2 0/4] rebase: rewrite rebase in C Pratik Karki
2018-07-02 9:15 ` [PATCH v2 1/4] rebase: start implementing it as a builtin Pratik Karki
2018-07-03 21:09 ` Junio C Hamano
2018-07-02 9:15 ` [PATCH v2 2/4] rebase: refactor common shell functions into their own file Pratik Karki
2018-07-03 21:13 ` Junio C Hamano
2018-07-02 9:15 ` [PATCH v2 3/4] sequencer: refactor the code to detach HEAD to checkout.c Pratik Karki
2018-07-03 21:26 ` Junio C Hamano
2018-07-02 9:15 ` [PATCH v2 4/4] builtin/rebase: support running "git rebase <upstream>" Pratik Karki
2018-07-03 21:42 ` Junio C Hamano
2018-07-06 12:08 ` [GSoC] [PATCH v3 0/4] rebase: rewrite rebase in C Pratik Karki
2018-07-06 12:08 ` [PATCH v3 1/4] rebase: start implementing it as a builtin Pratik Karki
2018-07-06 21:09 ` Junio C Hamano
2018-07-06 12:08 ` [PATCH v3 2/4] rebase: refactor common shell functions into their own file Pratik Karki
2018-07-06 12:36 ` Johannes Schindelin
2018-07-06 12:08 ` [PATCH v3 3/4] sequencer: refactor the code to detach HEAD to checkout.c Pratik Karki
2018-07-06 12:08 ` [PATCH v3 4/4] builtin/rebase: support running "git rebase <upstream>" Pratik Karki
2018-07-06 21:30 ` Junio C Hamano [this message]
2018-07-07 6:45 ` Christian Couder
2018-07-07 11:59 ` Johannes Schindelin
2018-07-07 16:24 ` Junio C Hamano
2018-07-17 21:49 ` Beat Bolli
2018-07-17 21:55 ` Beat Bolli
2018-07-08 18:01 ` [GSoC] [PATCH v4 0/4] rebase: rewrite rebase in C Pratik Karki
2018-07-08 18:01 ` [PATCH v4 1/4] rebase: start implementing it as a builtin Pratik Karki
2018-07-09 7:59 ` Andrei Rybak
2018-07-09 8:36 ` Eric Sunshine
2018-07-09 17:18 ` Pratik Karki
2018-07-22 9:14 ` Duy Nguyen
2018-07-08 18:01 ` [PATCH v4 2/4] rebase: refactor common shell functions into their own file Pratik Karki
2018-07-08 18:01 ` [PATCH v4 3/4] sequencer: refactor the code to detach HEAD to checkout.c Pratik Karki
2018-07-08 21:31 ` Johannes Schindelin
2018-07-09 17:23 ` Pratik Karki
2018-07-09 16:42 ` Junio C Hamano
2018-07-09 17:20 ` Pratik Karki
2018-07-08 18:01 ` [PATCH v4 4/4] builtin/rebase: support running "git rebase <upstream>" Pratik Karki
2018-07-08 21:44 ` Johannes Schindelin
2018-07-08 21:14 ` [GSoC] [PATCH v4 0/4] rebase: rewrite rebase in C Johannes Schindelin
2018-07-30 16:29 ` [GSoC] [PATCH v5 0/3] " Pratik Karki
2018-07-30 16:29 ` [PATCH v5 1/3] rebase: start implementing it as a builtin Pratik Karki
2018-07-30 16:29 ` [PATCH v5 2/3] rebase: refactor common shell functions into their own file Pratik Karki
2018-07-30 16:29 ` [PATCH v5 3/3] builtin/rebase: support running "git rebase <upstream>" Pratik Karki
2018-08-01 0:17 ` [GSoC] [PATCH v5 0/3] rebase: rewrite rebase in C Pratik Karki
2018-08-06 19:31 ` [GSoC] [PATCH v6 " Pratik Karki
2018-08-06 19:31 ` [GSoC] [PATCH v6 1/3] rebase: start implementing it as a builtin Pratik Karki
2018-08-06 19:31 ` [GSoC] [PATCH v6 2/3] rebase: refactor common shell functions into their own file Pratik Karki
2018-08-06 19:31 ` [GSoC] [PATCH v6 3/3] builtin/rebase: support running "git rebase <upstream>" Pratik Karki
2018-08-16 21:43 ` 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=xmqqsh4whx21.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=alban.gruin@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=predatoramigo@gmail.com \
--cc=sbeller@google.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).