mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New capability "report-status-v2" for git-push

Browse Source 
The new introduced "proc-receive" hook may handle a command for a
pseudo-reference with a zero-old as its old-oid, while the hook may
create or update a reference with different name, different new-oid,
and different old-oid (the reference may exist already with a non-zero
old-oid).  Current "report-status" protocol cannot report the status for
such reference rewrite.

Add new capability "report-status-v2" and new report protocol which is
not backward compatible for report of git-push.

If a user pushes to a pseudo-reference "refs/for/master/topic", and
"receive-pack" creates two new references "refs/changes/23/123/1" and
"refs/changes/24/124/1", for client without the knowledge of
"report-status-v2", "receive-pack" will only send "ok/ng" directives in
the report, such as:

    ok ref/for/master/topic

But for client which has the knowledge of "report-status-v2",
"receive-pack" will use "option" directives to report more attributes
for the reference given by the above "ok/ng" directive.

    ok refs/for/master/topic
    option refname refs/changes/23/123/1
    option new-oid <new-oid>
    ok refs/for/master/topic
    option refname refs/changes/24/124/1
    option new-oid <new-oid>

The client will report two new created references to the end user.

Suggested-by: Junio C Hamano <gitster@pobox.com>
Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jiang Xin
2020-05-18 05:40:32 -04:00
committed by Junio C Hamano
parent 1e58de8c07
commit 5e4553bd38
15 changed files with 417 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
builtin/receive-pack.c
View File

@ -56,6 +56,7 @@ static int advertise_push_options;
static int unpack_limit = 100;
static off_t max_input_size;
static int report_status;
static int report_status_v2;
static int use_sideband;
static int use_atomic;
static int use_push_options;
@ -239,7 +240,7 @@ static void show_ref(const char *path, const struct object_id *oid)
struct strbuf cap = STRBUF_INIT;
strbuf_addstr(&cap,
"report-status delete-refs side-band-64k quiet");
"report-status report-status-v2 delete-refs side-band-64k quiet");
if (advertise_atomic_push)
strbuf_addstr(&cap, " atomic");
if (prefer_ofs_delta)
@ -1914,6 +1915,8 @@ static struct command *read_head_info(struct packet_reader *reader,
const char *feature_list = reader->line + linelen + 1;
if (parse_feature_request(feature_list, "report-status"))
report_status = 1;
if (parse_feature_request(feature_list, "report-status-v2"))
report_status_v2 = 1;
if (parse_feature_request(feature_list, "side-band-64k"))
use_sideband = LARGE_PACKET_MAX;
if (parse_feature_request(feature_list, "quiet"))
@ -2225,6 +2228,49 @@ static void report(struct command *commands, const char *unpack_status)
strbuf_release(&buf);
}
static void report_v2(struct command *commands, const char *unpack_status)
{
struct command *cmd;
struct strbuf buf = STRBUF_INIT;
struct ref_push_report_options *options;
packet_buf_write(&buf, "unpack %s\n",
unpack_status ? unpack_status : "ok");
for (cmd = commands; cmd; cmd = cmd->next) {
int count = 0;
if (!cmd->report.error_message)
packet_buf_write(&buf, "ok %s\n",
cmd->ref_name);
else
packet_buf_write(&buf, "ng %s %s\n",
cmd->ref_name,
cmd->report.error_message);
for (options = cmd->report.options; options; options = options->next) {
if (count++ > 0)
packet_buf_write(&buf, "ok %s\n", cmd->ref_name);
if (options->ref_name)
packet_buf_write(&buf, "option refname %s\n",
options->ref_name);
if (options->old_oid)
packet_buf_write(&buf, "option old-oid %s\n",
oid_to_hex(options->old_oid));
if (options->new_oid)
packet_buf_write(&buf, "option new-oid %s\n",
oid_to_hex(options->new_oid));
if (options->forced_update)
packet_buf_write(&buf, "option forced-update\n");
}
}
packet_buf_flush(&buf);
if (use_sideband)
send_sideband(1, 1, buf.buf, buf.len, use_sideband);
else
write_or_die(1, buf.buf, buf.len);
strbuf_release(&buf);
}
static int delete_only(struct command *commands)
{
struct command *cmd;
@ -2333,7 +2379,9 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
&push_options);
if (pack_lockfile)
unlink_or_warn(pack_lockfile);
if (report_status)
if (report_status_v2)
report_v2(commands, unpack_status);
else if (report_status)
report(commands, unpack_status);
run_receive_hook(commands, "post-receive", 1,
&push_options);

21
builtin/send-pack.c
View File

@ -29,10 +29,12 @@ static struct send_pack_args args;
static void print_helper_status(struct ref *ref)
{
struct strbuf buf = STRBUF_INIT;
struct ref_push_report_options *options;
for (; ref; ref = ref->next) {
const char *msg = NULL;
const char *res;
int count = 0;
switch(ref->status) {
case REF_STATUS_NONE:
@ -86,14 +88,29 @@ static void print_helper_status(struct ref *ref)
strbuf_reset(&buf);
strbuf_addf(&buf, "%s %s", res, ref->name);
if (ref->remote_status)
msg = ref->remote_status;
if (ref->report.error_message)
msg = ref->report.error_message;
if (msg) {
strbuf_addch(&buf, ' ');
quote_two_c_style(&buf, "", msg, 0);
}
strbuf_addch(&buf, '\n');
for (options = ref->report.options; options; options = options->next) {
if (count++ > 0)
strbuf_addf(&buf, "ok %s\n", ref->name);
if (options->ref_name)
strbuf_addf(&buf, "option refname %s\n",
options->ref_name);
if (options->old_oid)
strbuf_addf(&buf, "option old-oid %s\n",
oid_to_hex(options->old_oid));
if (options->new_oid)
strbuf_addf(&buf, "option new-oid %s\n",
oid_to_hex(options->new_oid));
if (options->forced_update)
strbuf_addstr(&buf, "option forced-update\n");
}
write_or_die(1, buf.buf, buf.len);
}
strbuf_release(&buf);

4
remote.c
View File

@ -789,7 +789,7 @@ struct ref *copy_ref(const struct ref *ref)
memcpy(cpy, ref, len);
cpy->next = NULL;
cpy->symref = xstrdup_or_null(ref->symref);
cpy->remote_status = xstrdup_or_null(ref->remote_status);
cpy->report.error_message = xstrdup_or_null(ref->report.error_message);
cpy->peer_ref = copy_ref(ref->peer_ref);
return cpy;
}
@ -811,7 +811,7 @@ void free_one_ref(struct ref *ref)
if (!ref)
return;
free_one_ref(ref->peer_ref);
free(ref->remote_status);
free((void *)ref->report.error_message);
free(ref->symref);
free(ref);
}

2
remote.h
View File

@ -153,7 +153,7 @@ struct ref {
REF_STATUS_EXPECTING_REPORT,
REF_STATUS_ATOMIC_PUSH_FAILED
} status;
char *remote_status;
struct ref_push_report report;
struct ref *peer_ref; /* when renaming */
char name[FLEX_ARRAY]; /* more */
};

97
send-pack.c
View File

