From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 911311F915 for ; Sat, 14 Jul 2018 21:44:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731493AbeGNWFV (ORCPT ); Sat, 14 Jul 2018 18:05:21 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:36696 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731432AbeGNWFV (ORCPT ); Sat, 14 Jul 2018 18:05:21 -0400 Received: by mail-wr1-f67.google.com with SMTP id h9-v6so28288819wro.3 for ; Sat, 14 Jul 2018 14:44:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RbY0mnX06eOxfAMsq5Zvj4QxsCtIWpLiQWo5iFAPxjE=; b=RgdFR82cXzNq+66Vh8IZDppx0Gra3WFx9vkGRG+qgUrbRZ2xW1Dc7all1oBm5d/zru ennuCTUTBvQvjdhxypCueuYieGfwIvzYQ1KtWkdU9709GfTKXQAmTRKX5umVevO9Rln6 16axXIG2oS9rjdEhLexrvVxGwjgAkEKhvPm/dSS/i2vtMOMD0yhUsili7Z8D8PMtV399 tRn5sge6IPX3OMqpcn4DLJ3wIgpZgGq8HWGgwLaLgEBSk+rwXcVgWBMj/tiXsvje+iD/ DCqY6ery/dpgEMymQQ0/bnzTeML5BX/MICSwTFTmPptonEzCzFtqiaGnOslwxFLlTKu7 53sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RbY0mnX06eOxfAMsq5Zvj4QxsCtIWpLiQWo5iFAPxjE=; b=OEaY/Wmzz+zJGOK99gotL7oyOPIprmB/gKNIKpZ7Mcq1t70ZbXHC1OUIeH7U1XywBA Iu3uPMa5DgQTvDXcFgEZGIlYQUVcOHvhb3eooTzx+gKe0bSln74Zv4l5gFvlDVoVofkE oMtTVjX6HHwQbXJA4vfedQjJ5T85j8DHyFhWxNen/g/7coFgtlwgPLWQQIHXJy8yeE61 2Ji1HChpnZO7BNxQRDgoMR5vWaA3A2iZfxCM96b/jXOXJymz9IK11TVQn9Dt4//LT0vD AsXDblLDfUdQm+AO86to5KGS9hvgt6SnPKK3UyhClkDiP4cyFupgRQ2Qzhftfdcn45/b AOSg== X-Gm-Message-State: AOUpUlFoxYAJWkXdVhFelrtiwUblcFpWE5WlsEhEohXHYzFnBBVGxSnU bp55J/+Y8ZmxRDqrTH4XjhzPNpvw X-Google-Smtp-Source: AAOMgpco18ckcKayz0v/gNmjcKQ42qtZqws+36dOZ73UNUrs+hS8EE6MHUf8hH9r/dWENbn7UFXizw== X-Received: by 2002:adf:b786:: with SMTP id s6-v6mr8068107wre.247.1531604693404; Sat, 14 Jul 2018 14:44:53 -0700 (PDT) Received: from localhost ([2.30.88.37]) by smtp.gmail.com with ESMTPSA id w9-v6sm273747wrk.28.2018.07.14.14.44.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 14 Jul 2018 14:44:52 -0700 (PDT) From: Thomas Gummerer To: git@vger.kernel.org Cc: Junio C Hamano , Thomas Gummerer Subject: [PATCH v3 03/11] rerere: wrap paths in output in sq Date: Sat, 14 Jul 2018 22:44:35 +0100 Message-Id: <20180714214443.7184-4-t.gummerer@gmail.com> X-Mailer: git-send-email 2.17.0.410.g65aef3a6c4 In-Reply-To: <20180714214443.7184-1-t.gummerer@gmail.com> References: <20180605215219.28783-1-t.gummerer@gmail.com> <20180714214443.7184-1-t.gummerer@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 --- builtin/rerere.c | 2 +- rerere.c | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/builtin/rerere.c b/builtin/rerere.c index 0bc40298c2..e0c67c98e9 100644 --- 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)) - 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); diff --git a/rerere.c b/rerere.c index c5d9ea171f..cde1f6e696 100644 --- 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) - 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) { - error_errno("could not write %s", output); + error_errno("could not write '%s'", output); 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) - 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)) - 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); - 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; @@ -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) - 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) - 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) - error_errno("could not write %s", path); + error_errno("could not write '%s'", path); if (fclose(f)) - return error_errno("writing %s failed", path); + return error_errno("writing '%s' failed", path); 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())) - die("could not create directory %s", git_path_rr_cache()); + die("could not create directory '%s'", git_path_rr_cache()); 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) - error("no remembered resolution for %s", path); + error("no remembered resolution for '%s'", path); else - error_errno("cannot unlink %s", filename); + error_errno("cannot unlink '%s'", filename); 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; - fprintf(stderr, "Forgot resolution for %s\n", path); + fprintf(stderr, "Forgot resolution for '%s'\n", path); return 0; fail_exit: -- 2.17.0.410.g65aef3a6c4