kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jc/run-receive-hook-cleanup' 

* jc/run-receive-hook-cleanup:
  refactor run_receive_hook()
maint
Junio C Hamano 2011-10-05 12:36:22 -07:00
parent 5c5845eb01 9684e44a07
commit 7451aee8e5
1 changed files with 52 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
builtin/receive-pack.c
View File

@ -212,21 +212,15 @@ static int copy_to_sideband(int in, int out, void *arg)
return 0; return 0;
} }


static int run_receive_hook(struct command *commands, const char *hook_name) typedef int (*feed_fn)(void *, const char **, size_t *);
static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_state)
{ {
static char buf[sizeof(commands->old_sha1) * 2 + PATH_MAX + 4];
struct command *cmd;
struct child_process proc; struct child_process proc;
struct async muxer; struct async muxer;
const char *argv[2]; const char *argv[2];
int have_input = 0, code; int code;


for (cmd = commands; !have_input && cmd; cmd = cmd->next) { if (access(hook_name, X_OK) < 0)
if (!cmd->error_string)
have_input = 1;
}

if (!have_input || access(hook_name, X_OK) < 0)
return 0; return 0;


argv[0] = hook_name; argv[0] = hook_name;
@ -254,22 +248,61 @@ static int run_receive_hook(struct command *commands, const char *hook_name)
return code; return code;
} }


for (cmd = commands; cmd; cmd = cmd->next) { while (1) {
if (!cmd->error_string) { const char *buf;
size_t n = snprintf(buf, sizeof(buf), "%s %s %s\n", size_t n;
sha1_to_hex(cmd->old_sha1), if (feed(feed_state, &buf, &n))
sha1_to_hex(cmd->new_sha1), break;
cmd->ref_name);
if (write_in_full(proc.in, buf, n) != n) if (write_in_full(proc.in, buf, n) != n)
break; break;
} }
}
close(proc.in); close(proc.in);
if (use_sideband) if (use_sideband)
finish_async(&muxer); finish_async(&muxer);
return finish_command(&proc); return finish_command(&proc);
} }


struct receive_hook_feed_state {
struct command *cmd;
struct strbuf buf;
};

static int feed_receive_hook(void *state_, const char **bufp, size_t *sizep)
{
struct receive_hook_feed_state *state = state_;
struct command *cmd = state->cmd;

while (cmd && cmd->error_string)
cmd = cmd->next;
if (!cmd)
return -1; /* EOF */
strbuf_reset(&state->buf);
strbuf_addf(&state->buf, "%s %s %s\n",
sha1_to_hex(cmd->old_sha1), sha1_to_hex(cmd->new_sha1),
cmd->ref_name);
state->cmd = cmd->next;
if (bufp) {
*bufp = state->buf.buf;
*sizep = state->buf.len;
}
return 0;
}

static int run_receive_hook(struct command *commands, const char *hook_name)
{
struct receive_hook_feed_state state;
int status;

strbuf_init(&state.buf, 0);
state.cmd = commands;
if (feed_receive_hook(&state, NULL, NULL))
return 0;
state.cmd = commands;
status = run_and_feed_hook(hook_name, feed_receive_hook, &state);
strbuf_release(&state.buf);
return status;
}

static int run_update_hook(struct command *cmd) static int run_update_hook(struct command *cmd)
{ {
static const char update_hook[] = "hooks/update"; static const char update_hook[] = "hooks/update";