Hi,
this is the second version of this patch series to introduce transaction
support in `git update-ref --stdin`. The goal is to make commands
available to the user of that command so that he can explicitly control
the given transaction by starting, preparing, and finally committing or
aborting the transaction.
This version improves the argument handling for commands as proposed by
Junio. Instead of the hard-to-understand `extra_lines` field, commands
now have a `args` field that specifies how many arguments a given
command has, including the first one separated by a space. As a result,
the initial space for the first argument is now handled in the generic
part and not moved into each of the command functions anymore. I've also
added a comment that clarifies why we ignore EOF when fetching
additional command lines.
The range-diff against v2 is attached below.
Patrick
Patrick Steinhardt (9):
refs: fix segfault when aborting empty transaction
git-update-ref.txt: add missing word
strbuf: provide function to append whole lines
update-ref: organize commands in an array
update-ref: drop unused argument for `parse_refname`
update-ref: pass end pointer instead of strbuf
update-ref: move transaction handling into `update_refs_stdin()`
update-ref: read commands in a line-wise fashion
update-ref: implement interactive transaction handling
Documentation/git-update-ref.txt | 28 +++-
builtin/update-ref.c | 245 ++++++++++++++++++++++---------
refs/files-backend.c | 20 +--
strbuf.c | 10 ++
strbuf.h | 6 +
t/t1400-update-ref.sh | 131 +++++++++++++++++
6 files changed, 364 insertions(+), 76 deletions(-)
Range-diff against v2:
1: 7a297db4da = 1: 7a297db4da refs: fix segfault when aborting empty transaction
2: 15857e1b8c = 2: 15857e1b8c git-update-ref.txt: add missing word
3: b6546ae44e = 3: b6546ae44e strbuf: provide function to append whole lines
4: bd8c059fbc ! 4: 0f881d4936 update-ref: organize commands in an array
@@ Commit message
Signed-off-by: Patrick Steinhardt <ps@xxxxxx>
## builtin/update-ref.c ##
-@@ builtin/update-ref.c: static int parse_next_oid(struct strbuf *input, const char **next,
- /*
- * The following five parse_cmd_*() functions parse the corresponding
- * command. In each case, next points at the character following the
-- * command name and the following space. They each return a pointer
-- * to the character terminating the command, and die with an
-- * explanatory message if there are any parsing problems. All of
-- * these functions handle either text or binary format input,
-- * depending on how line_termination is set.
-+ * command name. They each return a pointer to the character
-+ * terminating the command, and die with an explanatory message if
-+ * there are any parsing problems. All of these functions handle
-+ * either text or binary format input, depending on how
-+ * line_termination is set.
- */
-
- static const char *parse_cmd_update(struct ref_transaction *transaction,
-@@ builtin/update-ref.c: static const char *parse_cmd_update(struct ref_transaction *transaction,
- struct object_id new_oid, old_oid;
- int have_old;
-
-+ if (!skip_prefix(next, " ", &next))
-+ die("update: missing space after command");
-+
- refname = parse_refname(input, &next);
- if (!refname)
- die("update: missing <ref>");
-@@ builtin/update-ref.c: static const char *parse_cmd_create(struct ref_transaction *transaction,
- char *refname;
- struct object_id new_oid;
-
-+ if (!skip_prefix(next, " ", &next))
-+ die("create: missing space after command");
-+
- refname = parse_refname(input, &next);
- if (!refname)
- die("create: missing <ref>");
-@@ builtin/update-ref.c: static const char *parse_cmd_delete(struct ref_transaction *transaction,
- struct object_id old_oid;
- int have_old;
-
-+ if (!skip_prefix(next, " ", &next))
-+ die("delete: missing space after command");
-+
- refname = parse_refname(input, &next);
- if (!refname)
- die("delete: missing <ref>");
-@@ builtin/update-ref.c: static const char *parse_cmd_verify(struct ref_transaction *transaction,
- char *refname;
- struct object_id old_oid;
-
-+ if (!skip_prefix(next, " ", &next))
-+ die("verify: missing space after command");
-+
- refname = parse_refname(input, &next);
- if (!refname)
- die("verify: missing <ref>");
@@ builtin/update-ref.c: static const char *parse_cmd_verify(struct ref_transaction *transaction,
return next;
}
@@ builtin/update-ref.c: static const char *parse_cmd_verify(struct ref_transaction
+ struct strbuf *input, const char *next)
{
const char *rest;
-+ if (!skip_prefix(next, " ", &next))
-+ die("option: missing space after command");
if (skip_prefix(next, "no-deref", &rest) && *rest == line_termination)
- update_flags |= REF_NO_DEREF;
- else
@@ builtin/update-ref.c: static const char *parse_cmd_option(struct strbuf *input, const char *next)
return rest;
}
@@ builtin/update-ref.c: static const char *parse_cmd_option(struct strbuf *input,
+ for (i = 0; i < ARRAY_SIZE(command); i++) {
+ const char *prefix = command[i].prefix;
+
-+ if (!skip_prefix(next, prefix, &next))
-+ continue;
-+
-+ /*
-+ * Check that the command is terminated by an argument
-+ * or line terminator and not only a matching prefix.
-+ */
-+ if (input.buf[strlen(prefix)] != line_termination &&
-+ input.buf[strlen(prefix)] != '\0' &&
-+ input.buf[strlen(prefix)] != ' ')
++ if (!skip_prefix(next, prefix, &next) ||
++ !skip_prefix(next, " ", &next))
+ continue;
+
+ cmd = &command[i];
5: 49a14d2046 ! 5: c96395a14d update-ref: drop unused argument for `parse_refname`
@@ builtin/update-ref.c: static const char *parse_arg(const char *next, struct strb
struct strbuf ref = STRBUF_INIT;
@@ builtin/update-ref.c: static const char *parse_cmd_update(struct ref_transaction *transaction,
- if (!skip_prefix(next, " ", &next))
- die("update: missing space after command");
+ struct object_id new_oid, old_oid;
+ int have_old;
- refname = parse_refname(input, &next);
+ refname = parse_refname(&next);
@@ builtin/update-ref.c: static const char *parse_cmd_update(struct ref_transaction
die("update: missing <ref>");
@@ builtin/update-ref.c: static const char *parse_cmd_create(struct ref_transaction *transaction,
- if (!skip_prefix(next, " ", &next))
- die("create: missing space after command");
+ char *refname;
+ struct object_id new_oid;
- refname = parse_refname(input, &next);
+ refname = parse_refname(&next);
@@ builtin/update-ref.c: static const char *parse_cmd_create(struct ref_transaction
die("create: missing <ref>");
@@ builtin/update-ref.c: static const char *parse_cmd_delete(struct ref_transaction *transaction,
- if (!skip_prefix(next, " ", &next))
- die("delete: missing space after command");
+ struct object_id old_oid;
+ int have_old;
- refname = parse_refname(input, &next);
+ refname = parse_refname(&next);
@@ builtin/update-ref.c: static const char *parse_cmd_delete(struct ref_transaction
die("delete: missing <ref>");
@@ builtin/update-ref.c: static const char *parse_cmd_verify(struct ref_transaction *transaction,
- if (!skip_prefix(next, " ", &next))
- die("verify: missing space after command");
+ char *refname;
+ struct object_id old_oid;
- refname = parse_refname(input, &next);
+ refname = parse_refname(&next);
6: cbe430029d ! 6: 192cbf5944 update-ref: pass end pointer instead of strbuf
@@ builtin/update-ref.c: static const char *parse_cmd_verify(struct ref_transaction
+ const char *next, const char *end)
{
const char *rest;
- if (!skip_prefix(next, " ", &next))
+ if (skip_prefix(next, "no-deref", &rest) && *rest == line_termination)
@@ builtin/update-ref.c: static const char *parse_cmd_option(struct ref_transaction *transaction,
static const struct parse_cmd {
7: d2f68f59a7 = 7: be7bcf3dbd update-ref: move transaction handling into `update_refs_stdin()`
8: f8786fdeb3 ! 8: 02ff6b7337 update-ref: read commands in a line-wise fashion
@@ Commit message
## builtin/update-ref.c ##
@@ builtin/update-ref.c: static int parse_next_oid(const char **next, const char *end,
- * line_termination is set.
+ * depending on how line_termination is set.
*/
-static const char *parse_cmd_update(struct ref_transaction *transaction,
@@ builtin/update-ref.c: static const char *parse_cmd_verify(struct ref_transaction
+ const char *next, const char *end)
{
const char *rest;
- if (!skip_prefix(next, " ", &next))
-@@ builtin/update-ref.c: static const char *parse_cmd_option(struct ref_transaction *transaction,
+ if (skip_prefix(next, "no-deref", &rest) && *rest == line_termination)
update_flags |= REF_NO_DEREF;
else
die("option unknown: %s", next);
@@ builtin/update-ref.c: static const char *parse_cmd_option(struct ref_transaction
const char *prefix;
- const char *(*fn)(struct ref_transaction *, const char *, const char *);
+ void (*fn)(struct ref_transaction *, const char *, const char *);
-+ /*
-+ * If using NUL-terminated format, only the first argument will be
-+ * available in the first line. In case a command expects more than one
-+ * argument, we thus have to fetch an additional `extra_lines` number
-+ * of lines.
-+ */
-+ unsigned extra_lines;
++ unsigned args;
} command[] = {
- { "update", parse_cmd_update },
- { "create", parse_cmd_create },
- { "delete", parse_cmd_delete },
- { "verify", parse_cmd_verify },
- { "option", parse_cmd_option },
-+ { "update", parse_cmd_update, 2 },
-+ { "create", parse_cmd_create, 1 },
-+ { "delete", parse_cmd_delete, 1 },
-+ { "verify", parse_cmd_verify, 1 },
-+ { "option", parse_cmd_option, 0 },
++ { "update", parse_cmd_update, 3 },
++ { "create", parse_cmd_create, 2 },
++ { "delete", parse_cmd_delete, 2 },
++ { "verify", parse_cmd_verify, 2 },
++ { "option", parse_cmd_option, 1 },
};
static void update_refs_stdin(void)
@@ builtin/update-ref.c: static const char *parse_cmd_option(struct ref_transaction
for (i = 0; i < ARRAY_SIZE(command); i++) {
const char *prefix = command[i].prefix;
++ char c;
-- if (!skip_prefix(next, prefix, &next))
+- if (!skip_prefix(next, prefix, &next) ||
+- !skip_prefix(next, " ", &next))
+ if (!starts_with(input.buf, prefix))
++ continue;
++
++ /*
++ * If the command has arguments, verify that it's
++ * followed by a space. Otherwise, it shall be followed
++ * by a line terminator.
++ */
++ c = command[i].args ? ' ' : line_termination;
++ if (input.buf[strlen(prefix)] != c)
continue;
- /*
-@@ builtin/update-ref.c: static void update_refs_stdin(void)
+ cmd = &command[i];
break;
}
if (!cmd)
@@ builtin/update-ref.c: static void update_refs_stdin(void)
- next = cmd->fn(transaction, next, input.buf + input.len);
- next++;
+ /*
-+ * Read extra lines if NUL-terminated. Do not raise an error in
-+ * case there is an early EOF to let the command handle missing
-+ * arguments with a proper error message.
++ * Read additional arguments if NUL-terminated. Do not raise an
++ * error in case there is an early EOF to let the command
++ * handle missing arguments with a proper error message.
+ */
-+ for (j = 0; line_termination == '\0' && j < cmd->extra_lines; j++)
++ for (j = 1; line_termination == '\0' && j < cmd->args; j++)
+ if (strbuf_appendwholeline(&input, stdin, line_termination))
+ break;
+
-+ cmd->fn(transaction, input.buf + strlen(cmd->prefix),
++ cmd->fn(transaction, input.buf + strlen(cmd->prefix) + !!cmd->args,
+ input.buf + input.len);
}
9: c3fffdf9fa ! 9: 5670bea2b1 update-ref: implement interactive transaction handling
@@ builtin/update-ref.c: static void parse_cmd_option(struct ref_transaction *trans
static const struct parse_cmd {
const char *prefix;
void (*fn)(struct ref_transaction *, const char *, const char *);
-@@ builtin/update-ref.c: static const struct parse_cmd {
- * of lines.
- */
- unsigned extra_lines;
+ unsigned args;
+ enum update_refs_state state;
} command[] = {
-- { "update", parse_cmd_update, 2 },
-- { "create", parse_cmd_create, 1 },
-- { "delete", parse_cmd_delete, 1 },
-- { "verify", parse_cmd_verify, 1 },
-- { "option", parse_cmd_option, 0 },
-+ { "update", parse_cmd_update, 2, UPDATE_REFS_OPEN },
-+ { "create", parse_cmd_create, 1, UPDATE_REFS_OPEN },
-+ { "delete", parse_cmd_delete, 1, UPDATE_REFS_OPEN },
-+ { "verify", parse_cmd_verify, 1, UPDATE_REFS_OPEN },
-+ { "option", parse_cmd_option, 0, UPDATE_REFS_OPEN },
+- { "update", parse_cmd_update, 3 },
+- { "create", parse_cmd_create, 2 },
+- { "delete", parse_cmd_delete, 2 },
+- { "verify", parse_cmd_verify, 2 },
+- { "option", parse_cmd_option, 1 },
++ { "update", parse_cmd_update, 3, UPDATE_REFS_OPEN },
++ { "create", parse_cmd_create, 2, UPDATE_REFS_OPEN },
++ { "delete", parse_cmd_delete, 2, UPDATE_REFS_OPEN },
++ { "verify", parse_cmd_verify, 2, UPDATE_REFS_OPEN },
++ { "option", parse_cmd_option, 1, UPDATE_REFS_OPEN },
+ { "start", parse_cmd_start, 0, UPDATE_REFS_STARTED },
+ { "prepare", parse_cmd_prepare, 0, UPDATE_REFS_PREPARED },
+ { "abort", parse_cmd_abort, 0, UPDATE_REFS_CLOSED },
@@ builtin/update-ref.c: static void update_refs_stdin(void)
+ break;
+ }
+
- cmd->fn(transaction, input.buf + strlen(cmd->prefix),
+ cmd->fn(transaction, input.buf + strlen(cmd->prefix) + !!cmd->args,
input.buf + input.len);
}
--
2.26.0
Attachment:
signature.asc
Description: PGP signature
