kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

remote-curl: mark all error messages for translation 

Suggested by Jeff King.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 2019-03-05 15:20:40 -08:00 committed by Junio C Hamano
parent c1284b21f2
commit ed8b4132c8
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
remote-curl.c
View File

@ -154,7 +154,7 @@ static int set_option(const char *name, const char *value)
else { else {
struct strbuf unquoted = STRBUF_INIT; struct strbuf unquoted = STRBUF_INIT;
if (unquote_c_style(&unquoted, value, NULL) < 0) if (unquote_c_style(&unquoted, value, NULL) < 0)
die("invalid quoting in push-option value"); die(_("invalid quoting in push-option value: '%s'"), value);
string_list_append_nodup(&options.push_options, string_list_append_nodup(&options.push_options,
strbuf_detach(&unquoted, NULL)); strbuf_detach(&unquoted, NULL));
} }
@ -250,7 +250,7 @@ static struct ref *parse_info_refs(struct discovery *heads)
mid = &data[i]; mid = &data[i];
if (data[i] == '\n') { if (data[i] == '\n') {
if (mid - start != 40) if (mid - start != 40)
die("%sinfo/refs not valid: is this a git repository?", die(_("%sinfo/refs not valid: is this a git repository?"),
transport_anonymize_url(url.buf)); transport_anonymize_url(url.buf));
data[i] = 0; data[i] = 0;
ref_name = mid + 1; ref_name = mid + 1;
@ -389,15 +389,15 @@ static struct discovery *discover_refs(const char *service, int for_push)
break; break;
case HTTP_MISSING_TARGET: case HTTP_MISSING_TARGET:
show_http_message(&type, &charset, &buffer); show_http_message(&type, &charset, &buffer);
die("repository '%s' not found", die(_("repository '%s' not found"),
transport_anonymize_url(url.buf)); transport_anonymize_url(url.buf));
case HTTP_NOAUTH: case HTTP_NOAUTH:
show_http_message(&type, &charset, &buffer); show_http_message(&type, &charset, &buffer);
die("Authentication failed for '%s'", die(_("Authentication failed for '%s'"),
transport_anonymize_url(url.buf)); transport_anonymize_url(url.buf));
default: default:
show_http_message(&type, &charset, &buffer); show_http_message(&type, &charset, &buffer);
die("unable to access '%s': %s", die(_("unable to access '%s': %s"),
transport_anonymize_url(url.buf), curl_errorstr); transport_anonymize_url(url.buf), curl_errorstr);
} }


@ -424,12 +424,12 @@ static struct discovery *discover_refs(const char *service, int for_push)
*/ */
line = packet_read_line_buf(&last->buf, &last->len, NULL); line = packet_read_line_buf(&last->buf, &last->len, NULL);
if (!line) if (!line)
die("invalid server response; expected service, got flush packet"); die(_("invalid server response; expected service, got flush packet"));


strbuf_reset(&exp); strbuf_reset(&exp);
strbuf_addf(&exp, "# service=%s", service); strbuf_addf(&exp, "# service=%s", service);
if (strcmp(line, exp.buf)) if (strcmp(line, exp.buf))
die("invalid server response; got '%s'", line); die(_("invalid server response; got '%s'"), line);
strbuf_release(&exp); strbuf_release(&exp);


/* The header can include additional metadata lines, up /* The header can include additional metadata lines, up
@ -544,7 +544,7 @@ static curlioerr rpc_ioctl(CURL *handle, int cmd, void *clientp)
rpc->pos = 0; rpc->pos = 0;
return CURLIOE_OK; return CURLIOE_OK;
} }
error("unable to rewind rpc post data - try increasing http.postBuffer"); error(_("unable to rewind rpc post data - try increasing http.postBuffer"));
return CURLIOE_FAILRESTART; return CURLIOE_FAILRESTART;


default: default:
@ -588,7 +588,7 @@ static int run_slot(struct active_request_slot *slot,
strbuf_addstr(&msg, curl_errorstr); strbuf_addstr(&msg, curl_errorstr);
} }
} }
error("RPC failed; %s", msg.buf); error(_("RPC failed; %s"), msg.buf);
strbuf_release(&msg); strbuf_release(&msg);
} }


@ -626,7 +626,7 @@ static int probe_rpc(struct rpc_state *rpc, struct slot_results *results)


static curl_off_t xcurl_off_t(ssize_t len) { static curl_off_t xcurl_off_t(ssize_t len) {
if (len > maximum_signed_value_of_type(curl_off_t)) if (len > maximum_signed_value_of_type(curl_off_t))
die("cannot handle pushes this big"); die(_("cannot handle pushes this big"));
return (curl_off_t) len; return (curl_off_t) len;
} }


@ -738,11 +738,11 @@ retry:


ret = git_deflate(&stream, Z_FINISH); ret = git_deflate(&stream, Z_FINISH);
if (ret != Z_STREAM_END) if (ret != Z_STREAM_END)
die("cannot deflate request; zlib deflate error %d", ret); die(_("cannot deflate request; zlib deflate error %d"), ret);


ret = git_deflate_end_gently(&stream); ret = git_deflate_end_gently(&stream);
if (ret != Z_OK) if (ret != Z_OK)
die("cannot deflate request; zlib end error %d", ret); die(_("cannot deflate request; zlib end error %d"), ret);


gzip_size = stream.total_out; gzip_size = stream.total_out;


@ -871,7 +871,7 @@ static int fetch_dumb(int nr_heads, struct ref **to_fetch)


ALLOC_ARRAY(targets, nr_heads); ALLOC_ARRAY(targets, nr_heads);
if (options.depth || options.deepen_since) if (options.depth || options.deepen_since)
die("dumb http transport does not support shallow capabilities"); die(_("dumb http transport does not support shallow capabilities"));
for (i = 0; i < nr_heads; i++) for (i = 0; i < nr_heads; i++)
targets[i] = xstrdup(oid_to_hex(&to_fetch[i]->old_oid)); targets[i] = xstrdup(oid_to_hex(&to_fetch[i]->old_oid));


@ -885,7 +885,7 @@ static int fetch_dumb(int nr_heads, struct ref **to_fetch)
free(targets[i]); free(targets[i]);
free(targets); free(targets);


return ret ? error("fetch failed.") : 0; return ret ? error(_("fetch failed.")) : 0;
} }


static int fetch_git(struct discovery *heads, static int fetch_git(struct discovery *heads,
@ -932,7 +932,7 @@ static int fetch_git(struct discovery *heads,
for (i = 0; i < nr_heads; i++) { for (i = 0; i < nr_heads; i++) {
struct ref *ref = to_fetch[i]; struct ref *ref = to_fetch[i];
if (!*ref->name) if (!*ref->name)
die("cannot fetch by sha1 over smart http"); die(_("cannot fetch by sha1 over smart http"));
packet_buf_write(&preamble, "%s %s\n", packet_buf_write(&preamble, "%s %s\n",
oid_to_hex(&ref->old_oid), ref->name); oid_to_hex(&ref->old_oid), ref->name);
} }
@ -977,13 +977,13 @@ static void parse_fetch(struct strbuf *buf)
struct object_id old_oid; struct object_id old_oid;


if (get_oid_hex(p, &old_oid)) if (get_oid_hex(p, &old_oid))
die("protocol error: expected sha/ref, got %s'", p); die(_("protocol error: expected sha/ref, got %s'"), p);
if (p[GIT_SHA1_HEXSZ] == ' ') if (p[GIT_SHA1_HEXSZ] == ' ')
name = p + GIT_SHA1_HEXSZ + 1; name = p + GIT_SHA1_HEXSZ + 1;
else if (!p[GIT_SHA1_HEXSZ]) else if (!p[GIT_SHA1_HEXSZ])
name = ""; name = "";
else else
die("protocol error: expected sha/ref, got %s'", p); die(_("protocol error: expected sha/ref, got %s'"), p);


ref = alloc_ref(name); ref = alloc_ref(name);
oidcpy(&ref->old_oid, &old_oid); oidcpy(&ref->old_oid, &old_oid);
@ -995,7 +995,7 @@ static void parse_fetch(struct strbuf *buf)
to_fetch[nr_heads++] = ref; to_fetch[nr_heads++] = ref;
} }
else else
die("http transport does not support %s", buf->buf); die(_("http transport does not support %s"), buf->buf);


strbuf_reset(buf); strbuf_reset(buf);
if (strbuf_getline_lf(buf, stdin) == EOF) if (strbuf_getline_lf(buf, stdin) == EOF)
@ -1031,7 +1031,7 @@ static int push_dav(int nr_spec, char **specs)
argv_array_push(&child.args, specs[i]); argv_array_push(&child.args, specs[i]);


if (run_command(&child)) if (run_command(&child))
die("git-http-push failed"); die(_("git-http-push failed"));
return 0; return 0;
} }


@ -1110,7 +1110,7 @@ static void parse_push(struct strbuf *buf)
specs[nr_spec++] = xstrdup(buf->buf + 5); specs[nr_spec++] = xstrdup(buf->buf + 5);
} }
else else
die("http transport does not support %s", buf->buf); die(_("http transport does not support %s"), buf->buf);


strbuf_reset(buf); strbuf_reset(buf);
if (strbuf_getline_lf(buf, stdin) == EOF) if (strbuf_getline_lf(buf, stdin) == EOF)
@ -1220,7 +1220,7 @@ static size_t proxy_in(char *buffer, size_t eltsize,
strbuf_reset(&p->request_buffer); strbuf_reset(&p->request_buffer);
switch (packet_reader_read(&p->reader)) { switch (packet_reader_read(&p->reader)) {
case PACKET_READ_EOF: case PACKET_READ_EOF:
die("unexpected EOF when reading from parent process"); die(_("unexpected EOF when reading from parent process"));
case PACKET_READ_NORMAL: case PACKET_READ_NORMAL:
packet_buf_write_len(&p->request_buffer, p->reader.line, packet_buf_write_len(&p->request_buffer, p->reader.line,
p->reader.pktlen); p->reader.pktlen);
@ -1336,7 +1336,7 @@ int cmd_main(int argc, const char **argv)


setup_git_directory_gently(&nongit); setup_git_directory_gently(&nongit);
if (argc < 2) { if (argc < 2) {
error("remote-curl: usage: git remote-curl <remote> [<url>]"); error(_("remote-curl: usage: git remote-curl <remote> [<url>]"));
return 1; return 1;
} }


@ -1361,14 +1361,14 @@ int cmd_main(int argc, const char **argv)


if (strbuf_getline_lf(&buf, stdin) == EOF) { if (strbuf_getline_lf(&buf, stdin) == EOF) {
if (ferror(stdin)) if (ferror(stdin))
error("remote-curl: error reading command stream from git"); error(_("remote-curl: error reading command stream from git"));
return 1; return 1;
} }
if (buf.len == 0) if (buf.len == 0)
break; break;
if (starts_with(buf.buf, "fetch ")) { if (starts_with(buf.buf, "fetch ")) {
if (nongit) if (nongit)
die("remote-curl: fetch attempted without a local repo"); die(_("remote-curl: fetch attempted without a local repo"));
parse_fetch(&buf); parse_fetch(&buf);


} else if (!strcmp(buf.buf, "list") || starts_with(buf.buf, "list ")) { } else if (!strcmp(buf.buf, "list") || starts_with(buf.buf, "list ")) {
@ -1408,7 +1408,7 @@ int cmd_main(int argc, const char **argv)
if (!stateless_connect(arg)) if (!stateless_connect(arg))
break; break;
} else { } else {
error("remote-curl: unknown command '%s' from git", buf.buf); error(_("remote-curl: unknown command '%s' from git"), buf.buf);
return 1; return 1;
} }
strbuf_reset(&buf); strbuf_reset(&buf);