rerere: wrap paths in output in sq

It looks like most paths in the output in the git codebase are wrapped
in single quotes.  Standardize on that in rerere as well.

Apart from being more consistent, this also makes some of the strings
match strings that are already translated in other parts of the
codebase, thus reducing the work for translators, when the strings are
marked for translation in a subsequent commit.

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 0bc40298c2417a6d1f25aafb4b3577243e985c57..e0c67c98e9ac87e88629d814bb67192fa6bf573a 100644 (file)
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -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 c5d9ea171f20276c99d9dd56718b45968e69b14a..cde1f6e69692083446651b23602df17be796d04d 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -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;


@@ -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);


@@ -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;
 }
 


@@ -1067,9 +1067,9 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
        filename = rerere_path(id, "postimage");
        if (unlink(filename)) {
                if (errno == ENOENT)
        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;
        }
 


@@ -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: