mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 10:26:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

builtin-am: apply patch with git-apply

Browse Source 
Implement applying the patch to the index using git-apply.

If a file is unchanged but stat-dirty, git-apply may erroneously fail to
apply patches, thinking that they conflict with a dirty working tree.

As such, since 2a6f08a (am: refresh the index at start and --resolved,
2011-08-15), git-am will refresh the index before applying patches.
Re-implement this behavior.

Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Paul Tan 2015-08-04 21:51:29 +08:00 committed by Junio C Hamano
parent 3e20dcf367
commit 38a824fe05
1 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
builtin/am.c
View File

@ -10,6 +10,7 @@
#include "dir.h"
#include "run-command.h"
#include "quote.h"
#include "lockfile.h"
/**
* Returns 1 if the file is empty or does not exist, 0 otherwise.
@ -42,6 +43,14 @@ static int strbuf_getline_crlf(struct strbuf *sb, FILE *fp)
return 0;
}
/**
* Returns the length of the first line of msg.
*/
static int linelen(const char *msg)
{
return strchrnul(msg, '\n') - msg;
}
enum patch_format {
PATCH_FORMAT_UNKNOWN = 0,
PATCH_FORMAT_MBOX
@ -539,6 +548,19 @@ static const char *msgnum(const struct am_state *state)
return sb.buf;
}
/**
* Refresh and write index.
*/
static void refresh_and_write_cache(void)
{
struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
hold_locked_index(lock_file, 1);
refresh_cache(REFRESH_QUIET);
if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
die(_("unable to write index file"));
}
/**
* Parses `mail` using git-mailinfo, extracting its patch and authorship info.
* state->msg will be set to the patch message. state->author_name,
@ -628,11 +650,36 @@ finish:
return ret;
}
/**
* Applies current patch with git-apply. Returns 0 on success, -1 otherwise.
*/
static int run_apply(const struct am_state *state)
{
struct child_process cp = CHILD_PROCESS_INIT;
cp.git_cmd = 1;
argv_array_push(&cp.args, "apply");
argv_array_push(&cp.args, "--index");
argv_array_push(&cp.args, am_path(state, "patch"));
if (run_command(&cp))
return -1;
/* Reload index as git-apply will have modified it. */
discard_cache();
read_cache();
return 0;
}
/**
* Applies all queued mail.
*/
static void am_run(struct am_state *state)
{
refresh_and_write_cache();
while (state->cur <= state->last) {
const char *mail = am_path(state, msgnum(state));
@ -645,7 +692,27 @@ static void am_run(struct am_state *state)
write_author_script(state);
write_commit_msg(state);
/* NEEDSWORK: Patch application not implemented yet */
printf_ln(_("Applying: %.*s"), linelen(state->msg), state->msg);
if (run_apply(state) < 0) {
int advice_amworkdir = 1;
printf_ln(_("Patch failed at %s %.*s"), msgnum(state),
linelen(state->msg), state->msg);
git_config_get_bool("advice.amworkdir", &advice_amworkdir);
if (advice_amworkdir)
printf_ln(_("The copy of the patch that failed is found in: %s"),
am_path(state, "patch"));
exit(128);
}
/*
* NEEDSWORK: After the patch has been applied to the index
* with git-apply, we need to make commit as well.
*/
next:
am_next(state);
@ -707,6 +774,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options, usage, 0);
if (read_index_preload(&the_index, NULL) < 0)
die(_("failed to read the index"));
if (am_in_progress(&state))
am_load(&state);
else {