зеркало из https://github.com/microsoft/git.git
sequencer.c: remove implicit dependency on the_index
Since we're going to pass 'struct repository *' around most of the time instead of 'struct index_state *' because most sequencer.c operations need more than just the index, the_repository is replaced as well in the functions that now take 'struct repository *'. the_repository is still present in this file, but total clean up will be done later. It's not the main focus of this patch. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
Junio C Hamano
Родитель
6c6d5d0776
Коммит
f11c958054
|
|
@ -1679,7 +1679,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
|
|||
flags |= SUMMARY_INITIAL_COMMIT;
|
||||
if (author_date_is_interesting())
|
||||
flags |= SUMMARY_SHOW_AUTHOR_DATE;
|
||||
print_commit_summary(prefix, &oid, flags);
|
||||
print_commit_summary(the_repository, prefix,
|
||||
&oid, flags);
|
||||
}
|
||||
|
||||
UNLEAK(err);
|
||||
|
|
|
|||
|
|
@ -896,7 +896,7 @@ static int suggest_conflicts(void)
|
|||
filename = git_path_merge_msg(the_repository);
|
||||
fp = xfopen(filename, "a");
|
||||
|
||||
append_conflicts_hint(&msgbuf);
|
||||
append_conflicts_hint(&the_index, &msgbuf);
|
||||
fputs(msgbuf.buf, fp);
|
||||
strbuf_release(&msgbuf);
|
||||
fclose(fp);
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ static int do_interactive_rebase(struct replay_opts *opts, unsigned flags,
|
|||
if (restrict_revision)
|
||||
argv_array_push(&make_script_args, restrict_revision);
|
||||
|
||||
ret = sequencer_make_script(todo_list,
|
||||
ret = sequencer_make_script(the_repository, todo_list,
|
||||
make_script_args.argc, make_script_args.argv,
|
||||
flags);
|
||||
fclose(todo_list);
|
||||
|
|
@ -235,7 +235,7 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
|
|||
rerere_clear(&merge_rr);
|
||||
/* fallthrough */
|
||||
case CONTINUE:
|
||||
ret = sequencer_continue(&opts);
|
||||
ret = sequencer_continue(the_repository, &opts);
|
||||
break;
|
||||
}
|
||||
case EDIT_TODO:
|
||||
|
|
|
|||
|
|
@ -199,10 +199,10 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts)
|
|||
return ret;
|
||||
}
|
||||
if (cmd == 'c')
|
||||
return sequencer_continue(opts);
|
||||
return sequencer_continue(the_repository, opts);
|
||||
if (cmd == 'a')
|
||||
return sequencer_rollback(opts);
|
||||
return sequencer_pick_revisions(opts);
|
||||
return sequencer_pick_revisions(the_repository, opts);
|
||||
}
|
||||
|
||||
int cmd_revert(int argc, const char **argv, const char *prefix)
|
||||
|
|
|
|||
321
sequencer.c
321
sequencer.c
|
|
@ -445,9 +445,9 @@ static struct tree *empty_tree(void)
|
|||
return lookup_tree(the_repository, the_repository->hash_algo->empty_tree);
|
||||
}
|
||||
|
||||
static int error_dirty_index(struct replay_opts *opts)
|
||||
static int error_dirty_index(struct index_state *istate, struct replay_opts *opts)
|
||||
{
|
||||
if (read_cache_unmerged())
|
||||
if (read_index_unmerged(istate))
|
||||
return error_resolve_conflict(_(action_name(opts)));
|
||||
|
||||
error(_("your local changes would be overwritten by %s."),
|
||||
|
|
@ -472,15 +472,18 @@ static void update_abort_safety_file(void)
|
|||
write_file(git_path_abort_safety_file(), "%s", "");
|
||||
}
|
||||
|
||||
static int fast_forward_to(const struct object_id *to, const struct object_id *from,
|
||||
int unborn, struct replay_opts *opts)
|
||||
static int fast_forward_to(struct repository *r,
|
||||
const struct object_id *to,
|
||||
const struct object_id *from,
|
||||
int unborn,
|
||||
struct replay_opts *opts)
|
||||
{
|
||||
struct ref_transaction *transaction;
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
struct strbuf err = STRBUF_INIT;
|
||||
|
||||
read_index(&the_index);
|
||||
if (checkout_fast_forward(the_repository, from, to, 1))
|
||||
read_index(r->index);
|
||||
if (checkout_fast_forward(r, from, to, 1))
|
||||
return -1; /* the callee should have complained already */
|
||||
|
||||
strbuf_addf(&sb, _("%s: fast-forward"), _(action_name(opts)));
|
||||
|
|
@ -506,24 +509,26 @@ static int fast_forward_to(const struct object_id *to, const struct object_id *f
|
|||
return 0;
|
||||
}
|
||||
|
||||
void append_conflicts_hint(struct strbuf *msgbuf)
|
||||
void append_conflicts_hint(struct index_state *istate,
|
||||
struct strbuf *msgbuf)
|
||||
{
|
||||
int i;
|
||||
|
||||
strbuf_addch(msgbuf, '\n');
|
||||
strbuf_commented_addf(msgbuf, "Conflicts:\n");
|
||||
for (i = 0; i < active_nr;) {
|
||||
const struct cache_entry *ce = active_cache[i++];
|
||||
for (i = 0; i < istate->cache_nr;) {
|
||||
const struct cache_entry *ce = istate->cache[i++];
|
||||
if (ce_stage(ce)) {
|
||||
strbuf_commented_addf(msgbuf, "\t%s\n", ce->name);
|
||||
while (i < active_nr && !strcmp(ce->name,
|
||||
active_cache[i]->name))
|
||||
while (i < istate->cache_nr &&
|
||||
!strcmp(ce->name, istate->cache[i]->name))
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int do_recursive_merge(struct commit *base, struct commit *next,
|
||||
static int do_recursive_merge(struct repository *r,
|
||||
struct commit *base, struct commit *next,
|
||||
const char *base_label, const char *next_label,
|
||||
struct object_id *head, struct strbuf *msgbuf,
|
||||
struct replay_opts *opts)
|
||||
|
|
@ -537,7 +542,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
|
|||
if (hold_locked_index(&index_lock, LOCK_REPORT_ON_ERROR) < 0)
|
||||
return -1;
|
||||
|
||||
read_cache();
|
||||
read_index(r->index);
|
||||
|
||||
init_merge_options(&o);
|
||||
o.ancestor = base ? base_label : "(empty tree)";
|
||||
|
|
@ -566,7 +571,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
|
|||
return clean;
|
||||
}
|
||||
|
||||
if (write_locked_index(&the_index, &index_lock,
|
||||
if (write_locked_index(r->index, &index_lock,
|
||||
COMMIT_LOCK | SKIP_IF_UNCHANGED))
|
||||
/*
|
||||
* TRANSLATORS: %s will be "revert", "cherry-pick" or
|
||||
|
|
@ -576,26 +581,26 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
|
|||
_(action_name(opts)));
|
||||
|
||||
if (!clean)
|
||||
append_conflicts_hint(msgbuf);
|
||||
append_conflicts_hint(r->index, msgbuf);
|
||||
|
||||
return !clean;
|
||||
}
|
||||
|
||||
static struct object_id *get_cache_tree_oid(void)
|
||||
static struct object_id *get_cache_tree_oid(struct index_state *istate)
|
||||
{
|
||||
if (!active_cache_tree)
|
||||
active_cache_tree = cache_tree();
|
||||
if (!istate->cache_tree)
|
||||
istate->cache_tree = cache_tree();
|
||||
|
||||
if (!cache_tree_fully_valid(active_cache_tree))
|
||||
if (cache_tree_update(&the_index, 0)) {
|
||||
if (!cache_tree_fully_valid(istate->cache_tree))
|
||||
if (cache_tree_update(istate, 0)) {
|
||||
error(_("unable to update cache tree"));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return &active_cache_tree->oid;
|
||||
return &istate->cache_tree->oid;
|
||||
}
|
||||
|
||||
static int is_index_unchanged(void)
|
||||
static int is_index_unchanged(struct index_state *istate)
|
||||
{
|
||||
struct object_id head_oid, *cache_tree_oid;
|
||||
struct commit *head_commit;
|
||||
|
|
@ -616,7 +621,7 @@ static int is_index_unchanged(void)
|
|||
if (parse_commit(head_commit))
|
||||
return -1;
|
||||
|
||||
if (!(cache_tree_oid = get_cache_tree_oid()))
|
||||
if (!(cache_tree_oid = get_cache_tree_oid(istate)))
|
||||
return -1;
|
||||
|
||||
return oideq(cache_tree_oid, get_commit_tree_oid(head_commit));
|
||||
|
|
@ -838,7 +843,9 @@ static int run_command_silent_on_success(struct child_process *cmd)
|
|||
* interactive rebase: in that case, we will want to retain the
|
||||
* author metadata.
|
||||
*/
|
||||
static int run_git_commit(const char *defmsg, struct replay_opts *opts,
|
||||
static int run_git_commit(struct repository *r,
|
||||
const char *defmsg,
|
||||
struct replay_opts *opts,
|
||||
unsigned int flags)
|
||||
{
|
||||
struct child_process cmd = CHILD_PROCESS_INIT;
|
||||
|
|
@ -861,7 +868,7 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
|
|||
if (!defmsg)
|
||||
BUG("root commit without message");
|
||||
|
||||
if (!(cache_tree_oid = get_cache_tree_oid()))
|
||||
if (!(cache_tree_oid = get_cache_tree_oid(r->index)))
|
||||
res = -1;
|
||||
|
||||
if (!res)
|
||||
|
|
@ -1070,7 +1077,9 @@ void commit_post_rewrite(const struct commit *old_head,
|
|||
run_rewrite_hook(&old_head->object.oid, new_head);
|
||||
}
|
||||
|
||||
static int run_prepare_commit_msg_hook(struct strbuf *msg, const char *commit)
|
||||
static int run_prepare_commit_msg_hook(struct repository *r,
|
||||
struct strbuf *msg,
|
||||
const char *commit)
|
||||
{
|
||||
struct argv_array hook_env = ARGV_ARRAY_INIT;
|
||||
int ret;
|
||||
|
|
@ -1080,7 +1089,7 @@ static int run_prepare_commit_msg_hook(struct strbuf *msg, const char *commit)
|
|||
if (write_message(msg->buf, msg->len, name, 0))
|
||||
return -1;
|
||||
|
||||
argv_array_pushf(&hook_env, "GIT_INDEX_FILE=%s", get_index_file());
|
||||
argv_array_pushf(&hook_env, "GIT_INDEX_FILE=%s", r->index_file);
|
||||
argv_array_push(&hook_env, "GIT_EDITOR=:");
|
||||
if (commit)
|
||||
ret = run_hook_le(hook_env.argv, "prepare-commit-msg", name,
|
||||
|
|
@ -1136,7 +1145,9 @@ static const char *implicit_ident_advice(void)
|
|||
|
||||
}
|
||||
|
||||
void print_commit_summary(const char *prefix, const struct object_id *oid,
|
||||
void print_commit_summary(struct repository *r,
|
||||
const char *prefix,
|
||||
const struct object_id *oid,
|
||||
unsigned int flags)
|
||||
{
|
||||
struct rev_info rev;
|
||||
|
|
@ -1147,7 +1158,7 @@ void print_commit_summary(const char *prefix, const struct object_id *oid,
|
|||
struct strbuf author_ident = STRBUF_INIT;
|
||||
struct strbuf committer_ident = STRBUF_INIT;
|
||||
|
||||
commit = lookup_commit(the_repository, oid);
|
||||
commit = lookup_commit(r, oid);
|
||||
if (!commit)
|
||||
die(_("couldn't look up newly created commit"));
|
||||
if (parse_commit(commit))
|
||||
|
|
@ -1180,7 +1191,7 @@ void print_commit_summary(const char *prefix, const struct object_id *oid,
|
|||
strbuf_release(&author_ident);
|
||||
strbuf_release(&committer_ident);
|
||||
|
||||
repo_init_revisions(the_repository, &rev, prefix);
|
||||
repo_init_revisions(r, &rev, prefix);
|
||||
setup_revisions(0, NULL, &rev, NULL);
|
||||
|
||||
rev.diff = 1;
|
||||
|
|
@ -1246,7 +1257,8 @@ static int parse_head(struct commit **head)
|
|||
* 0 - success
|
||||
* 1 - run 'git commit'
|
||||
*/
|
||||
static int try_to_commit(struct strbuf *msg, const char *author,
|
||||
static int try_to_commit(struct repository *r,
|
||||
struct strbuf *msg, const char *author,
|
||||
struct replay_opts *opts, unsigned int flags,
|
||||
struct object_id *oid)
|
||||
{
|
||||
|
|
@ -1290,7 +1302,7 @@ static int try_to_commit(struct strbuf *msg, const char *author,
|
|||
commit_list_insert(current_head, &parents);
|
||||
}
|
||||
|
||||
if (write_index_as_tree(&tree, &the_index, get_index_file(), 0, NULL)) {
|
||||
if (write_index_as_tree(&tree, r->index, r->index_file, 0, NULL)) {
|
||||
res = error(_("git write-tree failed to write a tree"));
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1303,7 +1315,7 @@ static int try_to_commit(struct strbuf *msg, const char *author,
|
|||
}
|
||||
|
||||
if (find_hook("prepare-commit-msg")) {
|
||||
res = run_prepare_commit_msg_hook(msg, hook_commit);
|
||||
res = run_prepare_commit_msg_hook(r, msg, hook_commit);
|
||||
if (res)
|
||||
goto out;
|
||||
if (strbuf_read_file(&commit_msg, git_path_commit_editmsg(),
|
||||
|
|
@ -1352,7 +1364,8 @@ out:
|
|||
return res;
|
||||
}
|
||||
|
||||
static int do_commit(const char *msg_file, const char *author,
|
||||
static int do_commit(struct repository *r,
|
||||
const char *msg_file, const char *author,
|
||||
struct replay_opts *opts, unsigned int flags)
|
||||
{
|
||||
int res = 1;
|
||||
|
|
@ -1367,20 +1380,20 @@ static int do_commit(const char *msg_file, const char *author,
|
|||
"from '%s'"),
|
||||
msg_file);
|
||||
|
||||
res = try_to_commit(msg_file ? &sb : NULL, author, opts, flags,
|
||||
&oid);
|
||||
res = try_to_commit(r, msg_file ? &sb : NULL,
|
||||
author, opts, flags, &oid);
|
||||
strbuf_release(&sb);
|
||||
if (!res) {
|
||||
unlink(git_path_cherry_pick_head(the_repository));
|
||||
unlink(git_path_merge_msg(the_repository));
|
||||
unlink(git_path_cherry_pick_head(r));
|
||||
unlink(git_path_merge_msg(r));
|
||||
if (!is_rebase_i(opts))
|
||||
print_commit_summary(NULL, &oid,
|
||||
print_commit_summary(r, NULL, &oid,
|
||||
SUMMARY_SHOW_AUTHOR_DATE);
|
||||
return res;
|
||||
}
|
||||
}
|
||||
if (res == 1)
|
||||
return run_git_commit(msg_file, opts, flags);
|
||||
return run_git_commit(r, msg_file, opts, flags);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
@ -1408,7 +1421,9 @@ static int is_original_commit_empty(struct commit *commit)
|
|||
/*
|
||||
* Do we run "git commit" with "--allow-empty"?
|
||||
*/
|
||||
static int allow_empty(struct replay_opts *opts, struct commit *commit)
|
||||
static int allow_empty(struct repository *r,
|
||||
struct replay_opts *opts,
|
||||
struct commit *commit)
|
||||
{
|
||||
int index_unchanged, empty_commit;
|
||||
|
||||
|
|
@ -1425,7 +1440,7 @@ static int allow_empty(struct replay_opts *opts, struct commit *commit)
|
|||
if (!opts->allow_empty)
|
||||
return 0; /* let "git commit" barf as necessary */
|
||||
|
||||
index_unchanged = is_index_unchanged();
|
||||
index_unchanged = is_index_unchanged(r->index);
|
||||
if (index_unchanged < 0)
|
||||
return index_unchanged;
|
||||
if (!index_unchanged)
|
||||
|
|
@ -1658,11 +1673,14 @@ static void record_in_rewritten(struct object_id *oid,
|
|||
flush_rewritten_pending();
|
||||
}
|
||||
|
||||
static int do_pick_commit(enum todo_command command, struct commit *commit,
|
||||
struct replay_opts *opts, int final_fixup)
|
||||
static int do_pick_commit(struct repository *r,
|
||||
enum todo_command command,
|
||||
struct commit *commit,
|
||||
struct replay_opts *opts,
|
||||
int final_fixup)
|
||||
{
|
||||
unsigned int flags = opts->edit ? EDIT_MSG : 0;
|
||||
const char *msg_file = opts->edit ? NULL : git_path_merge_msg(the_repository);
|
||||
const char *msg_file = opts->edit ? NULL : git_path_merge_msg(r);
|
||||
struct object_id head;
|
||||
struct commit *base, *next, *parent;
|
||||
const char *base_label, *next_label;
|
||||
|
|
@ -1678,7 +1696,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
|
|||
* that represents the "current" state for merge-recursive
|
||||
* to work on.
|
||||
*/
|
||||
if (write_index_as_tree(&head, &the_index, get_index_file(), 0, NULL))
|
||||
if (write_index_as_tree(&head, r->index, r->index_file, 0, NULL))
|
||||
return error(_("your index file is unmerged."));
|
||||
} else {
|
||||
unborn = get_oid("HEAD", &head);
|
||||
|
|
@ -1693,9 +1711,9 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
|
|||
oidcpy(&head, the_hash_algo->empty_tree);
|
||||
if (index_differs_from(unborn ? empty_tree_oid_hex() : "HEAD",
|
||||
NULL, 0))
|
||||
return error_dirty_index(opts);
|
||||
return error_dirty_index(r->index, opts);
|
||||
}
|
||||
discard_cache();
|
||||
discard_index(r->index);
|
||||
|
||||
if (!commit->parents)
|
||||
parent = NULL;
|
||||
|
|
@ -1731,7 +1749,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
|
|||
(!parent && unborn))) {
|
||||
if (is_rebase_i(opts))
|
||||
write_author_script(msg.message);
|
||||
res = fast_forward_to(&commit->object.oid, &head, unborn,
|
||||
res = fast_forward_to(r, &commit->object.oid, &head, unborn,
|
||||
opts);
|
||||
if (res || command != TODO_REWORD)
|
||||
goto leave;
|
||||
|
|
@ -1804,12 +1822,12 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
|
|||
flags |= CLEANUP_MSG;
|
||||
msg_file = rebase_path_fixup_msg();
|
||||
} else {
|
||||
const char *dest = git_path_squash_msg(the_repository);
|
||||
const char *dest = git_path_squash_msg(r);
|
||||
unlink(dest);
|
||||
if (copy_file(dest, rebase_path_squash_msg(), 0666))
|
||||
return error(_("could not rename '%s' to '%s'"),
|
||||
rebase_path_squash_msg(), dest);
|
||||
unlink(git_path_merge_msg(the_repository));
|
||||
unlink(git_path_merge_msg(r));
|
||||
msg_file = dest;
|
||||
flags |= EDIT_MSG;
|
||||
}
|
||||
|
|
@ -1821,23 +1839,23 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
|
|||
if (is_rebase_i(opts) && write_author_script(msg.message) < 0)
|
||||
res = -1;
|
||||
else if (!opts->strategy || !strcmp(opts->strategy, "recursive") || command == TODO_REVERT) {
|
||||
res = do_recursive_merge(base, next, base_label, next_label,
|
||||
res = do_recursive_merge(r, base, next, base_label, next_label,
|
||||
&head, &msgbuf, opts);
|
||||
if (res < 0)
|
||||
goto leave;
|
||||
|
||||
res |= write_message(msgbuf.buf, msgbuf.len,
|
||||
git_path_merge_msg(the_repository), 0);
|
||||
git_path_merge_msg(r), 0);
|
||||
} else {
|
||||
struct commit_list *common = NULL;
|
||||
struct commit_list *remotes = NULL;
|
||||
|
||||
res = write_message(msgbuf.buf, msgbuf.len,
|
||||
git_path_merge_msg(the_repository), 0);
|
||||
git_path_merge_msg(r), 0);
|
||||
|
||||
commit_list_insert(base, &common);
|
||||
commit_list_insert(next, &remotes);
|
||||
res |= try_merge_command(the_repository, opts->strategy,
|
||||
res |= try_merge_command(r, opts->strategy,
|
||||
opts->xopts_nr, (const char **)opts->xopts,
|
||||
common, oid_to_hex(&head), remotes);
|
||||
free_commit_list(common);
|
||||
|
|
@ -1866,11 +1884,11 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
|
|||
: _("could not apply %s... %s"),
|
||||
short_commit_name(commit), msg.subject);
|
||||
print_advice(res == 1, opts);
|
||||
repo_rerere(the_repository, opts->allow_rerere_auto);
|
||||
repo_rerere(r, opts->allow_rerere_auto);
|
||||
goto leave;
|
||||
}
|
||||
|
||||
allow = allow_empty(opts, commit);
|
||||
allow = allow_empty(r, opts, commit);
|
||||
if (allow < 0) {
|
||||
res = allow;
|
||||
goto leave;
|
||||
|
|
@ -1879,7 +1897,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
|
|||
if (!opts->no_commit) {
|
||||
fast_forward_edit:
|
||||
if (author || command == TODO_REVERT || (flags & AMEND_MSG))
|
||||
res = do_commit(msg_file, author, opts, flags);
|
||||
res = do_commit(r, msg_file, author, opts, flags);
|
||||
else
|
||||
res = error(_("unable to parse commit author"));
|
||||
}
|
||||
|
|
@ -1915,18 +1933,19 @@ static int prepare_revs(struct replay_opts *opts)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int read_and_refresh_cache(struct replay_opts *opts)
|
||||
static int read_and_refresh_cache(struct repository *r,
|
||||
struct replay_opts *opts)
|
||||
{
|
||||
struct lock_file index_lock = LOCK_INIT;
|
||||
int index_fd = hold_locked_index(&index_lock, 0);
|
||||
if (read_index_preload(&the_index, NULL, 0) < 0) {
|
||||
if (read_index_preload(r->index, NULL, 0) < 0) {
|
||||
rollback_lock_file(&index_lock);
|
||||
return error(_("git %s: failed to read the index"),
|
||||
_(action_name(opts)));
|
||||
}
|
||||
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL);
|
||||
refresh_index(r->index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL);
|
||||
if (index_fd >= 0) {
|
||||
if (write_locked_index(&the_index, &index_lock,
|
||||
if (write_locked_index(r->index, &index_lock,
|
||||
COMMIT_LOCK | SKIP_IF_UNCHANGED)) {
|
||||
return error(_("git %s: failed to refresh the index"),
|
||||
_(action_name(opts)));
|
||||
|
|
@ -2644,7 +2663,9 @@ static int save_opts(struct replay_opts *opts)
|
|||
return res;
|
||||
}
|
||||
|
||||
static int make_patch(struct commit *commit, struct replay_opts *opts)
|
||||
static int make_patch(struct repository *r,
|
||||
struct commit *commit,
|
||||
struct replay_opts *opts)
|
||||
{
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
struct rev_info log_tree_opt;
|
||||
|
|
@ -2660,7 +2681,7 @@ static int make_patch(struct commit *commit, struct replay_opts *opts)
|
|||
|
||||
strbuf_addf(&buf, "%s/patch", get_dir(opts));
|
||||
memset(&log_tree_opt, 0, sizeof(log_tree_opt));
|
||||
repo_init_revisions(the_repository, &log_tree_opt, NULL);
|
||||
repo_init_revisions(r, &log_tree_opt, NULL);
|
||||
log_tree_opt.abbrev = 0;
|
||||
log_tree_opt.diff = 1;
|
||||
log_tree_opt.diffopt.output_format = DIFF_FORMAT_PATCH;
|
||||
|
|
@ -2700,17 +2721,19 @@ static int intend_to_amend(void)
|
|||
return write_message(p, strlen(p), rebase_path_amend(), 1);
|
||||
}
|
||||
|
||||
static int error_with_patch(struct commit *commit,
|
||||
const char *subject, int subject_len,
|
||||
struct replay_opts *opts, int exit_code, int to_amend)
|
||||
static int error_with_patch(struct repository *r,
|
||||
struct commit *commit,
|
||||
const char *subject, int subject_len,
|
||||
struct replay_opts *opts,
|
||||
int exit_code, int to_amend)
|
||||
{
|
||||
if (commit) {
|
||||
if (make_patch(commit, opts))
|
||||
if (make_patch(r, commit, opts))
|
||||
return -1;
|
||||
} else if (copy_file(rebase_path_message(),
|
||||
git_path_merge_msg(the_repository), 0666))
|
||||
git_path_merge_msg(r), 0666))
|
||||
return error(_("unable to copy '%s' to '%s'"),
|
||||
git_path_merge_msg(the_repository), rebase_path_message());
|
||||
git_path_merge_msg(r), rebase_path_message());
|
||||
|
||||
if (to_amend) {
|
||||
if (intend_to_amend())
|
||||
|
|
@ -2741,21 +2764,24 @@ static int error_with_patch(struct commit *commit,
|
|||
return exit_code;
|
||||
}
|
||||
|
||||
static int error_failed_squash(struct commit *commit,
|
||||
struct replay_opts *opts, int subject_len, const char *subject)
|
||||
static int error_failed_squash(struct repository *r,
|
||||
struct commit *commit,
|
||||
struct replay_opts *opts,
|
||||
int subject_len,
|
||||
const char *subject)
|
||||
{
|
||||
if (copy_file(rebase_path_message(), rebase_path_squash_msg(), 0666))
|
||||
return error(_("could not copy '%s' to '%s'"),
|
||||
rebase_path_squash_msg(), rebase_path_message());
|
||||
unlink(git_path_merge_msg(the_repository));
|
||||
if (copy_file(git_path_merge_msg(the_repository), rebase_path_message(), 0666))
|
||||
unlink(git_path_merge_msg(r));
|
||||
if (copy_file(git_path_merge_msg(r), rebase_path_message(), 0666))
|
||||
return error(_("could not copy '%s' to '%s'"),
|
||||
rebase_path_message(),
|
||||
git_path_merge_msg(the_repository));
|
||||
return error_with_patch(commit, subject, subject_len, opts, 1, 0);
|
||||
git_path_merge_msg(r));
|
||||
return error_with_patch(r, commit, subject, subject_len, opts, 1, 0);
|
||||
}
|
||||
|
||||
static int do_exec(const char *command_line)
|
||||
static int do_exec(struct repository *r, const char *command_line)
|
||||
{
|
||||
struct argv_array child_env = ARGV_ARRAY_INIT;
|
||||
const char *child_argv[] = { NULL, NULL };
|
||||
|
|
@ -2770,10 +2796,10 @@ static int do_exec(const char *command_line)
|
|||
child_env.argv);
|
||||
|
||||
/* force re-reading of the cache */
|
||||
if (discard_cache() < 0 || read_cache() < 0)
|
||||
if (discard_index(r->index) < 0 || read_index(r->index) < 0)
|
||||
return error(_("could not read index"));
|
||||
|
||||
dirty = require_clean_work_tree(the_repository, "rebase", NULL, 1, 1);
|
||||
dirty = require_clean_work_tree(r, "rebase", NULL, 1, 1);
|
||||
|
||||
if (status) {
|
||||
warning(_("execution failed: %s\n%s"
|
||||
|
|
@ -2839,9 +2865,9 @@ static int safe_append(const char *filename, const char *fmt, ...)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int do_label(const char *name, int len)
|
||||
static int do_label(struct repository *r, const char *name, int len)
|
||||
{
|
||||
struct ref_store *refs = get_main_ref_store(the_repository);
|
||||
struct ref_store *refs = get_main_ref_store(r);
|
||||
struct ref_transaction *transaction;
|
||||
struct strbuf ref_name = STRBUF_INIT, err = STRBUF_INIT;
|
||||
struct strbuf msg = STRBUF_INIT;
|
||||
|
|
@ -2882,7 +2908,9 @@ static int do_label(const char *name, int len)
|
|||
static const char *reflog_message(struct replay_opts *opts,
|
||||
const char *sub_action, const char *fmt, ...);
|
||||
|
||||
static int do_reset(const char *name, int len, struct replay_opts *opts)
|
||||
static int do_reset(struct repository *r,
|
||||
const char *name, int len,
|
||||
struct replay_opts *opts)
|
||||
{
|
||||
struct strbuf ref_name = STRBUF_INIT;
|
||||
struct object_id oid;
|
||||
|
|
@ -2928,13 +2956,13 @@ static int do_reset(const char *name, int len, struct replay_opts *opts)
|
|||
memset(&unpack_tree_opts, 0, sizeof(unpack_tree_opts));
|
||||
setup_unpack_trees_porcelain(&unpack_tree_opts, "reset");
|
||||
unpack_tree_opts.head_idx = 1;
|
||||
unpack_tree_opts.src_index = &the_index;
|
||||
unpack_tree_opts.dst_index = &the_index;
|
||||
unpack_tree_opts.src_index = r->index;
|
||||
unpack_tree_opts.dst_index = r->index;
|
||||
unpack_tree_opts.fn = oneway_merge;
|
||||
unpack_tree_opts.merge = 1;
|
||||
unpack_tree_opts.update = 1;
|
||||
|
||||
if (read_cache_unmerged()) {
|
||||
if (read_index_unmerged(r->index)) {
|
||||
rollback_lock_file(&lock);
|
||||
strbuf_release(&ref_name);
|
||||
return error_resolve_conflict(_(action_name(opts)));
|
||||
|
|
@ -2956,9 +2984,9 @@ static int do_reset(const char *name, int len, struct replay_opts *opts)
|
|||
}
|
||||
|
||||
tree = parse_tree_indirect(&oid);
|
||||
prime_cache_tree(&the_index, tree);
|
||||
prime_cache_tree(r->index, tree);
|
||||
|
||||
if (write_locked_index(&the_index, &lock, COMMIT_LOCK) < 0)
|
||||
if (write_locked_index(r->index, &lock, COMMIT_LOCK) < 0)
|
||||
ret = error(_("could not write index"));
|
||||
free((void *)desc.buffer);
|
||||
|
||||
|
|
@ -2991,7 +3019,9 @@ static struct commit *lookup_label(const char *label, int len,
|
|||
return commit;
|
||||
}
|
||||
|
||||
static int do_merge(struct commit *commit, const char *arg, int arg_len,
|
||||
static int do_merge(struct repository *r,
|
||||
struct commit *commit,
|
||||
const char *arg, int arg_len,
|
||||
int flags, struct replay_opts *opts)
|
||||
{
|
||||
int run_commit_flags = (flags & TODO_EDIT_MERGE_MSG) ?
|
||||
|
|
@ -3058,7 +3088,7 @@ static int do_merge(struct commit *commit, const char *arg, int arg_len,
|
|||
ret = error(_("octopus merge cannot be executed on "
|
||||
"top of a [new root]"));
|
||||
else
|
||||
ret = fast_forward_to(&to_merge->item->object.oid,
|
||||
ret = fast_forward_to(r, &to_merge->item->object.oid,
|
||||
&head_commit->object.oid, 0,
|
||||
opts);
|
||||
goto leave_merge;
|
||||
|
|
@ -3077,11 +3107,11 @@ static int do_merge(struct commit *commit, const char *arg, int arg_len,
|
|||
write_author_script(message);
|
||||
find_commit_subject(message, &body);
|
||||
len = strlen(body);
|
||||
ret = write_message(body, len, git_path_merge_msg(the_repository), 0);
|
||||
ret = write_message(body, len, git_path_merge_msg(r), 0);
|
||||
unuse_commit_buffer(commit, message);
|
||||
if (ret) {
|
||||
error_errno(_("could not write '%s'"),
|
||||
git_path_merge_msg(the_repository));
|
||||
git_path_merge_msg(r));
|
||||
goto leave_merge;
|
||||
}
|
||||
} else {
|
||||
|
|
@ -3103,11 +3133,11 @@ static int do_merge(struct commit *commit, const char *arg, int arg_len,
|
|||
len = buf.len;
|
||||
}
|
||||
|
||||
ret = write_message(p, len, git_path_merge_msg(the_repository), 0);
|
||||
ret = write_message(p, len, git_path_merge_msg(r), 0);
|
||||
strbuf_release(&buf);
|
||||
if (ret) {
|
||||
error_errno(_("could not write '%s'"),
|
||||
git_path_merge_msg(the_repository));
|
||||
git_path_merge_msg(r));
|
||||
goto leave_merge;
|
||||
}
|
||||
}
|
||||
|
|
@ -3143,7 +3173,7 @@ static int do_merge(struct commit *commit, const char *arg, int arg_len,
|
|||
|
||||
if (can_fast_forward) {
|
||||
rollback_lock_file(&lock);
|
||||
ret = fast_forward_to(&commit->object.oid,
|
||||
ret = fast_forward_to(r, &commit->object.oid,
|
||||
&head_commit->object.oid, 0, opts);
|
||||
goto leave_merge;
|
||||
}
|
||||
|
|
@ -3168,7 +3198,7 @@ static int do_merge(struct commit *commit, const char *arg, int arg_len,
|
|||
argv_array_push(&cmd.args, "--no-log");
|
||||
argv_array_push(&cmd.args, "--no-stat");
|
||||
argv_array_push(&cmd.args, "-F");
|
||||
argv_array_push(&cmd.args, git_path_merge_msg(the_repository));
|
||||
argv_array_push(&cmd.args, git_path_merge_msg(r));
|
||||
if (opts->gpg_sign)
|
||||
argv_array_push(&cmd.args, opts->gpg_sign);
|
||||
|
||||
|
|
@ -3178,22 +3208,23 @@ static int do_merge(struct commit *commit, const char *arg, int arg_len,
|
|||
oid_to_hex(&j->item->object.oid));
|
||||
|
||||
strbuf_release(&ref_name);
|
||||
unlink(git_path_cherry_pick_head(the_repository));
|
||||
unlink(git_path_cherry_pick_head(r));
|
||||
rollback_lock_file(&lock);
|
||||
|
||||
rollback_lock_file(&lock);
|
||||
ret = run_command(&cmd);
|
||||
|
||||
/* force re-reading of the cache */
|
||||
if (!ret && (discard_cache() < 0 || read_cache() < 0))
|
||||
if (!ret && (discard_index(r->index) < 0 ||
|
||||
read_index(r->index) < 0))
|
||||
ret = error(_("could not read index"));
|
||||
goto leave_merge;
|
||||
}
|
||||
|
||||
merge_commit = to_merge->item;
|
||||
write_message(oid_to_hex(&merge_commit->object.oid), GIT_SHA1_HEXSZ,
|
||||
git_path_merge_head(the_repository), 0);
|
||||
write_message("no-ff", 5, git_path_merge_mode(the_repository), 0);
|
||||
git_path_merge_head(r), 0);
|
||||
write_message("no-ff", 5, git_path_merge_mode(r), 0);
|
||||
|
||||
bases = get_merge_bases(head_commit, merge_commit);
|
||||
if (bases && oideq(&merge_commit->object.oid,
|
||||
|
|
@ -3207,7 +3238,7 @@ static int do_merge(struct commit *commit, const char *arg, int arg_len,
|
|||
commit_list_insert(j->item, &reversed);
|
||||
free_commit_list(bases);
|
||||
|
||||
read_cache();
|
||||
read_index(r->index);
|
||||
init_merge_options(&o);
|
||||
o.branch1 = "HEAD";
|
||||
o.branch2 = ref_name.buf;
|
||||
|
|
@ -3232,23 +3263,23 @@ static int do_merge(struct commit *commit, const char *arg, int arg_len,
|
|||
*/
|
||||
ret = !ret;
|
||||
|
||||
if (active_cache_changed &&
|
||||
write_locked_index(&the_index, &lock, COMMIT_LOCK)) {
|
||||
if (r->index->cache_changed &&
|
||||
write_locked_index(r->index, &lock, COMMIT_LOCK)) {
|
||||
ret = error(_("merge: Unable to write new index file"));
|
||||
goto leave_merge;
|
||||
}
|
||||
|
||||
rollback_lock_file(&lock);
|
||||
if (ret)
|
||||
repo_rerere(the_repository, opts->allow_rerere_auto);
|
||||
repo_rerere(r, opts->allow_rerere_auto);
|
||||
else
|
||||
/*
|
||||
* In case of problems, we now want to return a positive
|
||||
* value (a negative one would indicate that the `merge`
|
||||
* command needs to be rescheduled).
|
||||
*/
|
||||
ret = !!run_git_commit(git_path_merge_msg(the_repository), opts,
|
||||
run_commit_flags);
|
||||
ret = !!run_git_commit(r, git_path_merge_msg(r), opts,
|
||||
run_commit_flags);
|
||||
|
||||
leave_merge:
|
||||
strbuf_release(&ref_name);
|
||||
|
|
@ -3425,7 +3456,9 @@ N_("Could not execute the todo command\n"
|
|||
" git rebase --edit-todo\n"
|
||||
" git rebase --continue\n");
|
||||
|
||||
static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
|
||||
static int pick_commits(struct repository *r,
|
||||
struct todo_list *todo_list,
|
||||
struct replay_opts *opts)
|
||||
{
|
||||
int res = 0, reschedule = 0;
|
||||
|
||||
|
|
@ -3433,7 +3466,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
|
|||
if (opts->allow_ff)
|
||||
assert(!(opts->signoff || opts->no_commit ||
|
||||
opts->record_origin || opts->edit));
|
||||
if (read_and_refresh_cache(opts))
|
||||
if (read_and_refresh_cache(r, opts))
|
||||
return -1;
|
||||
|
||||
while (todo_list->current < todo_list->nr) {
|
||||
|
|
@ -3469,7 +3502,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
|
|||
setenv("GIT_REFLOG_ACTION", reflog_message(opts,
|
||||
command_to_string(item->command), NULL),
|
||||
1);
|
||||
res = do_pick_commit(item->command, item->commit,
|
||||
res = do_pick_commit(r, item->command, item->commit,
|
||||
opts, is_final_fixup(todo_list));
|
||||
if (is_rebase_i(opts) && res < 0) {
|
||||
/* Reschedule */
|
||||
|
|
@ -3489,7 +3522,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
|
|||
_("Stopped at %s... %.*s\n"),
|
||||
short_commit_name(commit),
|
||||
item->arg_len, item->arg);
|
||||
return error_with_patch(commit,
|
||||
return error_with_patch(r, commit,
|
||||
item->arg, item->arg_len, opts, res,
|
||||
!res);
|
||||
}
|
||||
|
|
@ -3499,7 +3532,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
|
|||
if (res && is_fixup(item->command)) {
|
||||
if (res == 1)
|
||||
intend_to_amend();
|
||||
return error_failed_squash(item->commit, opts,
|
||||
return error_failed_squash(r, item->commit, opts,
|
||||
item->arg_len, item->arg);
|
||||
} else if (res && is_rebase_i(opts) && item->commit) {
|
||||
int to_amend = 0;
|
||||
|
|
@ -3518,7 +3551,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
|
|||
oideq(&opts->squash_onto, &oid))))
|
||||
to_amend = 1;
|
||||
|
||||
return res | error_with_patch(item->commit,
|
||||
return res | error_with_patch(r, item->commit,
|
||||
item->arg, item->arg_len, opts,
|
||||
res, to_amend);
|
||||
}
|
||||
|
|
@ -3528,7 +3561,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
|
|||
struct stat st;
|
||||
|
||||
*end_of_arg = '\0';
|
||||
res = do_exec(item->arg);
|
||||
res = do_exec(r, item->arg);
|
||||
*end_of_arg = saved;
|
||||
|
||||
/* Reread the todo file if it has changed. */
|
||||
|
|
@ -3545,13 +3578,13 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
|
|||
todo_list->current = -1;
|
||||
}
|
||||
} else if (item->command == TODO_LABEL) {
|
||||
if ((res = do_label(item->arg, item->arg_len)))
|
||||
if ((res = do_label(r, item->arg, item->arg_len)))
|
||||
reschedule = 1;
|
||||
} else if (item->command == TODO_RESET) {
|
||||
if ((res = do_reset(item->arg, item->arg_len, opts)))
|
||||
if ((res = do_reset(r, item->arg, item->arg_len, opts)))
|
||||
reschedule = 1;
|
||||
} else if (item->command == TODO_MERGE) {
|
||||
if ((res = do_merge(item->commit,
|
||||
if ((res = do_merge(r, item->commit,
|
||||
item->arg, item->arg_len,
|
||||
item->flags, opts)) < 0)
|
||||
reschedule = 1;
|
||||
|
|
@ -3560,7 +3593,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
|
|||
peek_command(todo_list, 1));
|
||||
if (res > 0)
|
||||
/* failed with merge conflicts */
|
||||
return error_with_patch(item->commit,
|
||||
return error_with_patch(r, item->commit,
|
||||
item->arg,
|
||||
item->arg_len, opts,
|
||||
res, 0);
|
||||
|
|
@ -3576,7 +3609,8 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
|
|||
if (save_todo(todo_list, opts))
|
||||
return -1;
|
||||
if (item->commit)
|
||||
return error_with_patch(item->commit,
|
||||
return error_with_patch(r,
|
||||
item->commit,
|
||||
item->arg,
|
||||
item->arg_len, opts,
|
||||
res, 0);
|
||||
|
|
@ -3641,7 +3675,7 @@ cleanup_head_ref:
|
|||
struct object_id orig, head;
|
||||
|
||||
memset(&log_tree_opt, 0, sizeof(log_tree_opt));
|
||||
repo_init_revisions(the_repository, &log_tree_opt, NULL);
|
||||
repo_init_revisions(r, &log_tree_opt, NULL);
|
||||
log_tree_opt.diff = 1;
|
||||
log_tree_opt.diffopt.output_format =
|
||||
DIFF_FORMAT_DIFFSTAT;
|
||||
|
|
@ -3708,16 +3742,17 @@ static int continue_single_pick(void)
|
|||
return run_command_v_opt(argv, RUN_GIT_CMD);
|
||||
}
|
||||
|
||||
static int commit_staged_changes(struct replay_opts *opts,
|
||||
static int commit_staged_changes(struct repository *r,
|
||||
struct replay_opts *opts,
|
||||
struct todo_list *todo_list)
|
||||
{
|
||||
unsigned int flags = ALLOW_EMPTY | EDIT_MSG;
|
||||
unsigned int final_fixup = 0, is_clean;
|
||||
|
||||
if (has_unstaged_changes(the_repository, 1))
|
||||
if (has_unstaged_changes(r, 1))
|
||||
return error(_("cannot rebase: You have unstaged changes."));
|
||||
|
||||
is_clean = !has_uncommitted_changes(the_repository, 0);
|
||||
is_clean = !has_uncommitted_changes(r, 0);
|
||||
|
||||
if (file_exists(rebase_path_amend())) {
|
||||
struct strbuf rev = STRBUF_INIT;
|
||||
|
|
@ -3817,7 +3852,7 @@ static int commit_staged_changes(struct replay_opts *opts,
|
|||
}
|
||||
|
||||
if (is_clean) {
|
||||
const char *cherry_pick_head = git_path_cherry_pick_head(the_repository);
|
||||
const char *cherry_pick_head = git_path_cherry_pick_head(r);
|
||||
|
||||
if (file_exists(cherry_pick_head) && unlink(cherry_pick_head))
|
||||
return error(_("could not remove CHERRY_PICK_HEAD"));
|
||||
|
|
@ -3825,7 +3860,7 @@ static int commit_staged_changes(struct replay_opts *opts,
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (run_git_commit(final_fixup ? NULL : rebase_path_message(),
|
||||
if (run_git_commit(r, final_fixup ? NULL : rebase_path_message(),
|
||||
opts, flags))
|
||||
return error(_("could not commit staged changes."));
|
||||
unlink(rebase_path_amend());
|
||||
|
|
@ -3845,12 +3880,12 @@ static int commit_staged_changes(struct replay_opts *opts,
|
|||
return 0;
|
||||
}
|
||||
|
||||
int sequencer_continue(struct replay_opts *opts)
|
||||
int sequencer_continue(struct repository *r, struct replay_opts *opts)
|
||||
{
|
||||
struct todo_list todo_list = TODO_LIST_INIT;
|
||||
int res;
|
||||
|
||||
if (read_and_refresh_cache(opts))
|
||||
if (read_and_refresh_cache(r, opts))
|
||||
return -1;
|
||||
|
||||
if (read_populate_opts(opts))
|
||||
|
|
@ -3858,7 +3893,7 @@ int sequencer_continue(struct replay_opts *opts)
|
|||
if (is_rebase_i(opts)) {
|
||||
if ((res = read_populate_todo(&todo_list, opts)))
|
||||
goto release_todo_list;
|
||||
if (commit_staged_changes(opts, &todo_list))
|
||||
if (commit_staged_changes(r, opts, &todo_list))
|
||||
return -1;
|
||||
} else if (!file_exists(get_todo_path(opts)))
|
||||
return continue_single_pick();
|
||||
|
|
@ -3867,14 +3902,14 @@ int sequencer_continue(struct replay_opts *opts)
|
|||
|
||||
if (!is_rebase_i(opts)) {
|
||||
/* Verify that the conflict has been resolved */
|
||||
if (file_exists(git_path_cherry_pick_head(the_repository)) ||
|
||||
file_exists(git_path_revert_head(the_repository))) {
|
||||
if (file_exists(git_path_cherry_pick_head(r)) ||
|
||||
file_exists(git_path_revert_head(r))) {
|
||||
res = continue_single_pick();
|
||||
if (res)
|
||||
goto release_todo_list;
|
||||
}
|
||||
if (index_differs_from("HEAD", NULL, 0)) {
|
||||
res = error_dirty_index(opts);
|
||||
res = error_dirty_index(r->index, opts);
|
||||
goto release_todo_list;
|
||||
}
|
||||
todo_list.current++;
|
||||
|
|
@ -3888,27 +3923,30 @@ int sequencer_continue(struct replay_opts *opts)
|
|||
strbuf_release(&buf);
|
||||
}
|
||||
|
||||
res = pick_commits(&todo_list, opts);
|
||||
res = pick_commits(r, &todo_list, opts);
|
||||
release_todo_list:
|
||||
todo_list_release(&todo_list);
|
||||
return res;
|
||||
}
|
||||
|
||||
static int single_pick(struct commit *cmit, struct replay_opts *opts)
|
||||
static int single_pick(struct repository *r,
|
||||
struct commit *cmit,
|
||||
struct replay_opts *opts)
|
||||
{
|
||||
setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
|
||||
return do_pick_commit(opts->action == REPLAY_PICK ?
|
||||
return do_pick_commit(r, opts->action == REPLAY_PICK ?
|
||||
TODO_PICK : TODO_REVERT, cmit, opts, 0);
|
||||
}
|
||||
|
||||
int sequencer_pick_revisions(struct replay_opts *opts)
|
||||
int sequencer_pick_revisions(struct repository *r,
|
||||
struct replay_opts *opts)
|
||||
{
|
||||
struct todo_list todo_list = TODO_LIST_INIT;
|
||||
struct object_id oid;
|
||||
int i, res;
|
||||
|
||||
assert(opts->revs);
|
||||
if (read_and_refresh_cache(opts))
|
||||
if (read_and_refresh_cache(r, opts))
|
||||
return -1;
|
||||
|
||||
for (i = 0; i < opts->revs->pending.nr; i++) {
|
||||
|
|
@ -3920,8 +3958,8 @@ int sequencer_pick_revisions(struct replay_opts *opts)
|
|||
continue;
|
||||
|
||||
if (!get_oid(name, &oid)) {
|
||||
if (!lookup_commit_reference_gently(the_repository, &oid, 1)) {
|
||||
enum object_type type = oid_object_info(the_repository,
|
||||
if (!lookup_commit_reference_gently(r, &oid, 1)) {
|
||||
enum object_type type = oid_object_info(r,
|
||||
&oid,
|
||||
NULL);
|
||||
return error(_("%s: can't cherry-pick a %s"),
|
||||
|
|
@ -3950,7 +3988,7 @@ int sequencer_pick_revisions(struct replay_opts *opts)
|
|||
return error(_("empty commit set passed"));
|
||||
if (get_revision(opts->revs))
|
||||
BUG("unexpected extra commit from walk");
|
||||
return single_pick(cmit, opts);
|
||||
return single_pick(r, cmit, opts);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -3969,7 +4007,7 @@ int sequencer_pick_revisions(struct replay_opts *opts)
|
|||
if (save_opts(opts))
|
||||
return -1;
|
||||
update_abort_safety_file();
|
||||
res = pick_commits(&todo_list, opts);
|
||||
res = pick_commits(r, &todo_list, opts);
|
||||
todo_list_release(&todo_list);
|
||||
return res;
|
||||
}
|
||||
|
|
@ -4373,7 +4411,8 @@ static int make_script_with_merges(struct pretty_print_context *pp,
|
|||
return 0;
|
||||
}
|
||||
|
||||
int sequencer_make_script(FILE *out, int argc, const char **argv,
|
||||
int sequencer_make_script(struct repository *r, FILE *out,
|
||||
int argc, const char **argv,
|
||||
unsigned flags)
|
||||
{
|
||||
char *format = NULL;
|
||||
|
|
@ -4385,7 +4424,7 @@ int sequencer_make_script(FILE *out, int argc, const char **argv,
|
|||
const char *insn = flags & TODO_LIST_ABBREVIATE_CMDS ? "p" : "pick";
|
||||
int rebase_merges = flags & TODO_LIST_REBASE_MERGES;
|
||||
|
||||
repo_init_revisions(the_repository, &revs, NULL);
|
||||
repo_init_revisions(r, &revs, NULL);
|
||||
revs.verbose_header = 1;
|
||||
if (!rebase_merges)
|
||||
revs.max_parents = 1;
|
||||
|
|
@ -4850,7 +4889,7 @@ int complete_action(struct replay_opts *opts, unsigned flags,
|
|||
if (require_clean_work_tree(the_repository, "rebase", "", 1, 1))
|
||||
return -1;
|
||||
|
||||
return sequencer_continue(opts);
|
||||
return sequencer_continue(the_repository, opts);
|
||||
}
|
||||
|
||||
struct subject2item_entry {
|
||||
|
|
|
|||
15
sequencer.h
15
sequencer.h
|
|
@ -5,6 +5,7 @@
|
|||
#include "strbuf.h"
|
||||
|
||||
struct commit;
|
||||
struct repository;
|
||||
|
||||
const char *git_path_commit_editmsg(void);
|
||||
const char *git_path_seq_dir(void);
|
||||
|
|
@ -74,8 +75,9 @@ int write_message(const void *buf, size_t len, const char *filename,
|
|||
|
||||
/* Call this to setup defaults before parsing command line options */
|
||||
void sequencer_init_config(struct replay_opts *opts);
|
||||
int sequencer_pick_revisions(struct replay_opts *opts);
|
||||
int sequencer_continue(struct replay_opts *opts);
|
||||
int sequencer_pick_revisions(struct repository *repo,
|
||||
struct replay_opts *opts);
|
||||
int sequencer_continue(struct repository *repo, struct replay_opts *opts);
|
||||
int sequencer_rollback(struct replay_opts *opts);
|
||||
int sequencer_remove_state(struct replay_opts *opts);
|
||||
|
||||
|
|
@ -89,7 +91,8 @@ int sequencer_remove_state(struct replay_opts *opts);
|
|||
* commits should be rebased onto the new base, this flag needs to be passed.
|
||||
*/
|
||||
#define TODO_LIST_REBASE_COUSINS (1U << 4)
|
||||
int sequencer_make_script(FILE *out, int argc, const char **argv,
|
||||
int sequencer_make_script(struct repository *repo, FILE *out,
|
||||
int argc, const char **argv,
|
||||
unsigned flags);
|
||||
|
||||
int sequencer_add_exec_commands(const char *command);
|
||||
|
|
@ -112,7 +115,7 @@ extern const char sign_off_header[];
|
|||
*/
|
||||
void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag);
|
||||
|
||||
void append_conflicts_hint(struct strbuf *msgbuf);
|
||||
void append_conflicts_hint(struct index_state *istate, struct strbuf *msgbuf);
|
||||
int message_is_empty(const struct strbuf *sb,
|
||||
enum commit_msg_cleanup_mode cleanup_mode);
|
||||
int template_untouched(const struct strbuf *sb, const char *template_file,
|
||||
|
|
@ -128,7 +131,9 @@ int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit);
|
|||
|
||||
#define SUMMARY_INITIAL_COMMIT (1 << 0)
|
||||
#define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
|
||||
void print_commit_summary(const char *prefix, const struct object_id *oid,
|
||||
void print_commit_summary(struct repository *repo,
|
||||
const char *prefix,
|
||||
const struct object_id *oid,
|
||||
unsigned int flags);
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче