receive-pack: add new proc-receive hook
Git calls an internal `execute_commands` function to handle commands
sent from client to `git-receive-pack`. Regardless of what references
the user pushes, git creates or updates the corresponding references if
the user has write-permission. A contributor who has no
write-permission, cannot push to the repository directly. So, the
contributor has to write commits to an alternate location, and sends
pull request by emails or by other ways. We call this workflow as a
distributed workflow.
It would be more convenient to work in a centralized workflow like what
Gerrit provided for some cases. For example, a read-only user who
cannot push to a branch directly can run the following `git push`
command to push commits to a pseudo reference (has a prefix "refs/for/",
not "refs/heads/") to create a code review.
git push origin \
HEAD:refs/for/<branch-name>/<session>
The `<branch-name>` in the above example can be as simple as "master",
or a more complicated branch name like "foo/bar". The `<session>` in
the above example command can be the local branch name of the client
side, such as "my/topic".
We cannot implement a centralized workflow elegantly by using
"pre-receive" + "post-receive", because Git will call the internal
function "execute_commands" to create references (even the special
pseudo reference) between these two hooks. Even though we can delete
the temporarily created pseudo reference via the "post-receive" hook,
having a temporary reference is not safe for concurrent pushes.
So, add a filter and a new handler to support this kind of workflow.
The filter will check the prefix of the reference name, and if the
command has a special reference name, the filter will turn a specific
field (`run_proc_receive`) on for the command. Commands with this filed
turned on will be executed by a new handler (a hook named
"proc-receive") instead of the internal `execute_commands` function.
We can use this "proc-receive" command to create pull requests or send
emails for code review.
Suggested by Junio, this "proc-receive" hook reads the commands,
push-options (optional), and send result using a protocol in pkt-line
format. In the following example, the letter "S" stands for
"receive-pack" and letter "H" stands for the hook.
# Version and features negotiation.
S: PKT-LINE(version=1\0push-options atomic...)
S: flush-pkt
H: PKT-LINE(version=1\0push-options...)
H: flush-pkt
# Send commands from server to the hook.
S: PKT-LINE(<old-oid> <new-oid> <ref>)
S: ... ...
S: flush-pkt
# Send push-options only if the 'push-options' feature is enabled.
S: PKT-LINE(push-option)
S: ... ...
S: flush-pkt
# Receive result from the hook.
# OK, run this command successfully.
H: PKT-LINE(ok <ref>)
# NO, I reject it.
H: PKT-LINE(ng <ref> <reason>)
# Fall through, let 'receive-pack' to execute it.
H: PKT-LINE(ok <ref>)
H: PKT-LINE(option fall-through)
# OK, but has an alternate reference. The alternate reference name
# and other status can be given in options
H: PKT-LINE(ok <ref>)
H: PKT-LINE(option refname <refname>)
H: PKT-LINE(option old-oid <old-oid>)
H: PKT-LINE(option new-oid <new-oid>)
H: PKT-LINE(option forced-update)
H: ... ...
H: flush-pkt
After receiving a command, the hook will execute the command, and may
create/update different reference. For example, a command for a pseudo
reference "refs/for/master/topic" may create/update different reference
such as "refs/pull/123/head". The alternate reference name and other
status are given in option lines.
The list of commands returned from "proc-receive" will replace the
relevant commands that are sent from user to "receive-pack", and
"receive-pack" will continue to run the "execute_commands" function and
other routines. Finally, the result of the execution of these commands
will be reported to end user.
The reporting function from "receive-pack" to "send-pack" will be
extended in latter commit just like what the "proc-receive" hook reports
to "receive-pack".
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-08-27 15:45:44 +00:00
|
|
|
test_expect_success "setup proc-receive hook ($PROTOCOL)" '
|
|
|
|
|
write_script "$upstream/hooks/proc-receive" <<-EOF
|
|
|
|
|
printf >&2 "# proc-receive hook\n"
|
|
|
|
|
test-tool proc-receive -v \
|
|
|
|
|
-r "ok refs/for/next/topic2" \
|
|
|
|
|
-r "ng refs/for/next/topic1 fail to call Web API" \
|
|
|
|
|
-r "ok refs/for/master/topic" \
|
|
|
|
|
-r "option refname refs/for/master/topic" \
|
|
|
|
|
-r "option old-oid $A" \
|
|
|
|
|
-r "option new-oid $B"
|
|
|
|
|
EOF
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
# Refs of upstream : master(A)
|
|
|
|
|
# Refs of workbench: master(A) tags/v123
|
|
|
|
|
# git push : (B) bar(A) baz(A) refs/for/next/topic(A) foo(A) refs/for/master/topic(A)
|
|
|
|
|
test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL)" '
|
|
|
|
|
test_must_fail git -C workbench push origin \
|
|
|
|
|
$B:refs/heads/master \
|
|
|
|
|
HEAD:refs/heads/bar \
|
|
|
|
|
HEAD:refs/heads/baz \
|
|
|
|
|
HEAD:refs/for/next/topic2 \
|
|
|
|
|
HEAD:refs/for/next/topic1 \
|
|
|
|
|
HEAD:refs/heads/foo \
|
|
|
|
|
HEAD:refs/for/master/topic \
|
|
|
|
|
HEAD:refs/for/next/topic3 \
|
|
|
|
|
>out 2>&1 &&
|
|
|
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
remote: # pre-receive hook
|
|
|
|
|
remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master
|
|
|
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar
|
|
|
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz
|
|
|
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2
|
|
|
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1
|
|
|
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
|
|
|
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
|
|
|
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3
|
|
|
|
|
remote: # proc-receive hook
|
|
|
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2
|
|
|
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1
|
|
|
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
|
|
|
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3
|
|
|
|
|
remote: proc-receive> ok refs/for/next/topic2
|
|
|
|
|
remote: proc-receive> ng refs/for/next/topic1 fail to call Web API
|
|
|
|
|
remote: proc-receive> ok refs/for/master/topic
|
|
|
|
|
remote: proc-receive> option refname refs/for/master/topic
|
|
|
|
|
remote: proc-receive> option old-oid <COMMIT-A>
|
|
|
|
|
remote: proc-receive> option new-oid <COMMIT-B>
|
|
|
|
|
remote: # post-receive hook
|
|
|
|
|
remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/master
|
|
|
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar
|
|
|
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz
|
|
|
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2
|
|
|
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
|
2020-08-27 15:45:45 +00:00
|
|
|
remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/master/topic
|
receive-pack: add new proc-receive hook
Git calls an internal `execute_commands` function to handle commands
sent from client to `git-receive-pack`. Regardless of what references
the user pushes, git creates or updates the corresponding references if
the user has write-permission. A contributor who has no
write-permission, cannot push to the repository directly. So, the
contributor has to write commits to an alternate location, and sends
pull request by emails or by other ways. We call this workflow as a
distributed workflow.
It would be more convenient to work in a centralized workflow like what
Gerrit provided for some cases. For example, a read-only user who
cannot push to a branch directly can run the following `git push`
command to push commits to a pseudo reference (has a prefix "refs/for/",
not "refs/heads/") to create a code review.
git push origin \
HEAD:refs/for/<branch-name>/<session>
The `<branch-name>` in the above example can be as simple as "master",
or a more complicated branch name like "foo/bar". The `<session>` in
the above example command can be the local branch name of the client
side, such as "my/topic".
We cannot implement a centralized workflow elegantly by using
"pre-receive" + "post-receive", because Git will call the internal
function "execute_commands" to create references (even the special
pseudo reference) between these two hooks. Even though we can delete
the temporarily created pseudo reference via the "post-receive" hook,
having a temporary reference is not safe for concurrent pushes.
So, add a filter and a new handler to support this kind of workflow.
The filter will check the prefix of the reference name, and if the
command has a special reference name, the filter will turn a specific
field (`run_proc_receive`) on for the command. Commands with this filed
turned on will be executed by a new handler (a hook named
"proc-receive") instead of the internal `execute_commands` function.
We can use this "proc-receive" command to create pull requests or send
emails for code review.
Suggested by Junio, this "proc-receive" hook reads the commands,
push-options (optional), and send result using a protocol in pkt-line
format. In the following example, the letter "S" stands for
"receive-pack" and letter "H" stands for the hook.
# Version and features negotiation.
S: PKT-LINE(version=1\0push-options atomic...)
S: flush-pkt
H: PKT-LINE(version=1\0push-options...)
H: flush-pkt
# Send commands from server to the hook.
S: PKT-LINE(<old-oid> <new-oid> <ref>)
S: ... ...
S: flush-pkt
# Send push-options only if the 'push-options' feature is enabled.
S: PKT-LINE(push-option)
S: ... ...
S: flush-pkt
# Receive result from the hook.
# OK, run this command successfully.
H: PKT-LINE(ok <ref>)
# NO, I reject it.
H: PKT-LINE(ng <ref> <reason>)
# Fall through, let 'receive-pack' to execute it.
H: PKT-LINE(ok <ref>)
H: PKT-LINE(option fall-through)
# OK, but has an alternate reference. The alternate reference name
# and other status can be given in options
H: PKT-LINE(ok <ref>)
H: PKT-LINE(option refname <refname>)
H: PKT-LINE(option old-oid <old-oid>)
H: PKT-LINE(option new-oid <new-oid>)
H: PKT-LINE(option forced-update)
H: ... ...
H: flush-pkt
After receiving a command, the hook will execute the command, and may
create/update different reference. For example, a command for a pseudo
reference "refs/for/master/topic" may create/update different reference
such as "refs/pull/123/head". The alternate reference name and other
status are given in option lines.
The list of commands returned from "proc-receive" will replace the
relevant commands that are sent from user to "receive-pack", and
"receive-pack" will continue to run the "execute_commands" function and
other routines. Finally, the result of the execution of these commands
will be reported to end user.
The reporting function from "receive-pack" to "send-pack" will be
extended in latter commit just like what the "proc-receive" hook reports
to "receive-pack".
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-08-27 15:45:44 +00:00
|
|
|
To <URL/of/upstream.git>
|
|
|
|
|
<OID-A>..<OID-B> <COMMIT-B> -> master
|
|
|
|
|
* [new branch] HEAD -> bar
|
|
|
|
|
* [new branch] HEAD -> baz
|
|
|
|
|
* [new reference] HEAD -> refs/for/next/topic2
|
|
|
|
|
* [new branch] HEAD -> foo
|
2020-08-27 15:45:46 +00:00
|
|
|
<OID-A>..<OID-B> HEAD -> refs/for/master/topic
|
receive-pack: add new proc-receive hook
Git calls an internal `execute_commands` function to handle commands
sent from client to `git-receive-pack`. Regardless of what references
the user pushes, git creates or updates the corresponding references if
the user has write-permission. A contributor who has no
write-permission, cannot push to the repository directly. So, the
contributor has to write commits to an alternate location, and sends
pull request by emails or by other ways. We call this workflow as a
distributed workflow.
It would be more convenient to work in a centralized workflow like what
Gerrit provided for some cases. For example, a read-only user who
cannot push to a branch directly can run the following `git push`
command to push commits to a pseudo reference (has a prefix "refs/for/",
not "refs/heads/") to create a code review.
git push origin \
HEAD:refs/for/<branch-name>/<session>
The `<branch-name>` in the above example can be as simple as "master",
or a more complicated branch name like "foo/bar". The `<session>` in
the above example command can be the local branch name of the client
side, such as "my/topic".
We cannot implement a centralized workflow elegantly by using
"pre-receive" + "post-receive", because Git will call the internal
function "execute_commands" to create references (even the special
pseudo reference) between these two hooks. Even though we can delete
the temporarily created pseudo reference via the "post-receive" hook,
having a temporary reference is not safe for concurrent pushes.
So, add a filter and a new handler to support this kind of workflow.
The filter will check the prefix of the reference name, and if the
command has a special reference name, the filter will turn a specific
field (`run_proc_receive`) on for the command. Commands with this filed
turned on will be executed by a new handler (a hook named
"proc-receive") instead of the internal `execute_commands` function.
We can use this "proc-receive" command to create pull requests or send
emails for code review.
Suggested by Junio, this "proc-receive" hook reads the commands,
push-options (optional), and send result using a protocol in pkt-line
format. In the following example, the letter "S" stands for
"receive-pack" and letter "H" stands for the hook.
# Version and features negotiation.
S: PKT-LINE(version=1\0push-options atomic...)
S: flush-pkt
H: PKT-LINE(version=1\0push-options...)
H: flush-pkt
# Send commands from server to the hook.
S: PKT-LINE(<old-oid> <new-oid> <ref>)
S: ... ...
S: flush-pkt
# Send push-options only if the 'push-options' feature is enabled.
S: PKT-LINE(push-option)
S: ... ...
S: flush-pkt
# Receive result from the hook.
# OK, run this command successfully.
H: PKT-LINE(ok <ref>)
# NO, I reject it.
H: PKT-LINE(ng <ref> <reason>)
# Fall through, let 'receive-pack' to execute it.
H: PKT-LINE(ok <ref>)
H: PKT-LINE(option fall-through)
# OK, but has an alternate reference. The alternate reference name
# and other status can be given in options
H: PKT-LINE(ok <ref>)
H: PKT-LINE(option refname <refname>)
H: PKT-LINE(option old-oid <old-oid>)
H: PKT-LINE(option new-oid <new-oid>)
H: PKT-LINE(option forced-update)
H: ... ...
H: flush-pkt
After receiving a command, the hook will execute the command, and may
create/update different reference. For example, a command for a pseudo
reference "refs/for/master/topic" may create/update different reference
such as "refs/pull/123/head". The alternate reference name and other
status are given in option lines.
The list of commands returned from "proc-receive" will replace the
relevant commands that are sent from user to "receive-pack", and
"receive-pack" will continue to run the "execute_commands" function and
other routines. Finally, the result of the execution of these commands
will be reported to end user.
The reporting function from "receive-pack" to "send-pack" will be
extended in latter commit just like what the "proc-receive" hook reports
to "receive-pack".
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-08-27 15:45:44 +00:00
|
|
|
! [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
|
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
git -C "$upstream" show-ref >out &&
|
|
|
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
<COMMIT-A> refs/heads/bar
|
|
|
|
|
<COMMIT-A> refs/heads/baz
|
|
|
|
|
<COMMIT-A> refs/heads/foo
|
|
|
|
|
<COMMIT-B> refs/heads/master
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
# Refs of upstream : master(B) foo(A) bar(A)) baz(A)
|
|
|
|
|
# Refs of workbench: master(A) tags/v123
|
|
|
|
|
test_expect_success "cleanup ($PROTOCOL)" '
|
|
|
|
|
(
|
|
|
|
|
cd "$upstream" &&
|
|
|
|
|
git update-ref refs/heads/master $A &&
|
|
|
|
|
git update-ref -d refs/heads/foo &&
|
|
|
|
|
git update-ref -d refs/heads/bar &&
|
|
|
|
|
git update-ref -d refs/heads/baz
|
|
|
|
|
)
|
|
|
|
|
'
|