Signed-off-by: Brandon Williams <bmwill@xxxxxxxxxx>
---
Since introducing protocol v2 and enabling fetch I've been thinking
about what its inverse 'push' would look like. After talking with a
number of people I have a longish list of things that could be done to
improve push and I think I've been able to distill the core features we
want in push v2. Thankfully (due to the capability system) most of the
other features/improvements can be added later with ease.
What I've got now is a rough design for a more flexible push, more
flexible because it allows for the server to do what it wants with the
refs that are pushed and has the ability to communicate back what was
done to the client. The main motivation for this is to work around
issues when working with Gerrit and other code-review systems where you
need to have Change-Ids in the commit messages (now the server can just
insert them for you and send back new commits) and you need to push to
magic refs to get around various limitations (now a Gerrit server should
be able to communicate that pushing to 'master' doesn't update master
but instead creates a refs/changes/<id> ref).
Before actually moving to write any code I'm hoping to get some feedback
on if we think this is an acceptable base design for push (other
features like atomic-push, signed-push, etc can be added as
capabilities), so any comments are appreciated.
Documentation/technical/protocol-v2.txt | 76 +++++++++++++++++++++++++
1 file changed, 76 insertions(+)
diff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt
index 49bda76d23..16c1ce60dd 100644
--- a/Documentation/technical/protocol-v2.txt
+++ b/Documentation/technical/protocol-v2.txt
@@ -403,6 +403,82 @@ header.
2 - progress messages
3 - fatal error message just before stream aborts
+ push
+~~~~~~
+
+`push` is the command used to push ref-updates and a packfile to a remote
+server in v2.
+
+Additional features not supported in the base command will be advertised
+as the value of the command in the capability advertisement in the form
+of a space separated list of features: "<command>=<feature 1> <feature 2>"
+
+The format of a push request is as follows:
+
+ request = *section
+ section = (ref-updates | packfile)
+ (delim-pkt | flush-pkt)
+
+ ref-updates = PKT-LINE("ref-updates" LF)
+ *PKT-Line(update/force-update LF)
+
+ update = txn_id SP action SP refname SP old_oid SP new_oid
+ force-update = txn_id SP "force" SP action SP refname SP new_oid
+ action = ("create" | "delete" | "update")
+ txn_id = 1*DIGIT
+
+ packfile = PKT-LINE("packfile" LF)
+ *PKT-LINE(*%x00-ff)
+
+ ref-updates section
+ * Transaction id's allow for mapping what was requested to what the
+ server actually did with the ref-update.
+ * Normal ref-updates require that the old value of a ref is supplied so
+ that the server can verify that the reference that is being updated
+ hasn't changed while the request was being processed.
+ * Forced ref-updates only include the new value of a ref as we don't
+ care what the old value was.
+
+ packfile section
+ * A packfile MAY not be included if only delete commands are used or if
+ an update only incorperates objects the server already has
+
+The server will receive the packfile, unpack it, then validate each ref-update,
+and it will run any update hooks to make sure that the update is acceptable.
+If all of that is fine, the server will then update the references.
+
+The format of a push response is as follows:
+
+ response = *section
+ section = (unpack-error | ref-update-status | packfile)
+ (delim-pkt | flush-pkt)
+
+ unpack-error = PKT-LINE("ERR" SP error-msg LF)
+
+ ref-update-status = *(update-result | update-error)
+ update-result = *PKT-LINE(txn_id SP result LF)
+ result = ("created" | "deleted" | "updated") SP refname SP old_oid SP new_oid
+ update-error = PKT-LINE(txn_id SP "error" SP error-msg LF)
+
+ packfile = PKT-LINE("packfile" LF)
+ *PKT-LINE(*%x00-ff)
+
+ ref-update-status section
+ * This section is always included unless there was an error unpacking
+ the packfile sent in the request.
+ * The server is given the freedom to do what it wants with the
+ ref-updates provided in the reqeust. This means that an update sent
+ from the server may result in the creation of a ref or rebasing the
+ update on the server.
+ * If a server creates any new objects due to a ref-update, a packfile
+ MUST be sent back in the response.
+
+ packfile section
+ * This section is included if the server decided to do something with
+ the ref-updates that involved creating new objects.
+
server-option
~~~~~~~~~~~~~~~
--
2.18.0.203.gfac676dfb9-goog
