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

i18n: git-push basic messages 

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 2011-02-22 23:42:11 +00:00 committed by Junio C Hamano
parent 7fbff25a53
commit 8352d29e00
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
builtin/push.c
View File

@ -40,7 +40,7 @@ static void set_refspecs(const char **refs, int nr)
char *tag; char *tag;
int len; int len;
if (nr <= ++i) if (nr <= ++i)
die("tag shorthand without <tag>"); die(_("tag shorthand without <tag>"));
len = strlen(refs[i]) + 11; len = strlen(refs[i]) + 11;
if (deleterefs) { if (deleterefs) {
tag = xmalloc(len+1); tag = xmalloc(len+1);
@ -59,7 +59,7 @@ static void set_refspecs(const char **refs, int nr)
strcat(delref, ref); strcat(delref, ref);
ref = delref; ref = delref;
} else if (deleterefs) } else if (deleterefs)
die("--delete only accepts plain target ref names"); die(_("--delete only accepts plain target ref names"));
add_refspec(ref); add_refspec(ref);
} }
} }
@ -69,13 +69,13 @@ static void setup_push_tracking(void)
struct strbuf refspec = STRBUF_INIT; struct strbuf refspec = STRBUF_INIT;
struct branch *branch = branch_get(NULL); struct branch *branch = branch_get(NULL);
if (!branch) if (!branch)
die("You are not currently on a branch."); die(_("You are not currently on a branch."));
if (!branch->merge_nr || !branch->merge) if (!branch->merge_nr || !branch->merge)
die("The current branch %s is not tracking anything.", die(_("The current branch %s is not tracking anything."),
branch->name); branch->name);
if (branch->merge_nr != 1) if (branch->merge_nr != 1)
die("The current branch %s is tracking multiple branches, " die(_("The current branch %s is tracking multiple branches, "
"refusing to push.", branch->name); "refusing to push."), branch->name);
strbuf_addf(&refspec, "%s:%s", branch->name, branch->merge[0]->src); strbuf_addf(&refspec, "%s:%s", branch->name, branch->merge[0]->src);
add_refspec(refspec.buf); add_refspec(refspec.buf);
} }
@ -97,8 +97,8 @@ static void setup_default_push_refspecs(void)
break; break;


case PUSH_DEFAULT_NOTHING: case PUSH_DEFAULT_NOTHING:
die("You didn't specify any refspecs to push, and " die(_("You didn't specify any refspecs to push, and "
"push.default is \"nothing\"."); "push.default is \"nothing\"."));
break; break;
} }
} }
@ -117,11 +117,11 @@ static int push_with_options(struct transport *transport, int flags)
transport_set_option(transport, TRANS_OPT_THIN, "yes"); transport_set_option(transport, TRANS_OPT_THIN, "yes");


if (verbosity > 0) if (verbosity > 0)
fprintf(stderr, "Pushing to %s\n", transport->url); fprintf(stderr, _("Pushing to %s\n"), transport->url);
err = transport_push(transport, refspec_nr, refspec, flags, err = transport_push(transport, refspec_nr, refspec, flags,
&nonfastforward); &nonfastforward);
if (err != 0) if (err != 0)
error("failed to push some refs to '%s'", transport->url); error(_("failed to push some refs to '%s'"), transport->url);


err |= transport_disconnect(transport); err |= transport_disconnect(transport);


@ -146,8 +146,8 @@ static int do_push(const char *repo, int flags)


if (!remote) { if (!remote) {
if (repo) if (repo)
die("bad repository '%s'", repo); die(_("bad repository '%s'"), repo);
die("No destination configured to push to."); die(_("No destination configured to push to."));
} }


if (remote->mirror) if (remote->mirror)
@ -155,19 +155,19 @@ static int do_push(const char *repo, int flags)


if ((flags & TRANSPORT_PUSH_ALL) && refspec) { if ((flags & TRANSPORT_PUSH_ALL) && refspec) {
if (!strcmp(*refspec, "refs/tags/*")) if (!strcmp(*refspec, "refs/tags/*"))
return error("--all and --tags are incompatible"); return error(_("--all and --tags are incompatible"));
return error("--all can't be combined with refspecs"); return error(_("--all can't be combined with refspecs"));
} }


if ((flags & TRANSPORT_PUSH_MIRROR) && refspec) { if ((flags & TRANSPORT_PUSH_MIRROR) && refspec) {
if (!strcmp(*refspec, "refs/tags/*")) if (!strcmp(*refspec, "refs/tags/*"))
return error("--mirror and --tags are incompatible"); return error(_("--mirror and --tags are incompatible"));
return error("--mirror can't be combined with refspecs"); return error(_("--mirror can't be combined with refspecs"));
} }


if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) == if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) ==
(TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) { (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) {
return error("--all and --mirror are incompatible"); return error(_("--all and --mirror are incompatible"));
} }


if (!refspec && !(flags & TRANSPORT_PUSH_ALL)) { if (!refspec && !(flags & TRANSPORT_PUSH_ALL)) {
@ -232,9 +232,9 @@ int cmd_push(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options, push_usage, 0); argc = parse_options(argc, argv, prefix, options, push_usage, 0);


if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR)))) if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR))))
die("--delete is incompatible with --all, --mirror and --tags"); die(_("--delete is incompatible with --all, --mirror and --tags"));
if (deleterefs && argc < 2) if (deleterefs && argc < 2)
die("--delete doesn't make sense without any refs"); die(_("--delete doesn't make sense without any refs"));


if (tags) if (tags)
add_refspec("refs/tags/*"); add_refspec("refs/tags/*");