This patch gives life to the skeleton added in the previous patch.
This patch makes real operation happen i.e. by using
`git -c rebase.usebuiltin=true rebase <upstream>`.
With this patch, the basic operation of rebase can be done.
The current version of the builtin rebase does not, however, make full
use of the internals but instead chooses to spawn a couple of Git
processes, still, to make for an easier conversion. There remains a lot
of room for improvement, left later.
These backends use Unix shell functions defined both by git-sh-setup.sh
and git-rebase.sh (we move the latter's into git-rebase--common.sh to
accommodate for that), so we not only have to source the backend file
before calling the respective Unix shell script function, but we have
to source git-sh-setup and git-rebase--common before that.
And since this is all done in a Unix shell script snippet, all of this
is in argv[0]. There never will be a non-NULL argv[1].
This patch does the *bare* minimum to get `git rebase <upstream>` to
work: there is still no option parsing, and only the bare minimum set
of environment variables are set (in particular, the current revision
would be susceptible to bugs where e.g. `rebase_root` could be set by
mistake before running `git rebase` and the `git-rebase--am` backend
would pick up that variable and use it).
It still calls original `git-legacy-rebase.sh` unless the config
setting rebase.useBuiltin is set to true. This patch uses the
detach_head_to() function from checkout.c introduced by a previous
commit to perform initial checkout.
Signed-off-by: Pratik Karki <predatoram...@gmail.com>
---
builtin/rebase.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 229 insertions(+), 2 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 1152b7229..2f90389c2 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -9,6 +9,19 @@
#include "exec-cmd.h"
#include "argv-array.h"
#include "dir.h"
+#include "packfile.h"
+#include "checkout.h"
+#include "refs.h"
+
+static GIT_PATH_FUNC(apply_dir, "rebase-apply");
+static GIT_PATH_FUNC(merge_dir, "rebase-merge");
+
+enum rebase_type {
+ REBASE_AM,
+ REBASE_MERGE,
+ REBASE_INTERACTIVE,
+ REBASE_PRESERVE_MERGES
+};
static int use_builtin_rebase(void)
{
@@ -28,8 +41,129 @@ static int use_builtin_rebase(void)
return ret;
}
+static int apply_autostash(void)
+{
+ warning("TODO");
+ return 0;
+}
+
+struct rebase_options {
+ enum rebase_type type;
+ const char *state_dir;
+ struct commit *upstream;
+ const char *upstream_name;
+ char *head_name;
+ struct object_id orig_head;
+ struct commit *onto;
+ const char *onto_name;
+ const char *revisions;
+ const char *root;
+};
+
+static int finish_rebase(struct rebase_options *opts)
+{
+ struct strbuf dir = STRBUF_INIT;
+ const char *argv_gc_auto[] = { "gc", "--auto", NULL };
+
+ delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
+ apply_autostash();
+ close_all_packs(the_repository->objects);
+ /*
+ * We ignore errors in 'gc --auto', since the
+ * user should see them.
+ */
+ run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
+ strbuf_addstr(&dir, opts->state_dir);
+ remove_dir_recursively(&dir, 0);
+ strbuf_release(&dir);
+
+ return 0;
+}
+
+static struct commit *peel_committish(const char *name)
+{
+ struct object *obj;
+ struct object_id oid;
+ if (get_oid(name, &oid))
+ return NULL;
+ obj = parse_object(&oid);
+ return (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
+}
+
+static int run_specific_rebase(struct rebase_options *opts)
+{
+ const char *argv[] = { NULL, NULL };
+ struct strbuf script_snippet = STRBUF_INIT;
+ struct argv_array env = ARGV_ARRAY_INIT;
+ int status;
+ const char *backend, *backend_func;
+
+ argv_array_pushf(&env, "upstream_name=%s", opts->upstream_name);
+ argv_array_pushf(&env, "GIT_DIR=%s", absolute_path(get_git_dir()));
+ argv_array_pushf(&env, "upstream=%s",
+ oid_to_hex(&opts->upstream->object.oid));
+ argv_array_pushf(&env, "orig_head=%s", oid_to_hex(&opts->orig_head));
+ argv_array_pushf(&env, "onto=%s",
+ oid_to_hex(&opts->onto->object.oid));
+ argv_array_pushf(&env, "onto_name=%s", opts->onto_name);
+ argv_array_pushf(&env, "revisions=%s", opts->revisions);
+
+ switch (opts->type) {
+ case REBASE_AM:
+ backend = "git-rebase--am";
+ backend_func = "git_rebase__am";
+ break;
+ case REBASE_INTERACTIVE:
+ backend = "git-rebase--interactive";
+ backend_func = "git_rebase__interactive";
+ break;
+ case REBASE_MERGE:
+ backend = "git-rebase--merge";
+ backend_func = "git_rebase__merge";
+ break;
+ case REBASE_PRESERVE_MERGES:
+ backend = "git-rebase--preserve-merges";
+ backend_func = "git_rebase__preserve_merges";
+ break;
+ default:
+ BUG("Unhandled rebase type %d", opts->type);
+ break;
+ }
+
+ strbuf_addf(&script_snippet,
+ ". git-rebase--common && . %s && %s",
+ backend, backend_func);
+ argv[0] = script_snippet.buf;
+
+ status = run_command_v_opt_cd_env(argv, RUN_USING_SHELL, NULL,
+ env.argv);
+ 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);
+ argv_array_clear(&env);
+
+ return status ? -1 : 0;
+}
+
int cmd_rebase(int argc, const char **argv, const char *prefix)
{
+ struct rebase_options options = { -1 };
+ const char *branch_name;
+ int ret, flags, quiet = 0;
+ struct strbuf msg = STRBUF_INIT;
+ struct strbuf revisions = STRBUF_INIT;
+ const char *restrict_revision = NULL;
+
/*
* NEEDSWORK: Once the builtin rebase has been tested enough
* and git-legacy-rebase.sh is retired to contrib/, this preamble
@@ -51,5 +185,98 @@ int cmd_rebase(int argc, const char **argv, const char
*prefix)
trace_repo_setup(prefix);
setup_work_tree();
- die("TODO");
-}
\ No newline at end of file
+ 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;
+ }
+ if (!options.root) {
+ if(!argc)
+ 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. */
+ options.onto_name = (const char *) options.onto ?
+ (const char *) options.onto : 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
+ * 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");
+ else {
+ /* Do not need to switch branches, we are already on it. */
+ options.head_name =
+ xstrdup_or_null(resolve_ref_unsafe("HEAD", 0, NULL,
+ &flags));
+ if (!options.head_name)
+ die(_("No such ref: %s"), "HEAD");
+ if (flags & REF_ISSYMREF) {
+ if (!skip_prefix(options.head_name,
+ "refs/heads/", &branch_name))
+ branch_name = options.head_name;
+
+ } else {
+ options.head_name = xstrdup("detached HEAD");
+ branch_name = "HEAD";
+ }
+ if (get_oid("HEAD", &options.orig_head))
+ die(_("Could not resolve HEAD to a revision"));
+ }
+
+ /* Detach HEAD and reset the tree */
+ if (!quiet)
+ printf("First, rewinding head to replay your work on top of
it...");
+
+ strbuf_addf(&msg, "rebase: checkout %s", options.onto_name);
+ if (detach_head_to(&options.onto->object.oid, "checkout", msg.buf))
+ die(_("Could not detach HEAD"));
+ strbuf_release(&msg);
+ if (update_ref("rebase", "ORIG_HEAD", &options.orig_head, NULL, 0,
+ UPDATE_REFS_MSG_ON_ERR) < 0)
+ die(_("Could not update ORIG_HEAD to '%s'"),
+ oid_to_hex(&options.orig_head));
+
+ strbuf_addf(&revisions, "%s..%s",
+ !options.root ? oid_to_hex(&options.onto->object.oid) :
+ (restrict_revision ? restrict_revision :
+ oid_to_hex(&options.upstream->object.oid)),
+ oid_to_hex(&options.orig_head));
+
+ options.revisions = revisions.buf;
+
+ ret = !!run_specific_rebase(&options);
+
+ strbuf_release(&revisions);
+ free(options.head_name);
+ return ret;
+}
--
2.18.0
