mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
add read_author_script() to libgit
Add read_author_script() to sequencer.c based on the implementation in builtin/am.c and update read_am_author_script() to use read_author_script(). The sequencer code that reads the author script will be updated in the next commit. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a75d351388
commit
bcd33ec25f
86
builtin/am.c
86
builtin/am.c
|
@ -260,36 +260,6 @@ static int read_state_file(struct strbuf *sb, const struct am_state *state,
|
||||||
die_errno(_("could not read '%s'"), am_path(state, file));
|
die_errno(_("could not read '%s'"), am_path(state, file));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Take a series of KEY='VALUE' lines where VALUE part is
|
|
||||||
* sq-quoted, and append <KEY, VALUE> at the end of the string list
|
|
||||||
*/
|
|
||||||
static int parse_key_value_squoted(char *buf, struct string_list *list)
|
|
||||||
{
|
|
||||||
while (*buf) {
|
|
||||||
struct string_list_item *item;
|
|
||||||
char *np;
|
|
||||||
char *cp = strchr(buf, '=');
|
|
||||||
if (!cp) {
|
|
||||||
np = strchrnul(buf, '\n');
|
|
||||||
return error(_("unable to parse '%.*s'"),
|
|
||||||
(int) (np - buf), buf);
|
|
||||||
}
|
|
||||||
np = strchrnul(cp, '\n');
|
|
||||||
*cp++ = '\0';
|
|
||||||
item = string_list_append(list, buf);
|
|
||||||
|
|
||||||
buf = np + (*np == '\n');
|
|
||||||
*np = '\0';
|
|
||||||
cp = sq_dequote(cp);
|
|
||||||
if (!cp)
|
|
||||||
return error(_("unable to dequote value of '%s'"),
|
|
||||||
item->string);
|
|
||||||
item->util = xstrdup(cp);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reads and parses the state directory's "author-script" file, and sets
|
* Reads and parses the state directory's "author-script" file, and sets
|
||||||
* state->author_name, state->author_email and state->author_date accordingly.
|
* state->author_name, state->author_email and state->author_date accordingly.
|
||||||
|
@ -309,65 +279,13 @@ static int parse_key_value_squoted(char *buf, struct string_list *list)
|
||||||
static int read_am_author_script(struct am_state *state)
|
static int read_am_author_script(struct am_state *state)
|
||||||
{
|
{
|
||||||
const char *filename = am_path(state, "author-script");
|
const char *filename = am_path(state, "author-script");
|
||||||
struct strbuf buf = STRBUF_INIT;
|
|
||||||
struct string_list kv = STRING_LIST_INIT_DUP;
|
|
||||||
int retval = -1; /* assume failure */
|
|
||||||
int i, name_i = -2, email_i = -2, date_i = -2, err = 0;
|
|
||||||
int fd;
|
|
||||||
|
|
||||||
assert(!state->author_name);
|
assert(!state->author_name);
|
||||||
assert(!state->author_email);
|
assert(!state->author_email);
|
||||||
assert(!state->author_date);
|
assert(!state->author_date);
|
||||||
|
|
||||||
fd = open(filename, O_RDONLY);
|
return read_author_script(filename, &state->author_name,
|
||||||
if (fd < 0) {
|
&state->author_email, &state->author_date, 1);
|
||||||
if (errno == ENOENT)
|
|
||||||
return 0;
|
|
||||||
return error_errno(_("could not open '%s' for reading"),
|
|
||||||
filename);
|
|
||||||
}
|
|
||||||
strbuf_read(&buf, fd, 0);
|
|
||||||
close(fd);
|
|
||||||
if (parse_key_value_squoted(buf.buf, &kv))
|
|
||||||
goto finish;
|
|
||||||
|
|
||||||
for (i = 0; i < kv.nr; i++) {
|
|
||||||
if (!strcmp(kv.items[i].string, "GIT_AUTHOR_NAME")) {
|
|
||||||
if (name_i != -2)
|
|
||||||
name_i = error(_("'GIT_AUTHOR_NAME' already given"));
|
|
||||||
else
|
|
||||||
name_i = i;
|
|
||||||
} else if (!strcmp(kv.items[i].string, "GIT_AUTHOR_EMAIL")) {
|
|
||||||
if (email_i != -2)
|
|
||||||
email_i = error(_("'GIT_AUTHOR_EMAIL' already given"));
|
|
||||||
else
|
|
||||||
email_i = i;
|
|
||||||
} else if (!strcmp(kv.items[i].string, "GIT_AUTHOR_DATE")) {
|
|
||||||
if (date_i != -2)
|
|
||||||
date_i = error(_("'GIT_AUTHOR_DATE' already given"));
|
|
||||||
else
|
|
||||||
date_i = i;
|
|
||||||
} else {
|
|
||||||
err = error(_("unknown variable '%s'"),
|
|
||||||
kv.items[i].string);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (name_i == -2)
|
|
||||||
error(_("missing 'GIT_AUTHOR_NAME'"));
|
|
||||||
if (email_i == -2)
|
|
||||||
error(_("missing 'GIT_AUTHOR_EMAIL'"));
|
|
||||||
if (date_i == -2)
|
|
||||||
error(_("missing 'GIT_AUTHOR_DATE'"));
|
|
||||||
if (date_i < 0 || email_i < 0 || date_i < 0 || err)
|
|
||||||
goto finish;
|
|
||||||
state->author_name = kv.items[name_i].util;
|
|
||||||
state->author_email = kv.items[email_i].util;
|
|
||||||
state->author_date = kv.items[date_i].util;
|
|
||||||
retval = 0;
|
|
||||||
finish:
|
|
||||||
string_list_clear(&kv, !!retval);
|
|
||||||
strbuf_release(&buf);
|
|
||||||
return retval;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
105
sequencer.c
105
sequencer.c
|
@ -664,6 +664,111 @@ static int write_author_script(const char *message)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Take a series of KEY='VALUE' lines where VALUE part is
|
||||||
|
* sq-quoted, and append <KEY, VALUE> at the end of the string list
|
||||||
|
*/
|
||||||
|
static int parse_key_value_squoted(char *buf, struct string_list *list)
|
||||||
|
{
|
||||||
|
while (*buf) {
|
||||||
|
struct string_list_item *item;
|
||||||
|
char *np;
|
||||||
|
char *cp = strchr(buf, '=');
|
||||||
|
if (!cp) {
|
||||||
|
np = strchrnul(buf, '\n');
|
||||||
|
return error(_("no key present in '%.*s'"),
|
||||||
|
(int) (np - buf), buf);
|
||||||
|
}
|
||||||
|
np = strchrnul(cp, '\n');
|
||||||
|
*cp++ = '\0';
|
||||||
|
item = string_list_append(list, buf);
|
||||||
|
|
||||||
|
buf = np + (*np == '\n');
|
||||||
|
*np = '\0';
|
||||||
|
cp = sq_dequote(cp);
|
||||||
|
if (!cp)
|
||||||
|
return error(_("unable to dequote value of '%s'"),
|
||||||
|
item->string);
|
||||||
|
item->util = xstrdup(cp);
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reads and parses the state directory's "author-script" file, and sets name,
|
||||||
|
* email and date accordingly.
|
||||||
|
* Returns 0 on success, -1 if the file could not be parsed.
|
||||||
|
*
|
||||||
|
* The author script is of the format:
|
||||||
|
*
|
||||||
|
* GIT_AUTHOR_NAME='$author_name'
|
||||||
|
* GIT_AUTHOR_EMAIL='$author_email'
|
||||||
|
* GIT_AUTHOR_DATE='$author_date'
|
||||||
|
*
|
||||||
|
* where $author_name, $author_email and $author_date are quoted. We are strict
|
||||||
|
* with our parsing, as the file was meant to be eval'd in the old
|
||||||
|
* git-am.sh/git-rebase--interactive.sh scripts, and thus if the file differs
|
||||||
|
* from what this function expects, it is better to bail out than to do
|
||||||
|
* something that the user does not expect.
|
||||||
|
*/
|
||||||
|
int read_author_script(const char *path, char **name, char **email, char **date,
|
||||||
|
int allow_missing)
|
||||||
|
{
|
||||||
|
struct strbuf buf = STRBUF_INIT;
|
||||||
|
struct string_list kv = STRING_LIST_INIT_DUP;
|
||||||
|
int retval = -1; /* assume failure */
|
||||||
|
int i, name_i = -2, email_i = -2, date_i = -2, err = 0;
|
||||||
|
|
||||||
|
if (strbuf_read_file(&buf, path, 256) <= 0) {
|
||||||
|
strbuf_release(&buf);
|
||||||
|
if (errno == ENOENT && allow_missing)
|
||||||
|
return 0;
|
||||||
|
else
|
||||||
|
return error_errno(_("could not open '%s' for reading"),
|
||||||
|
path);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (parse_key_value_squoted(buf.buf, &kv))
|
||||||
|
goto finish;
|
||||||
|
|
||||||
|
for (i = 0; i < kv.nr; i++) {
|
||||||
|
if (!strcmp(kv.items[i].string, "GIT_AUTHOR_NAME")) {
|
||||||
|
if (name_i != -2)
|
||||||
|
name_i = error(_("'GIT_AUTHOR_NAME' already given"));
|
||||||
|
else
|
||||||
|
name_i = i;
|
||||||
|
} else if (!strcmp(kv.items[i].string, "GIT_AUTHOR_EMAIL")) {
|
||||||
|
if (email_i != -2)
|
||||||
|
email_i = error(_("'GIT_AUTHOR_EMAIL' already given"));
|
||||||
|
else
|
||||||
|
email_i = i;
|
||||||
|
} else if (!strcmp(kv.items[i].string, "GIT_AUTHOR_DATE")) {
|
||||||
|
if (date_i != -2)
|
||||||
|
date_i = error(_("'GIT_AUTHOR_DATE' already given"));
|
||||||
|
else
|
||||||
|
date_i = i;
|
||||||
|
} else {
|
||||||
|
err = error(_("unknown variable '%s'"),
|
||||||
|
kv.items[i].string);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (name_i == -2)
|
||||||
|
error(_("missing 'GIT_AUTHOR_NAME'"));
|
||||||
|
if (email_i == -2)
|
||||||
|
error(_("missing 'GIT_AUTHOR_EMAIL'"));
|
||||||
|
if (date_i == -2)
|
||||||
|
error(_("missing 'GIT_AUTHOR_DATE'"));
|
||||||
|
if (date_i < 0 || email_i < 0 || date_i < 0 || err)
|
||||||
|
goto finish;
|
||||||
|
*name = kv.items[name_i].util;
|
||||||
|
*email = kv.items[email_i].util;
|
||||||
|
*date = kv.items[date_i].util;
|
||||||
|
retval = 0;
|
||||||
|
finish:
|
||||||
|
string_list_clear(&kv, !!retval);
|
||||||
|
strbuf_release(&buf);
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* write_author_script() used to fail to terminate the last line with a "'" and
|
* write_author_script() used to fail to terminate the last line with a "'" and
|
||||||
|
|
|
@ -114,4 +114,7 @@ void commit_post_rewrite(const struct commit *current_head,
|
||||||
#define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
|
#define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
|
||||||
void print_commit_summary(const char *prefix, const struct object_id *oid,
|
void print_commit_summary(const char *prefix, const struct object_id *oid,
|
||||||
unsigned int flags);
|
unsigned int flags);
|
||||||
|
|
||||||
|
int read_author_script(const char *path, char **name, char **email, char **date,
|
||||||
|
int allow_missing);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue