rerere: mark strings for translation

'git rerere' is considered a porcelain command and as such its output
should be translated.  Its functionality is also only enabled through
a config setting, so scripts really shouldn't rely on the output
either way.

Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rerere.c b/builtin/rerere.c
index e0c67c98e9ac87e88629d814bb67192fa6bf573a..5ed941b91f2c1498a3f28f0c6415437f79133432 100644 (file)
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -75,7 +75,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
        if (!strcmp(argv[0], "forget")) {
                struct pathspec pathspec;
                if (argc < 2)
        if (!strcmp(argv[0], "forget")) {
                struct pathspec pathspec;
                if (argc < 2)

-                       warning("'git rerere forget' without paths is deprecated");
+                       warning(_("'git rerere forget' without paths is deprecated"));

                parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD,
                               prefix, argv + 1);
                return rerere_forget(&pathspec);
                parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD,
                               prefix, argv + 1);
                return rerere_forget(&pathspec);


@@ -107,7 +107,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
                        const char *path = merge_rr.items[i].string;
                        const struct rerere_id *id = merge_rr.items[i].util;
                        if (diff_two(rerere_path(id, "preimage"), path, path, path))
                        const char *path = merge_rr.items[i].string;
                        const struct rerere_id *id = merge_rr.items[i].util;
                        if (diff_two(rerere_path(id, "preimage"), path, path, path))

-                               die("unable to generate diff for '%s'", rerere_path(id, NULL));
+                               die(_("unable to generate diff for '%s'"), rerere_path(id, NULL));

                }
        } else
                usage_with_options(rerere_usage, options);
                }
        } else
                usage_with_options(rerere_usage, options);

diff --git a/rerere.c b/rerere.c
index cde1f6e69692083446651b23602df17be796d04d..be98c0afcb9fa48ae9d637046c50774889af385f 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -212,7 +212,7 @@ static void read_rr(struct string_list *rr)
 
                /* There has to be the hash, tab, path and then NUL */
                if (buf.len < 42 || get_sha1_hex(buf.buf, sha1))
 
                /* There has to be the hash, tab, path and then NUL */
                if (buf.len < 42 || get_sha1_hex(buf.buf, sha1))

-                       die("corrupt MERGE_RR");
+                       die(_("corrupt MERGE_RR"));

 
                if (buf.buf[40] != '.') {
                        variant = 0;
 
                if (buf.buf[40] != '.') {
                        variant = 0;


@@ -221,10 +221,10 @@ static void read_rr(struct string_list *rr)
                        errno = 0;
                        variant = strtol(buf.buf + 41, &path, 10);
                        if (errno)
                        errno = 0;
                        variant = strtol(buf.buf + 41, &path, 10);
                        if (errno)

-                               die("corrupt MERGE_RR");
+                               die(_("corrupt MERGE_RR"));

                }
                if (*(path++) != '\t')
                }
                if (*(path++) != '\t')

-                       die("corrupt MERGE_RR");
+                       die(_("corrupt MERGE_RR"));

                buf.buf[40] = '\0';
                id = new_rerere_id_hex(buf.buf);
                id->variant = variant;
                buf.buf[40] = '\0';
                id = new_rerere_id_hex(buf.buf);
                id->variant = variant;


@@ -259,12 +259,12 @@ static int write_rr(struct string_list *rr, int out_fd)
                                    rr->items[i].string, 0);
 
                if (write_in_full(out_fd, buf.buf, buf.len) < 0)
                                    rr->items[i].string, 0);
 
                if (write_in_full(out_fd, buf.buf, buf.len) < 0)

-                       die("unable to write rerere record");
+                       die(_("unable to write rerere record"));

 
                strbuf_release(&buf);
        }
        if (commit_lock_file(&write_lock) != 0)
 
                strbuf_release(&buf);
        }
        if (commit_lock_file(&write_lock) != 0)

-               die("unable to write rerere record");
+               die(_("unable to write rerere record"));

        return 0;
 }
 
        return 0;
 }
 


@@ -484,12 +484,12 @@ static int handle_file(const char *path, unsigned char *sha1, const char *output
        io.input = fopen(path, "r");
        io.io.wrerror = 0;
        if (!io.input)
        io.input = fopen(path, "r");
        io.io.wrerror = 0;
        if (!io.input)

-               return error_errno("could not open '%s'", path);
+               return error_errno(_("could not open '%s'"), path);

 
        if (output) {
                io.io.output = fopen(output, "w");
                if (!io.io.output) {
 
        if (output) {
                io.io.output = fopen(output, "w");
                if (!io.io.output) {

-                       error_errno("could not write '%s'", output);
+                       error_errno(_("could not write '%s'"), output);

                        fclose(io.input);
                        return -1;
                }
                        fclose(io.input);
                        return -1;
                }


@@ -499,15 +499,15 @@ static int handle_file(const char *path, unsigned char *sha1, const char *output
 
        fclose(io.input);
        if (io.io.wrerror)
 
        fclose(io.input);
        if (io.io.wrerror)

-               error("there were errors while writing '%s' (%s)",
+               error(_("there were errors while writing '%s' (%s)"),

                      path, strerror(io.io.wrerror));
        if (io.io.output && fclose(io.io.output))
                      path, strerror(io.io.wrerror));
        if (io.io.output && fclose(io.io.output))

-               io.io.wrerror = error_errno("failed to flush '%s'", path);
+               io.io.wrerror = error_errno(_("failed to flush '%s'"), path);

 
        if (hunk_no < 0) {
                if (output)
                        unlink_or_warn(output);
 
        if (hunk_no < 0) {
                if (output)
                        unlink_or_warn(output);

-               return error("could not parse conflict hunks in '%s'", path);
+               return error(_("could not parse conflict hunks in '%s'"), path);

        }
        if (io.io.wrerror)
                return -1;
        }
        if (io.io.wrerror)
                return -1;


@@ -568,7 +568,7 @@ static int find_conflict(struct string_list *conflict)
 {
        int i;
        if (read_cache() < 0)
 {
        int i;
        if (read_cache() < 0)

-               return error("index file corrupt");
+               return error(_("index file corrupt"));

 
        for (i = 0; i < active_nr;) {
                int conflict_type;
 
        for (i = 0; i < active_nr;) {
                int conflict_type;


@@ -601,7 +601,7 @@ int rerere_remaining(struct string_list *merge_rr)
        if (setup_rerere(merge_rr, RERERE_READONLY))
                return 0;
        if (read_cache() < 0)
        if (setup_rerere(merge_rr, RERERE_READONLY))
                return 0;
        if (read_cache() < 0)

-               return error("index file corrupt");
+               return error(_("index file corrupt"));

 
        for (i = 0; i < active_nr;) {
                int conflict_type;
 
        for (i = 0; i < active_nr;) {
                int conflict_type;


@@ -684,17 +684,17 @@ static int merge(const struct rerere_id *id, const char *path)
         * Mark that "postimage" was used to help gc.
         */
        if (utime(rerere_path(id, "postimage"), NULL) < 0)
         * Mark that "postimage" was used to help gc.
         */
        if (utime(rerere_path(id, "postimage"), NULL) < 0)

-               warning_errno("failed utime() on '%s'",
+               warning_errno(_("failed utime() on '%s'"),

                              rerere_path(id, "postimage"));
 
        /* Update "path" with the resolution */
        f = fopen(path, "w");
        if (!f)
                              rerere_path(id, "postimage"));
 
        /* Update "path" with the resolution */
        f = fopen(path, "w");
        if (!f)

-               return error_errno("could not open '%s'", path);
+               return error_errno(_("could not open '%s'"), path);

        if (fwrite(result.ptr, result.size, 1, f) != 1)
        if (fwrite(result.ptr, result.size, 1, f) != 1)

-               error_errno("could not write '%s'", path);
+               error_errno(_("could not write '%s'"), path);

        if (fclose(f))
        if (fclose(f))

-               return error_errno("writing '%s' failed", path);
+               return error_errno(_("writing '%s' failed"), path);

 
 out:
        free(cur.ptr);
 
 out:
        free(cur.ptr);


@@ -714,13 +714,13 @@ static void update_paths(struct string_list *update)
                struct string_list_item *item = &update->items[i];
                if (add_file_to_cache(item->string, 0))
                        exit(128);
                struct string_list_item *item = &update->items[i];
                if (add_file_to_cache(item->string, 0))
                        exit(128);

-               fprintf(stderr, "Staged '%s' using previous resolution.\n",
+               fprintf_ln(stderr, _("Staged '%s' using previous resolution."),

                        item->string);
        }
 
        if (write_locked_index(&the_index, &index_lock,
                               COMMIT_LOCK | SKIP_IF_UNCHANGED))
                        item->string);
        }
 
        if (write_locked_index(&the_index, &index_lock,
                               COMMIT_LOCK | SKIP_IF_UNCHANGED))

-               die("unable to write new index file");
+               die(_("unable to write new index file"));

 }
 
 static void remove_variant(struct rerere_id *id)
 }
 
 static void remove_variant(struct rerere_id *id)


@@ -752,7 +752,7 @@ static void do_rerere_one_path(struct string_list_item *rr_item,
                if (!handle_file(path, NULL, NULL)) {
                        copy_file(rerere_path(id, "postimage"), path, 0666);
                        id->collection->status[variant] |= RR_HAS_POSTIMAGE;
                if (!handle_file(path, NULL, NULL)) {
                        copy_file(rerere_path(id, "postimage"), path, 0666);
                        id->collection->status[variant] |= RR_HAS_POSTIMAGE;

-                       fprintf(stderr, "Recorded resolution for '%s'.\n", path);
+                       fprintf_ln(stderr, _("Recorded resolution for '%s'."), path);

                        free_rerere_id(rr_item);
                        rr_item->util = NULL;
                        return;
                        free_rerere_id(rr_item);
                        rr_item->util = NULL;
                        return;


@@ -786,9 +786,9 @@ static void do_rerere_one_path(struct string_list_item *rr_item,
                if (rerere_autoupdate)
                        string_list_insert(update, path);
                else
                if (rerere_autoupdate)
                        string_list_insert(update, path);
                else

-                       fprintf(stderr,
-                               "Resolved '%s' using previous resolution.\n",
-                               path);
+                       fprintf_ln(stderr,
+                                  _("Resolved '%s' using previous resolution."),
+                                  path);

                free_rerere_id(rr_item);
                rr_item->util = NULL;
                return;
                free_rerere_id(rr_item);
                rr_item->util = NULL;
                return;


@@ -802,11 +802,11 @@ static void do_rerere_one_path(struct string_list_item *rr_item,
        if (id->collection->status[variant] & RR_HAS_POSTIMAGE) {
                const char *path = rerere_path(id, "postimage");
                if (unlink(path))
        if (id->collection->status[variant] & RR_HAS_POSTIMAGE) {
                const char *path = rerere_path(id, "postimage");
                if (unlink(path))

-                       die_errno("cannot unlink stray '%s'", path);
+                       die_errno(_("cannot unlink stray '%s'"), path);

                id->collection->status[variant] &= ~RR_HAS_POSTIMAGE;
        }
        id->collection->status[variant] |= RR_HAS_PREIMAGE;
                id->collection->status[variant] &= ~RR_HAS_POSTIMAGE;
        }
        id->collection->status[variant] |= RR_HAS_PREIMAGE;

-       fprintf(stderr, "Recorded preimage for '%s'\n", path);
+       fprintf_ln(stderr, _("Recorded preimage for '%s'"), path);

 }
 
 static int do_plain_rerere(struct string_list *rr, int fd)
 }
 
 static int do_plain_rerere(struct string_list *rr, int fd)


@@ -878,7 +878,7 @@ static int is_rerere_enabled(void)
                return rr_cache_exists;
 
        if (!rr_cache_exists && mkdir_in_gitdir(git_path_rr_cache()))
                return rr_cache_exists;
 
        if (!rr_cache_exists && mkdir_in_gitdir(git_path_rr_cache()))

-               die("could not create directory '%s'", git_path_rr_cache());
+               die(_("could not create directory '%s'"), git_path_rr_cache());

        return 1;
 }
 
        return 1;
 }
 


@@ -1031,7 +1031,7 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
         */
        ret = handle_cache(path, sha1, NULL);
        if (ret < 1)
         */
        ret = handle_cache(path, sha1, NULL);
        if (ret < 1)

-               return error("could not parse conflict hunks in '%s'", path);
+               return error(_("could not parse conflict hunks in '%s'"), path);

 
        /* Nuke the recorded resolution for the conflict */
        id = new_rerere_id(sha1);
 
        /* Nuke the recorded resolution for the conflict */
        id = new_rerere_id(sha1);


@@ -1049,7 +1049,7 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
                handle_cache(path, sha1, rerere_path(id, "thisimage"));
                if (read_mmfile(&cur, rerere_path(id, "thisimage"))) {
                        free(cur.ptr);
                handle_cache(path, sha1, rerere_path(id, "thisimage"));
                if (read_mmfile(&cur, rerere_path(id, "thisimage"))) {
                        free(cur.ptr);

-                       error("failed to update conflicted state in '%s'", path);
+                       error(_("failed to update conflicted state in '%s'"), path);

                        goto fail_exit;
                }
                cleanly_resolved = !try_merge(id, path, &cur, &result);
                        goto fail_exit;
                }
                cleanly_resolved = !try_merge(id, path, &cur, &result);


@@ -1060,16 +1060,16 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
        }
 
        if (id->collection->status_nr <= id->variant) {
        }
 
        if (id->collection->status_nr <= id->variant) {

-               error("no remembered resolution for '%s'", path);
+               error(_("no remembered resolution for '%s'"), path);

                goto fail_exit;
        }
 
        filename = rerere_path(id, "postimage");
        if (unlink(filename)) {
                if (errno == ENOENT)
                goto fail_exit;
        }
 
        filename = rerere_path(id, "postimage");
        if (unlink(filename)) {
                if (errno == ENOENT)

-                       error("no remembered resolution for '%s'", path);
+                       error(_("no remembered resolution for '%s'"), path);

                else
                else

-                       error_errno("cannot unlink '%s'", filename);
+                       error_errno(_("cannot unlink '%s'"), filename);

                goto fail_exit;
        }
 
                goto fail_exit;
        }
 


@@ -1079,7 +1079,7 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
         * the postimage.
         */
        handle_cache(path, sha1, rerere_path(id, "preimage"));
         * the postimage.
         */
        handle_cache(path, sha1, rerere_path(id, "preimage"));

-       fprintf(stderr, "Updated preimage for '%s'\n", path);
+       fprintf_ln(stderr, _("Updated preimage for '%s'"), path);

 
        /*
         * And remember that we can record resolution for this
 
        /*
         * And remember that we can record resolution for this


@@ -1088,7 +1088,7 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
        item = string_list_insert(rr, path);
        free_rerere_id(item);
        item->util = id;
        item = string_list_insert(rr, path);
        free_rerere_id(item);
        item->util = id;

-       fprintf(stderr, "Forgot resolution for '%s'\n", path);
+       fprintf(stderr, _("Forgot resolution for '%s'\n"), path);

        return 0;
 
 fail_exit:
        return 0;
 
 fail_exit:


@@ -1103,7 +1103,7 @@ int rerere_forget(struct pathspec *pathspec)
        struct string_list merge_rr = STRING_LIST_INIT_DUP;
 
        if (read_cache() < 0)
        struct string_list merge_rr = STRING_LIST_INIT_DUP;
 
        if (read_cache() < 0)

-               return error("index file corrupt");
+               return error(_("index file corrupt"));

 
        fd = setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE);
        if (fd < 0)
 
        fd = setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE);
        if (fd < 0)


@@ -1191,7 +1191,7 @@ void rerere_gc(struct string_list *rr)
        git_config(git_default_config, NULL);
        dir = opendir(git_path("rr-cache"));
        if (!dir)
        git_config(git_default_config, NULL);
        dir = opendir(git_path("rr-cache"));
        if (!dir)

-               die_errno("unable to open rr-cache directory");
+               die_errno(_("unable to open rr-cache directory"));

        /* Collect stale conflict IDs ... */
        while ((e = readdir(dir))) {
                struct rerere_dir *rr_dir;
        /* Collect stale conflict IDs ... */
        while ((e = readdir(dir))) {
                struct rerere_dir *rr_dir;