@ -153,25 +153,79 @@ static int receive_status(struct packet_reader *reader, struct ref *refs)
{
struct ref *hint;
int ret;
int new_options = 1;
hint = NULL;
ret = receive_unpack_status(reader);
while (1) {
struct object_id old_oid, new_oid;
const char *head;
const char *refname;
char *msg;
char *p;
if (packet_reader_read(reader) != PACKET_READ_NORMAL)
break;
if (!starts_with(reader->line, "ok ") && !starts_with(reader->line, "ng ")) {
error("invalid ref status from remote: %s", reader->line);
head = reader->line;
p = strchr(head, ' ');
if (!p) {
error("invalid status line from remote: %s", reader->line);
ret = -1;
break;
}
*p++ = '\0';
refname = reader->line + 3;
msg = strchr(refname, ' ');
if (msg)
*msg++ = '\0';
if (!strcmp(head, "option")) {
struct ref_push_report_options *options;
const char *key, *val;
if (!hint) {
if (new_options) {
error("'option' without a matching 'ok/ng' directive");
new_options = 0;
}
ret = -1;
continue;
}
options = hint->report.options;
while (options && options->next)
options = options->next;
if (new_options) {
if (!options) {
hint->report.options = xcalloc(1, sizeof(struct ref_push_report_options));
options = hint->report.options;
} else {
options->next = xcalloc(1, sizeof(struct ref_push_report_options));
options = options->next;
}
new_options = 0;
}
assert(options);
key = p;
p = strchr(key, ' ');
if (p)
*p++ = '\0';
val = p;
if (!strcmp(key, "refname"))
options->ref_name = xstrdup_or_null(val);
else if (!strcmp(key, "old-oid") && val &&
!parse_oid_hex(val, &old_oid, &val))
options->old_oid = oiddup(&old_oid);
else if (!strcmp(key, "new-oid") && val &&
!parse_oid_hex(val, &new_oid, &val))
options->new_oid = oiddup(&new_oid);
else if (!strcmp(key, "forced-update"))
options->forced_update = 1;
continue;
}
if (strcmp(head, "ok") && strcmp(head, "ng")) {
error("invalid ref status from remote: %s", head);
ret = -1;
break;
}
refname = p;
p = strchr(refname, ' ');
if (p)
*p++ = '\0';
/* first try searching at our hint, falling back to all refs */
if (hint)
hint = find_ref_by_name(hint, refname);
@ -182,19 +236,24 @@ static int receive_status(struct packet_reader *reader, struct ref *refs)
refname);
continue;
}
if (hint->status != REF_STATUS_EXPECTING_REPORT) {
if (hint->status != REF_STATUS_EXPECTING_REPORT &&
hint->status != REF_STATUS_OK &&
hint->status != REF_STATUS_REMOTE_REJECT) {
warning("remote reported status on unexpected ref: %s",
refname);
continue;
}
if (reader->line[0] == 'o' && reader->line[1] == 'k')
hint->status = REF_STATUS_OK;
else
if (!strcmp(head, "ng")) {
hint->status = REF_STATUS_REMOTE_REJECT;
hint->remote_status = xstrdup_or_null(msg);
/* start our next search from the next ref */
hint = hint->next;
if (p)
hint->report.error_message = xstrdup(p);
else
hint->report.error_message = "failed";
} else {
hint->status = REF_STATUS_OK;
hint->report.message = xstrdup_or_null(p);
}
new_options = 1;
}
return ret;
}
@ -369,7 +428,9 @@ int send_pack(struct send_pack_args *args,
struct packet_reader reader;
/* Does the other end support the reporting? */
if (server_supports("report-status"))
if (server_supports("report-status-v2"))
status_report = 2;
else if (server_supports("report-status"))
status_report = 1;
if (server_supports("delete-refs"))
allow_deleting_refs = 1;
@ -418,8 +479,10 @@ int send_pack(struct send_pack_args *args,
use_push_options = push_options_supported && args->push_options;
if (status_report)
if (status_report == 1)
strbuf_addstr(&cap_buf, " report-status");
else if (status_report == 2)
strbuf_addstr(&cap_buf, " report-status-v2");
if (use_sideband)
strbuf_addstr(&cap_buf, " side-band-64k");
if (quiet_supported && (args->quiet || !args->progress))

9
t/t5411-proc-receive-hook.sh
View File

@ -78,6 +78,15 @@ run_proc_receive_hook_test() {
# Initialize the upstream repository and local workbench.
setup_upstream_and_workbench
# Load test cases that only need to be executed once.
for t in "$TEST_DIRECTORY"/t5411/once-*.sh
do
. "$t"
done
# Initialize the upstream repository and local workbench.
setup_upstream_and_workbench
# Run test cases for 'proc-receive' hook on local file protocol.
run_proc_receive_hook_test local

83
t/t5411/once-0010-report-status-v1.sh Normal file
View File

@ -0,0 +1,83 @@
test_expect_success "setup proc-receive hook" '
write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \
-r "ok refs/for/master/topic1" \
-r "option fall-through" \
-r "ok refs/for/master/topic2" \
-r "option refname refs/for/changes/23/123/1" \
-r "option new-oid $A" \
-r "ok refs/for/master/topic2" \
-r "option refname refs/for/changes/24/124/2" \
-r "option old-oid $B" \
-r "option new-oid $A" \
-r "option forced-update" \
-r "ng refs/for/next/topic target branch not exist"
EOF
'
# Refs of upstream : master(A)
# Refs of workbench: master(A) tags/v123
# git push : (B) refs/for/master/topic1(A) foo(A) refs/for/next/topic(A) refs/for/master/topic2(A)
test_expect_success "proc-receive: report status v1" '
{
printf "%s %s refs/heads/master\0report-status\n" \
$A $B | packetize &&
printf "%s %s refs/for/master/topic1\n" \
$ZERO_OID $A | packetize &&
printf "%s %s refs/heads/foo\n" \
$ZERO_OID $A | packetize &&
printf "%s %s refs/for/next/topic\n" \
$ZERO_OID $A | packetize &&
printf "%s %s refs/for/master/topic2\n" \
$ZERO_OID $A | packetize &&
printf 0000 &&
printf "" | git -C "$upstream" pack-objects --stdout
} | git receive-pack "$upstream" --stateless-rpc \
>out 2>&1 &&
make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF &&
# pre-receive hook
pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master
pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic1
pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic2
# proc-receive hook
proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic1
proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic2
proc-receive> ok refs/for/master/topic1
proc-receive> option fall-through
proc-receive> ok refs/for/master/topic2
proc-receive> option refname refs/for/changes/23/123/1
proc-receive> option new-oid <COMMIT-A>
proc-receive> ok refs/for/master/topic2
proc-receive> option refname refs/for/changes/24/124/2
proc-receive> option old-oid <COMMIT-B>
proc-receive> option new-oid <COMMIT-A>
proc-receive> option forced-update
proc-receive> ng refs/for/next/topic target branch not exist
000eunpack ok
0019ok refs/heads/master
001eok refs/for/master/topic1
0016ok refs/heads/foo
0033ng refs/for/next/topic target branch not exist
001eok refs/for/master/topic2
0000# post-receive hook
post-receive< <COMMIT-A> <COMMIT-B> refs/heads/master
post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic1
post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic2
EOF
test_cmp expect actual &&
git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF &&
<COMMIT-A> refs/for/master/topic1
<COMMIT-A> refs/heads/foo
<COMMIT-B> refs/heads/master
EOF
test_cmp expect actual
'

14
t/t5411/test-0032-report-with-options.sh
View File

@ -56,7 +56,7 @@ test_expect_success "proc-receive: report option refname ($PROTOCOL)" '
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* [new reference] HEAD -> refs/for/master/topic
* [new reference] HEAD -> refs/pull/123/head
EOF
test_cmp expect actual
'
@ -89,7 +89,7 @@ test_expect_success "proc-receive: report option refname and forced-update ($PRO
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* [new reference] HEAD -> refs/for/master/topic
* [new reference] HEAD -> refs/pull/123/head
EOF
test_cmp expect actual
'
@ -123,7 +123,7 @@ test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL)
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* [new reference] HEAD -> refs/for/master/topic
<OID-B>..<OID-A> HEAD -> refs/pull/123/head
EOF
test_cmp expect actual
'
@ -155,7 +155,7 @@ test_expect_success "proc-receive: report option old-oid ($PROTOCOL)" '
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* [new reference] HEAD -> refs/for/master/topic
<OID-B>..<OID-A> HEAD -> refs/for/master/topic
EOF
test_cmp expect actual
'
@ -189,7 +189,7 @@ test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL)
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* [new reference] HEAD -> refs/for/master/topic
<OID-A>..<OID-B> HEAD -> refs/for/master/topic
EOF
test_cmp expect actual
'
@ -241,9 +241,9 @@ test_expect_success "proc-receive: report with multiple rewrites ($PROTOCOL)" '
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* [new reference] HEAD -> refs/for/next/topic
* [new reference] HEAD -> refs/pull/123/head
* [new reference] HEAD -> refs/for/a/b/c/topic
* [new reference] HEAD -> refs/for/master/topic
+ <OID-B>...<OID-A> HEAD -> refs/pull/124/head (forced update)
EOF
test_cmp expect actual &&

14
t/t5411/test-0033-report-with-options--porcelain.sh
View File

@ -57,7 +57,7 @@ test_expect_success "proc-receive: report option refname ($PROTOCOL/porcelain)"
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* HEAD:refs/for/master/topic [new reference]
* HEAD:refs/pull/123/head [new reference]
Done
EOF
test_cmp expect actual
@ -92,7 +92,7 @@ test_expect_success "proc-receive: report option refname and forced-update ($PRO
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* HEAD:refs/for/master/topic [new reference]
* HEAD:refs/pull/123/head [new reference]
Done
EOF
test_cmp expect actual
@ -127,7 +127,7 @@ test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL/
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* HEAD:refs/for/master/topic [new reference]
HEAD:refs/pull/123/head <OID-B>..<OID-A>
Done
EOF
test_cmp expect actual
@ -160,7 +160,7 @@ test_expect_success "proc-receive: report option old-oid ($PROTOCOL/porcelain)"
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* HEAD:refs/for/master/topic [new reference]
HEAD:refs/for/master/topic <OID-B>..<OID-A>
Done
EOF
test_cmp expect actual
@ -195,7 +195,7 @@ test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL/
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* HEAD:refs/for/master/topic [new reference]
HEAD:refs/for/master/topic <OID-A>..<OID-B>
Done
EOF
test_cmp expect actual
@ -249,9 +249,9 @@ test_expect_success "proc-receive: report with multiple rewrites ($PROTOCOL/porc
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* HEAD:refs/for/next/topic [new reference]
* HEAD:refs/pull/123/head [new reference]
* HEAD:refs/for/a/b/c/topic [new reference]
* HEAD:refs/for/master/topic [new reference]
+ HEAD:refs/pull/124/head <OID-B>...<OID-A> (forced update)
Done
EOF
test_cmp expect actual &&

11
t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh
View File

@ -43,7 +43,9 @@ test_expect_success "proc-receive: multiple rewrite for one ref, no refname for
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* [new reference] HEAD -> refs/for/master/topic
<OID-A>..<OID-B> HEAD -> refs/for/master/topic
* [new reference] HEAD -> refs/changes/24/124/1
<OID-A>..<OID-B> HEAD -> refs/changes/25/125/1
EOF
test_cmp expect actual &&
git -C "$upstream" show-ref >out &&
@ -101,7 +103,9 @@ test_expect_success "proc-receive: multiple rewrites for one ref, no refname for
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* [new reference] HEAD -> refs/for/master/topic
* [new reference] HEAD -> refs/changes/24/124/1
<OID-A>..<OID-B> HEAD -> refs/for/master/topic
+ <OID-B>...<OID-A> HEAD -> refs/changes/25/125/1 (forced update)
EOF
test_cmp expect actual &&
git -C "$upstream" show-ref >out &&
@ -147,7 +151,8 @@ test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL)" '
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* [new reference] HEAD -> refs/for/master/topic
* [new reference] HEAD -> refs/changes/23/123/1
<OID-A>..<OID-B> HEAD -> refs/changes/24/124/2
EOF
test_cmp expect actual &&
git -C "$upstream" show-ref >out &&

11
t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh
View File

@ -43,7 +43,9 @@ test_expect_success "proc-receive: multiple rewrite for one ref, no refname for
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* HEAD:refs/for/master/topic [new reference]
HEAD:refs/for/master/topic <OID-A>..<OID-B>
* HEAD:refs/changes/24/124/1 [new reference]
HEAD:refs/changes/25/125/1 <OID-A>..<OID-B>
Done
EOF
test_cmp expect actual &&
@ -102,7 +104,9 @@ test_expect_success "proc-receive: multiple rewrites for one ref, no refname for
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* HEAD:refs/for/master/topic [new reference]
* HEAD:refs/changes/24/124/1 [new reference]
HEAD:refs/for/master/topic <OID-A>..<OID-B>
+ HEAD:refs/changes/25/125/1 <OID-B>...<OID-A> (forced update)
Done
EOF
test_cmp expect actual &&
@ -149,7 +153,8 @@ test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL/porc
remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
To <URL/of/upstream.git>
* HEAD:refs/for/master/topic [new reference]
* HEAD:refs/changes/23/123/1 [new reference]
HEAD:refs/changes/24/124/2 <OID-A>..<OID-B>
Done
EOF
test_cmp expect actual &&

2
t/t5411/test-0038-report-mixed-refs.sh
View File

@ -60,7 +60,7 @@ test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL)" '
* [new branch] HEAD -> baz
* [new reference] HEAD -> refs/for/next/topic2
* [new branch] HEAD -> foo
* [new reference] HEAD -> refs/for/master/topic
<OID-A>..<OID-B> HEAD -> refs/for/master/topic
! [remote rejected] HEAD -> refs/for/next/topic1 (fail to call Web API)
! [remote rejected] HEAD -> refs/for/next/topic3 (proc-receive failed to report status)
EOF

2
t/t5411/test-0039-report-mixed-refs--porcelain.sh
View File

@ -60,7 +60,7 @@ test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL/porcel
* HEAD:refs/heads/baz [new branch]
* HEAD:refs/for/next/topic2 [new reference]
* HEAD:refs/heads/foo [new branch]
* HEAD:refs/for/master/topic [new reference]
HEAD:refs/for/master/topic <OID-A>..<OID-B>
! HEAD:refs/for/next/topic1 [remote rejected] (fail to call Web API)
! HEAD:refs/for/next/topic3 [remote rejected] (proc-receive failed to report status)
Done

53
transport-helper.c
View File

@ -725,6 +725,49 @@ static int push_update_ref_status(struct strbuf *buf,
{
char *refname, *msg;
int status, forced = 0;
static struct ref *hint = NULL;
static int new_options = 1;
if (starts_with(buf->buf, "option ")) {
struct ref_push_report_options *options;
struct object_id old_oid, new_oid;
const char *key, *val;
char *p;
if (!hint)
die(_("'option' without a matching 'ok/error' directive"));
options = hint->report.options;
while (options && options->next)
options = options->next;
if (new_options) {
if (!options) {
hint->report.options = xcalloc(1, sizeof(struct ref_push_report_options));
options = hint->report.options;
} else {
options->next = xcalloc(1, sizeof(struct ref_push_report_options));
options = options->next;
}
new_options = 0;
}
assert(options);
key = buf->buf + 7;
p = strchr(key, ' ');
if (p)
*p++ = '\0';
val = p;
if (!strcmp(key, "refname"))
options->ref_name = xstrdup_or_null(val);
else if (!strcmp(key, "old-oid") && val &&
!parse_oid_hex(val, &old_oid, &val))
options->old_oid = oiddup(&old_oid);
else if (!strcmp(key, "new-oid") && val &&
!parse_oid_hex(val, &new_oid, &val))
options->new_oid = oiddup(&new_oid);
else if (!strcmp(key, "forced-update"))
options->forced_update = 1;
/* Not update remote namespace again. */
return 1;
}
if (starts_with(buf->buf, "ok ")) {
status = REF_STATUS_OK;
@ -787,8 +830,11 @@ static int push_update_ref_status(struct strbuf *buf,
*ref = find_ref_by_name(remote_refs, refname);
if (!*ref) {
warning(_("helper reported unexpected status of %s"), refname);
hint = NULL;
return 1;
}
hint = *ref;
new_options = 1;
if ((*ref)->status != REF_STATUS_NONE) {
/*
@ -801,7 +847,12 @@ static int push_update_ref_status(struct strbuf *buf,
(*ref)->status = status;
(*ref)->forced_update |= forced;
(*ref)->remote_status = msg;
if (msg) {
if (status == REF_STATUS_OK)
(*ref)->report.message = msg;
else
(*ref)->report.error_message = msg;
}
return !(status == REF_STATUS_OK);
}

116
transport.c
View File

@ -461,13 +461,21 @@ void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int v
static void print_ref_status(char flag, const char *summary,
struct ref *to, struct ref *from, const char *msg,
struct ref_push_report_options *options,
int porcelain, int summary_width)
{
const char *to_name;
if (options && options->ref_name)
to_name = options->ref_name;
else
to_name = to->name;
if (porcelain) {
if (from)
fprintf(stdout, "%c\t%s:%s\t", flag, from->name, to->name);
fprintf(stdout, "%c\t%s:%s\t", flag, from->name, to_name);
else
fprintf(stdout, "%c\t:%s\t", flag, to->name);
fprintf(stdout, "%c\t:%s\t", flag, to_name);
if (msg)
fprintf(stdout, "%s (%s)\n", summary, msg);
else
@ -481,9 +489,11 @@ static void print_ref_status(char flag, const char *summary,
fprintf(stderr, " %s%c %-*s%s ", red, flag, summary_width,
summary, reset);
if (from)
fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name));
fprintf(stderr, "%s -> %s",
prettify_refname(from->name),
prettify_refname(to_name));
else
fputs(prettify_refname(to->name), stderr);
fputs(prettify_refname(to_name), stderr);
if (msg) {
fputs(" (", stderr);
fputs(msg, stderr);
@ -493,27 +503,52 @@ static void print_ref_status(char flag, const char *summary,
}
}
static void print_ok_ref_status(struct ref *ref, int porcelain, int summary_width)
static void print_ok_ref_status(struct ref *ref,
struct ref_push_report_options *options,
int porcelain, int summary_width)
{
struct object_id *old_oid;
struct object_id *new_oid;
const char *ref_name;
int forced_update;
if (options && options->old_oid)
old_oid = options->old_oid;
else
old_oid = &ref->old_oid;
if (options && options->new_oid)
new_oid = options->new_oid;
else
new_oid = &ref->new_oid;
if (options && options->forced_update)
forced_update = options->forced_update;
else
forced_update = ref->forced_update;
if (options && options->ref_name)
ref_name = options->ref_name;
else
ref_name = ref->name;
if (ref->deletion)
print_ref_status('-', "[deleted]", ref, NULL, NULL,
porcelain, summary_width);
else if (is_null_oid(&ref->old_oid))
options, porcelain, summary_width);
else if (is_null_oid(old_oid))
print_ref_status('*',
(starts_with(ref->name, "refs/tags/")
(starts_with(ref_name, "refs/tags/")
? "[new tag]"
: (starts_with(ref->name, "refs/heads/")
: (starts_with(ref_name, "refs/heads/")
? "[new branch]"
: "[new reference]")),
ref, ref->peer_ref, NULL, porcelain, summary_width);
ref, ref->peer_ref, NULL,
options, porcelain, summary_width);
else {
struct strbuf quickref = STRBUF_INIT;
char type;
const char *msg;
strbuf_add_unique_abbrev(&quickref, &ref->old_oid,
strbuf_add_unique_abbrev(&quickref, old_oid,
DEFAULT_ABBREV);
if (ref->forced_update) {
if (forced_update) {
strbuf_addstr(&quickref, "...");
type = '+';
msg = "forced update";
@ -522,16 +557,17 @@ static void print_ok_ref_status(struct ref *ref, int porcelain, int summary_widt
type = ' ';
msg = NULL;
}
strbuf_add_unique_abbrev(&quickref, &ref->new_oid,
strbuf_add_unique_abbrev(&quickref, new_oid,
DEFAULT_ABBREV);
print_ref_status(type, quickref.buf, ref, ref->peer_ref, msg,
porcelain, summary_width);
options, porcelain, summary_width);
strbuf_release(&quickref);
}
}
static int print_one_push_status(struct ref *ref, const char *dest, int count,
static int _print_one_push_status(struct ref *ref, const char *dest, int count,
struct ref_push_report_options *options,
int porcelain, int summary_width)
{
if (!count) {
@ -543,65 +579,89 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count,
switch(ref->status) {
case REF_STATUS_NONE:
print_ref_status('X', "[no match]", ref, NULL, NULL,
porcelain, summary_width);
options, porcelain, summary_width);
break;
case REF_STATUS_REJECT_NODELETE:
print_ref_status('!', "[rejected]", ref, NULL,
"remote does not support deleting refs",
porcelain, summary_width);
options, porcelain, summary_width);
break;
case REF_STATUS_UPTODATE:
print_ref_status('=', "[up to date]", ref,
ref->peer_ref, NULL, porcelain, summary_width);
ref->peer_ref, NULL,
options, porcelain, summary_width);
break;
case REF_STATUS_REJECT_NONFASTFORWARD:
print_ref_status('!', "[rejected]", ref, ref->peer_ref,
"non-fast-forward", porcelain, summary_width);
"non-fast-forward",
options, porcelain, summary_width);
break;
case REF_STATUS_REJECT_ALREADY_EXISTS:
print_ref_status('!', "[rejected]", ref, ref->peer_ref,
"already exists", porcelain, summary_width);
"already exists",
options, porcelain, summary_width);
break;
case REF_STATUS_REJECT_FETCH_FIRST:
print_ref_status('!', "[rejected]", ref, ref->peer_ref,
"fetch first", porcelain, summary_width);
"fetch first",
options, porcelain, summary_width);
break;
case REF_STATUS_REJECT_NEEDS_FORCE:
print_ref_status('!', "[rejected]", ref, ref->peer_ref,
"needs force", porcelain, summary_width);
"needs force",
options, porcelain, summary_width);
break;
case REF_STATUS_REJECT_STALE:
print_ref_status('!', "[rejected]", ref, ref->peer_ref,
"stale info", porcelain, summary_width);
"stale info",
options, porcelain, summary_width);
break;
case REF_STATUS_REJECT_SHALLOW:
print_ref_status('!', "[rejected]", ref, ref->peer_ref,
"new shallow roots not allowed",
porcelain, summary_width);
options, porcelain, summary_width);
break;
case REF_STATUS_REMOTE_REJECT:
print_ref_status('!', "[remote rejected]", ref,
ref->deletion ? NULL : ref->peer_ref,
ref->remote_status, porcelain, summary_width);
ref->report.error_message,
options, porcelain, summary_width);
break;
case REF_STATUS_EXPECTING_REPORT:
print_ref_status('!', "[remote failure]", ref,
ref->deletion ? NULL : ref->peer_ref,
"remote failed to report status",
porcelain, summary_width);
options, porcelain, summary_width);
break;
case REF_STATUS_ATOMIC_PUSH_FAILED:
print_ref_status('!', "[rejected]", ref, ref->peer_ref,
"atomic push failed", porcelain, summary_width);
"atomic push failed",
options, porcelain, summary_width);
break;
case REF_STATUS_OK:
print_ok_ref_status(ref, porcelain, summary_width);
print_ok_ref_status(ref, options, porcelain, summary_width);
break;
}
return 1;
}
static int print_one_push_status(struct ref *ref, const char *dest, int count,
int porcelain, int summary_width)
{
struct ref_push_report_options *options;
int n = 0;
if (!ref->report.options)
return _print_one_push_status(ref, dest, count,
NULL, porcelain, summary_width);
for (options = ref->report.options; options; options = options->next)
_print_one_push_status(ref, dest, count + n++,
options, porcelain, summary_width);
return n;
}
static int measure_abbrev(const struct object_id *oid, int sofar)
{
char hex[GIT_MAX_HEXSZ + 1];