Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

nuke some old series

  • Loading branch information...
commit 7a6ff8da27406511c3a8a44e649e0e7a15dff9db 1 parent 31304cc
@avar authored
Showing with 9 additions and 3,449 deletions.
  1. +9 −2 767c1eb/0000-cover-letter.patch
  2. +0 −681 ab/i18n-sh-only/0001-git-sh-i18n-envsubst-our-own-envsubst-1-for-eval_get.patch
  3. +0 −136 ab/i18n-sh-only/0002-git-sh-i18n.sh-add-no-op-gettext-and-eval_gettext-wr.patch
  4. +0 −31 ab/i18n-sh-only/0003-i18n-git-am-add-git-sh-i18n.patch
  5. +0 −50 ab/i18n-sh-only/0004-i18n-git-am-one-line-gettext-msg-echo.patch
  6. +0 −46 ab/i18n-sh-only/0005-i18n-git-am-multi-line-getttext-msg-echo.patch
  7. +0 −50 ab/i18n-sh-only/0006-i18n-git-am-eval_gettext-messages.patch
  8. +0 −27 ab/i18n-sh-only/0007-i18n-git-am-echo-gettext-message.patch
  9. +0 −88 ab/i18n-sh-only/0008-i18n-git-am-die-messages.patch
  10. +0 −43 ab/i18n-sh-only/0009-i18n-git-am-cannot_fallback-messages.patch
  11. +0 −45 ab/i18n-sh-only/0010-i18n-git-am-clean_abort-messages.patch
  12. +0 −38 ab/i18n-sh-only/0011-i18n-git-am-Apply-message.patch
  13. +0 −84 ab/i18n-sh-only/0012-i18n-git-am-core-say-messages.patch
  14. +0 −33 ab/i18n-sh-only/0013-i18n-git-am-printf-1-message-to-eval_gettext.patch
  15. +0 −28 ab/i18n-sh-only/0014-i18n-git-pull-add-git-sh-i18n.patch
  16. +0 −73 ab/i18n-sh-only/0015-i18n-git-pull-die-messages.patch
  17. +0 −36 ab/i18n-sh-only/0016-i18n-git-pull-eval_gettext-die-message.patch
  18. +0 −33 ab/i18n-sh-only/0017-i18n-git-pull-eval_gettext-warning-message.patch
  19. +0 −40 ab/i18n-sh-only/0018-i18n-git-pull-split-up-no-candidate-message.patch
  20. +0 −43 ab/i18n-sh-only/0019-i18n-git-pull-You-asked-to-pull-message.patch
  21. +0 −37 ab/i18n-sh-only/0020-i18n-git-pull-.-not-currently-on-a-branch-message.patch
  22. +0 −125 ab/i18n-sh-only/0021-i18n-git-pull-rebase-against-merge-with-messages.patch
  23. +0 −28 ab/i18n-sh-only/0022-i18n-git-submodule-add-git-sh-i18n.patch
  24. +0 −38 ab/i18n-sh-only/0023-i18n-git-submodule-echo-eval_gettext-messages.patch
  25. +0 −29 ab/i18n-sh-only/0024-i18n-git-submodule-say-eval_gettext-messages.patch
  26. +0 −175 ab/i18n-sh-only/0025-i18n-git-submodule-die-eval_gettext-messages.patch
  27. +0 −56 ab/i18n-sh-only/0026-i18n-git-submodule-update_module-say-die-messages.patch
  28. +0 −34 ab/i18n-sh-only/0027-i18n-git-submodule-cached-cannot-be-used-message.patch
  29. +0 −50 ab/i18n-sh-only/0028-i18n-git-submodule-Submodule-change-.-messages.patch
  30. +0 −55 ab/i18n-sh-only/0029-i18n-git-submodule-errmsg-messages.patch
  31. +0 −55 ab/i18n-sh-only/0030-i18n-git-submodule-Entering-.-message.patch
  32. +0 −51 ab/i18n-sh-only/0031-i18n-git-submodule-.-path-is-ignored-message.patch
  33. +0 −49 ab/i18n-sh-only/0032-i18n-git-submodule-path-not-initialized-message.patch
  34. +0 −82 ab/i18n-sh-only/0033-i18n-git-submodule-blob-and-submodule-messages.patch
  35. +0 −28 ab/i18n-sh-only/0034-i18n-git-stash-add-git-sh-i18n.patch
  36. +0 −29 ab/i18n-sh-only/0035-i18n-git-stash-echo-gettext-message.patch
  37. +0 −38 ab/i18n-sh-only/0036-i18n-git-stash-say-gettext-messages.patch
  38. +0 −163 ab/i18n-sh-only/0037-i18n-git-stash-die-gettext-messages.patch
  39. +0 −38 ab/i18n-sh-only/0038-i18n-git-stash-die-eval_gettext-messages.patch
  40. +0 −47 ab/i18n-sh-only/0039-i18n-git-stash-die-eval_gettext-messages.patch
  41. +0 −35 ab/i18n-sh-only/0040-i18n-git-stash-die-eval_gettext-1-messages.patch
  42. +0 −48 ab/i18n-sh-only/0041-i18n-git-stash-unknown-option-message.patch
  43. +0 −34 ab/i18n-sh-only/0042-i18n-git-stash-drop_stash-say-die-messages.patch
  44. +0 −28 ab/i18n-sh-only/0043-i18n-git-bisect-add-git-sh-i18n.patch
  45. +0 −38 ab/i18n-sh-only/0044-i18n-git-bisect-gettext-echo-message.patch
  46. +0 −47 ab/i18n-sh-only/0045-i18n-git-bisect-echo-gettext-messages.patch
  47. +0 −31 ab/i18n-sh-only/0046-i18n-git-bisect-echo-eval_gettext-message.patch
  48. +0 −83 ab/i18n-sh-only/0047-i18n-git-bisect-die-gettext-messages.patch
  49. +0 −67 ab/i18n-sh-only/0048-i18n-git-bisect-die-eval_gettext-messages.patch
  50. +0 −42 ab/i18n-sh-only/0049-i18n-git-bisect-bisect_run-messages.patch
  51. +0 −36 ab/i18n-sh-only/0050-i18n-git-bisect-bisect_reset-1-messages.patch
  52. +0 −47 ab/i18n-sh-only/0051-i18n-git-bisect-bisect_replay-1-messages.patch
  53. +0 −49 ab/i18n-sh-only/0052-i18n-git-bisect-Y-n-messages.patch
  54. +0 −50 ab/i18n-sh-only/0053-i18n-git-bisect-bisect_next_check-You-need-to-messag.patch
View
11 767c1eb/0000-cover-letter.patch
@@ -1,12 +1,19 @@
From 767c1ebf6d23bbe3096e5038fe9f588cf4a47841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
Date: Sun, 8 May 2011 12:02:30 +0000
-Subject: [PATCH 0/4] *** SUBJECT HERE ***
+Subject: [PATCH 0/4] i18n: Add shell script translation infrastructure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
-*** BLURB HERE ***
+As threatened this is the updated shell script translation
+infrastructure that I'm submitting now that 1.7.5 has been out for a
+bit.
+
+This adds skeleton no-op functions to git-sh-i18n.sh analogous to the
+gettext.c skeleton functions for C, adds *.sh scripts to the "pot"
+target for message extraction, and updates the git-sh-i18n--envsubst
+tests to use the new test_i18ncmp function.
Ævar Arnfjörð Bjarmason (4):
git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()
View
681 ab/i18n-sh-only/0001-git-sh-i18n-envsubst-our-own-envsubst-1-for-eval_get.patch
@@ -1,681 +0,0 @@
-From 5754cef241e73b2cd35cbdd6a1b4b6bfc207b3c6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Sat, 30 Oct 2010 08:59:51 +0000
-Subject: [PATCH 01/53] git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add a git-sh-i18n--envsubst program which is a stripped-down version
-of the GNU envsubst(1) program that comes with GNU gettext for use in
-the eval_gettext() fallback, instead of using a clever (but broken)
-printf + eval + printf trick.
-
-In a previous incarnation of the gettext series I implemented the
-eval_gettext() fallback like this:
-
- eval_gettext() {
- gettext_out=$(gettext "$1")
- gettext_eval="printf '%s' \"$gettext_out\""
- printf "%s" "`eval \"$gettext_eval\"`"
- }
-
-This was clever, but would incorrectly handle cases where the variable
-being interpolated contained spaces. E.g.:
-
- cmd="git foo"; eval_gettext "command: \$cmd"
-
-Would emit "command: gitfoo", instead of the correct "command: git
-foo". This happened with a message in git-am.sh that used the $cmdline
-variable. An alternate version suggested by Junio is able to handle
-this case:
-
- eval_gettext() {
- gettext_out=$(gettext "$1") &&
- gettext_eval="printf '%s' \"$gettext_out\"" &&
- gettext_cmd=$(eval "$gettext_eval") &&
- printf "%s" "$gettext_cmd"
- }
-
-But it strips out double-quotes when they're included in the message
-being passed to eval_gettext. E.g. the message in git-am.sh:
-
- "When you have resolved this problem run \"$cmdline --resolved\"."
-
-Will be emitted as:
-
- When you have resolved this problem run git am --resolved.
-
-Instead of the correct:
-
- When you have resolved this problem run "git am --resolved".
-
-To work around this, and to improve our variable expansion behavior
-(eval has security issues) I've imported a stripped-down version of
-gettext's envsubst(1) program. With it eval_gettext() is implemented
-like this:
-
- eval_gettext() {
- printf "%s" "$1" | (
- export PATH $(git sh-i18n--envsubst --variables "$1");
- git sh-i18n--envsubst "$1"
- )
- }
-
-These are the modifications I made to envsubst.c as I turned it into
-sh-i18n--envsubst.c:
-
- * Added our git-compat-util.h header for xrealloc() and friends.
-
- * Removed inclusion of gettext-specific headers.
-
- * Removed most of main() and replaced it with my own. The modified
- version only does option parsing for --variables. That's all it
- needs.
-
- * Modified error() invocations to use our error() instead of
- error(3).
-
- * Replaced the gettext XNMALLOC(n, size) macro with just
- xmalloc(n). Since XNMALLOC() only allocated char's.
-
- * Removed the string_list_destroy function. It's redundant (also in
- the upstream code).
-
- * Replaced the use of stdbool.h (a C99 header) by doing the following
- replacements on the code:
-
- * s/bool/unsigned short int/g
- * s/true/1/g
- * s/false/0/g
-
-Reported-by: Johannes Sixt <j.sixt@viscovery.net>
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- .gitignore | 2 +
- Documentation/git-sh-i18n--envsubst.txt | 36 +++
- Makefile | 1 +
- sh-i18n--envsubst.c | 444 +++++++++++++++++++++++++++++++
- t/t0201-gettext-fallbacks.sh | 51 ++++
- 5 files changed, 534 insertions(+), 0 deletions(-)
- create mode 100644 Documentation/git-sh-i18n--envsubst.txt
- create mode 100644 sh-i18n--envsubst.c
- create mode 100755 t/t0201-gettext-fallbacks.sh
-
-diff --git a/.gitignore b/.gitignore
-index c460c66..dad653d 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -127,6 +127,8 @@
- /git-rm
- /git-send-email
- /git-send-pack
-+/git-sh-i18n
-+/git-sh-i18n--envsubst
- /git-sh-setup
- /git-shell
- /git-shortlog
-diff --git a/Documentation/git-sh-i18n--envsubst.txt b/Documentation/git-sh-i18n--envsubst.txt
-new file mode 100644
-index 0000000..e146a2c
---- /dev/null
-+++ b/Documentation/git-sh-i18n--envsubst.txt
-@@ -0,0 +1,36 @@
-+git-sh-i18n--envsubst(1)
-+========================
-+
-+NAME
-+----
-+git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks
-+
-+DESCRIPTION
-+-----------
-+
-+This is not a command the end user would want to run. Ever.
-+This documentation is meant for people who are studying the
-+plumbing scripts and/or are writing new ones.
-+
-+git-sh-i18n--envsubst is Git's stripped-down copy of the GNU
-+`envsubst(1)` program that comes with the GNU gettext
-+package. It's used internally by linkgit:git-sh-i18n[1] to
-+provide the `eval_gettext` fallback on Solaris and systems
-+that don't have a gettext implementation.
-+
-+No promises are made about the interface, or that this
-+program won't disappear without warning in the next version
-+of Git. Don't use it.
-+
-+Author
-+------
-+Written by Ævar Arnfjörð Bjarmason <avarab@gmail.com>
-+
-+Documentation
-+--------------
-+Documentation by Ævar Arnfjörð Bjarmason and the git-list
-+<git@vger.kernel.org>.
-+
-+GIT
-+---
-+Part of the linkgit:git[1] suite
-diff --git a/Makefile b/Makefile
-index 92c1c5e..1f41812 100644
---- a/Makefile
-+++ b/Makefile
-@@ -414,6 +414,7 @@ PROGRAM_OBJS += shell.o
- PROGRAM_OBJS += show-index.o
- PROGRAM_OBJS += upload-pack.o
- PROGRAM_OBJS += http-backend.o
-+PROGRAM_OBJS += sh-i18n--envsubst.o
-
- PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
-
-diff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c
-new file mode 100644
-index 0000000..8db71b1
---- /dev/null
-+++ b/sh-i18n--envsubst.c
-@@ -0,0 +1,444 @@
-+/*
-+ * sh-i18n--envsubst.c - a stripped-down version of gettext's envsubst(1)
-+ *
-+ * Copyright (C) 2010 Ævar Arnfjörð Bjarmason
-+ *
-+ * This is a modified version of
-+ * 67d0871a8c:gettext-runtime/src/envsubst.c from the gettext.git
-+ * repository. It has been stripped down to only implement the
-+ * envsubst(1) features that we need in the git-sh-i18n fallbacks.
-+ *
-+ * The "Close standard error" part in main() is from
-+ * 8dac033df0:gnulib-local/lib/closeout.c. The copyright notices for
-+ * both files are reproduced immediately below.
-+ */
-+
-+#include "git-compat-util.h"
-+
-+/* Substitution of environment variables in shell format strings.
-+ Copyright (C) 2003-2007 Free Software Foundation, Inc.
-+ Written by Bruno Haible <bruno@clisp.org>, 2003.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2, or (at your option)
-+ any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software Foundation,
-+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-+
-+/* closeout.c - close standard output and standard error
-+ Copyright (C) 1998-2007 Free Software Foundation, Inc.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2, or (at your option)
-+ any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software Foundation,
-+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-+
-+#include <errno.h>
-+#include <getopt.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+/* If true, substitution shall be performed on all variables. */
-+static unsigned short int all_variables;
-+
-+/* Forward declaration of local functions. */
-+static void print_variables (const char *string);
-+static void note_variables (const char *string);
-+static void subst_from_stdin (void);
-+
-+int
-+main (int argc, char *argv[])
-+{
-+ /* Default values for command line options. */
-+ unsigned short int show_variables = 0;
-+
-+ switch (argc)
-+ {
-+ case 1:
-+ error ("we won't substitute all variables on stdin for you");
-+ /*
-+ all_variables = 1;
-+ subst_from_stdin ();
-+ */
-+ case 2:
-+ /* echo '$foo and $bar' | git sh-i18n--envsubst --variables '$foo and $bar' */
-+ all_variables = 0;
-+ note_variables (argv[1]);
-+ subst_from_stdin ();
-+ break;
-+ case 3:
-+ /* git sh-i18n--envsubst --variables '$foo and $bar' */
-+ if (strcmp(argv[1], "--variables"))
-+ error ("first argument must be --variables when two are given");
-+ show_variables = 1;
-+ print_variables (argv[2]);
-+ break;
-+ default:
-+ error ("too many arguments");
-+ break;
-+ }
-+
-+ /* Close standard error. This is simpler than fwriteerror_no_ebadf, because
-+ upon failure we don't need an errno - all we can do at this point is to
-+ set an exit status. */
-+ errno = 0;
-+ if (ferror (stderr) || fflush (stderr))
-+ {
-+ fclose (stderr);
-+ exit (EXIT_FAILURE);
-+ }
-+ if (fclose (stderr) && errno != EBADF)
-+ exit (EXIT_FAILURE);
-+
-+ exit (EXIT_SUCCESS);
-+}
-+
-+/* Parse the string and invoke the callback each time a $VARIABLE or
-+ ${VARIABLE} construct is seen, where VARIABLE is a nonempty sequence
-+ of ASCII alphanumeric/underscore characters, starting with an ASCII
-+ alphabetic/underscore character.
-+ We allow only ASCII characters, to avoid dependencies w.r.t. the current
-+ encoding: While "${\xe0}" looks like a variable access in ISO-8859-1
-+ encoding, it doesn't look like one in the BIG5, BIG5-HKSCS, GBK, GB18030,
-+ SHIFT_JIS, JOHAB encodings, because \xe0\x7d is a single character in these
-+ encodings. */
-+static void
-+find_variables (const char *string,
-+ void (*callback) (const char *var_ptr, size_t var_len))
-+{
-+ for (; *string != '\0';)
-+ if (*string++ == '$')
-+ {
-+ const char *variable_start;
-+ const char *variable_end;
-+ unsigned short int valid;
-+ char c;
-+
-+ if (*string == '{')
-+ string++;
-+
-+ variable_start = string;
-+ c = *string;
-+ if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || c == '_')
-+ {
-+ do
-+ c = *++string;
-+ while ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')
-+ || (c >= '0' && c <= '9') || c == '_');
-+ variable_end = string;
-+
-+ if (variable_start[-1] == '{')
-+ {
-+ if (*string == '}')
-+ {
-+ string++;
-+ valid = 1;
-+ }
-+ else
-+ valid = 0;
-+ }
-+ else
-+ valid = 1;
-+
-+ if (valid)
-+ callback (variable_start, variable_end - variable_start);
-+ }
-+ }
-+}
-+
-+
-+/* Print a variable to stdout, followed by a newline. */
-+static void
-+print_variable (const char *var_ptr, size_t var_len)
-+{
-+ fwrite (var_ptr, var_len, 1, stdout);
-+ putchar ('\n');
-+}
-+
-+/* Print the variables contained in STRING to stdout, each one followed by a
-+ newline. */
-+static void
-+print_variables (const char *string)
-+{
-+ find_variables (string, &print_variable);
-+}
-+
-+
-+/* Type describing list of immutable strings,
-+ implemented using a dynamic array. */
-+typedef struct string_list_ty string_list_ty;
-+struct string_list_ty
-+{
-+ const char **item;
-+ size_t nitems;
-+ size_t nitems_max;
-+};
-+
-+/* Initialize an empty list of strings. */
-+static inline void
-+string_list_init (string_list_ty *slp)
-+{
-+ slp->item = NULL;
-+ slp->nitems = 0;
-+ slp->nitems_max = 0;
-+}
-+
-+/* Append a single string to the end of a list of strings. */
-+static inline void
-+string_list_append (string_list_ty *slp, const char *s)
-+{
-+ /* Grow the list. */
-+ if (slp->nitems >= slp->nitems_max)
-+ {
-+ size_t nbytes;
-+
-+ slp->nitems_max = slp->nitems_max * 2 + 4;
-+ nbytes = slp->nitems_max * sizeof (slp->item[0]);
-+ slp->item = (const char **) xrealloc (slp->item, nbytes);
-+ }
-+
-+ /* Add the string to the end of the list. */
-+ slp->item[slp->nitems++] = s;
-+}
-+
-+/* Compare two strings given by reference. */
-+static int
-+cmp_string (const void *pstr1, const void *pstr2)
-+{
-+ const char *str1 = *(const char **)pstr1;
-+ const char *str2 = *(const char **)pstr2;
-+
-+ return strcmp (str1, str2);
-+}
-+
-+/* Sort a list of strings. */
-+static inline void
-+string_list_sort (string_list_ty *slp)
-+{
-+ if (slp->nitems > 0)
-+ qsort (slp->item, slp->nitems, sizeof (slp->item[0]), cmp_string);
-+}
-+
-+/* Test whether a string list contains a given string. */
-+static inline int
-+string_list_member (const string_list_ty *slp, const char *s)
-+{
-+ size_t j;
-+
-+ for (j = 0; j < slp->nitems; ++j)
-+ if (strcmp (slp->item[j], s) == 0)
-+ return 1;
-+ return 0;
-+}
-+
-+/* Test whether a sorted string list contains a given string. */
-+static int
-+sorted_string_list_member (const string_list_ty *slp, const char *s)
-+{
-+ size_t j1, j2;
-+
-+ j1 = 0;
-+ j2 = slp->nitems;
-+ if (j2 > 0)
-+ {
-+ /* Binary search. */
-+ while (j2 - j1 > 1)
-+ {
-+ /* Here we know that if s is in the list, it is at an index j
-+ with j1 <= j < j2. */
-+ size_t j = (j1 + j2) >> 1;
-+ int result = strcmp (slp->item[j], s);
-+
-+ if (result > 0)
-+ j2 = j;
-+ else if (result == 0)
-+ return 1;
-+ else
-+ j1 = j + 1;
-+ }
-+ if (j2 > j1)
-+ if (strcmp (slp->item[j1], s) == 0)
-+ return 1;
-+ }
-+ return 0;
-+}
-+
-+
-+/* Set of variables on which to perform substitution.
-+ Used only if !all_variables. */
-+static string_list_ty variables_set;
-+
-+/* Adds a variable to variables_set. */
-+static void
-+note_variable (const char *var_ptr, size_t var_len)
-+{
-+ char *string = xmalloc (var_len + 1);
-+ memcpy (string, var_ptr, var_len);
-+ string[var_len] = '\0';
-+
-+ string_list_append (&variables_set, string);
-+}
-+
-+/* Stores the variables occurring in the string in variables_set. */
-+static void
-+note_variables (const char *string)
-+{
-+ string_list_init (&variables_set);
-+ find_variables (string, &note_variable);
-+ string_list_sort (&variables_set);
-+}
-+
-+
-+static int
-+do_getc ()
-+{
-+ int c = getc (stdin);
-+
-+ if (c == EOF)
-+ {
-+ if (ferror (stdin))
-+ error ("error while reading standard input");
-+ }
-+
-+ return c;
-+}
-+
-+static inline void
-+do_ungetc (int c)
-+{
-+ if (c != EOF)
-+ ungetc (c, stdin);
-+}
-+
-+/* Copies stdin to stdout, performing substitutions. */
-+static void
-+subst_from_stdin ()
-+{
-+ static char *buffer;
-+ static size_t bufmax;
-+ static size_t buflen;
-+ int c;
-+
-+ for (;;)
-+ {
-+ c = do_getc ();
-+ if (c == EOF)
-+ break;
-+ /* Look for $VARIABLE or ${VARIABLE}. */
-+ if (c == '$')
-+ {
-+ unsigned short int opening_brace = 0;
-+ unsigned short int closing_brace = 0;
-+
-+ c = do_getc ();
-+ if (c == '{')
-+ {
-+ opening_brace = 1;
-+ c = do_getc ();
-+ }
-+ if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || c == '_')
-+ {
-+ unsigned short int valid;
-+
-+ /* Accumulate the VARIABLE in buffer. */
-+ buflen = 0;
-+ do
-+ {
-+ if (buflen >= bufmax)
-+ {
-+ bufmax = 2 * bufmax + 10;
-+ buffer = xrealloc (buffer, bufmax);
-+ }
-+ buffer[buflen++] = c;
-+
-+ c = do_getc ();
-+ }
-+ while ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')
-+ || (c >= '0' && c <= '9') || c == '_');
-+
-+ if (opening_brace)
-+ {
-+ if (c == '}')
-+ {
-+ closing_brace = 1;
-+ valid = 1;
-+ }
-+ else
-+ {
-+ valid = 0;
-+ do_ungetc (c);
-+ }
-+ }
-+ else
-+ {
-+ valid = 1;
-+ do_ungetc (c);
-+ }
-+
-+ if (valid)
-+ {
-+ /* Terminate the variable in the buffer. */
-+ if (buflen >= bufmax)
-+ {
-+ bufmax = 2 * bufmax + 10;
-+ buffer = xrealloc (buffer, bufmax);
-+ }
-+ buffer[buflen] = '\0';
-+
-+ /* Test whether the variable shall be substituted. */
-+ if (!all_variables
-+ && !sorted_string_list_member (&variables_set, buffer))
-+ valid = 0;
-+ }
-+
-+ if (valid)
-+ {
-+ /* Substitute the variable's value from the environment. */
-+ const char *env_value = getenv (buffer);
-+
-+ if (env_value != NULL)
-+ fputs (env_value, stdout);
-+ }
-+ else
-+ {
-+ /* Perform no substitution at all. Since the buffered input
-+ contains no other '$' than at the start, we can just
-+ output all the buffered contents. */
-+ putchar ('$');
-+ if (opening_brace)
-+ putchar ('{');
-+ fwrite (buffer, buflen, 1, stdout);
-+ if (closing_brace)
-+ putchar ('}');
-+ }
-+ }
-+ else
-+ {
-+ do_ungetc (c);
-+ putchar ('$');
-+ if (opening_brace)
-+ putchar ('{');
-+ }
-+ }
-+ else
-+ putchar (c);
-+ }
-+}
-diff --git a/t/t0201-gettext-fallbacks.sh b/t/t0201-gettext-fallbacks.sh
-new file mode 100755
-index 0000000..c22409c
---- /dev/null
-+++ b/t/t0201-gettext-fallbacks.sh
-@@ -0,0 +1,51 @@
-+#!/bin/sh
-+#
-+# Copyright (c) 2010 Ævar Arnfjörð Bjarmason
-+#
-+
-+test_description='Gettext Shell fallbacks'
-+
-+. ./test-lib.sh
-+. "$GIT_BUILD_DIR"/git-sh-i18n
-+
-+test_expect_success 'gettext: our gettext() fallback has pass-through semantics' '
-+ printf "test" >expect &&
-+ gettext "test" >actual &&
-+ test_cmp expect actual &&
-+ printf "test more words" >expect &&
-+ gettext "test more words" >actual &&
-+ test_cmp expect actual
-+'
-+
-+test_expect_success 'eval_gettext: our eval_gettext() fallback has pass-through semantics' '
-+ printf "test" >expect &&
-+ eval_gettext "test" >actual &&
-+ test_cmp expect actual &&
-+ printf "test more words" >expect &&
-+ eval_gettext "test more words" >actual &&
-+ test_cmp expect actual
-+'
-+
-+test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables' '
-+ printf "test YesPlease" >expect &&
-+ GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease eval_gettext "test \$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" >actual &&
-+ test_cmp expect actual
-+'
-+
-+test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces' '
-+ cmdline="git am" &&
-+ export cmdline;
-+ printf "When you have resolved this problem run git am --resolved." >expect &&
-+ eval_gettext "When you have resolved this problem run \$cmdline --resolved." >actual
-+ test_cmp expect actual
-+'
-+
-+test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes' '
-+ cmdline="git am" &&
-+ export cmdline;
-+ printf "When you have resolved this problem run \"git am --resolved\"." >expect &&
-+ eval_gettext "When you have resolved this problem run \"\$cmdline --resolved\"." >actual
-+ test_cmp expect actual
-+'
-+
-+test_done
---
-1.7.4.1
-
View
136 ab/i18n-sh-only/0002-git-sh-i18n.sh-add-no-op-gettext-and-eval_gettext-wr.patch
@@ -1,136 +0,0 @@
-From 6a07acf5774ce8b04bd533e869a6886e6ea8f331 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Sat, 19 Feb 2011 21:12:30 +0000
-Subject: [PATCH 02/53] git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add a no-op wrapper library for Git's shell scripts. To split up the
-gettext series I'm first submitting patches to gettextize the source
-tree before I add any of the Makefile and Shell library changes needed
-to actually use them.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- .gitignore | 1 +
- Documentation/git-sh-i18n.txt | 57 +++++++++++++++++++++++++++++++++++++++++
- Makefile | 1 +
- git-sh-i18n.sh | 17 ++++++++++++
- 4 files changed, 76 insertions(+), 0 deletions(-)
- create mode 100644 Documentation/git-sh-i18n.txt
- create mode 100644 git-sh-i18n.sh
-
-diff --git a/.gitignore b/.gitignore
-index dad653d..e9ab0af 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -130,6 +130,7 @@
- /git-sh-i18n
- /git-sh-i18n--envsubst
- /git-sh-setup
-+/git-sh-i18n
- /git-shell
- /git-shortlog
- /git-show
-diff --git a/Documentation/git-sh-i18n.txt b/Documentation/git-sh-i18n.txt
-new file mode 100644
-index 0000000..b41b3af
---- /dev/null
-+++ b/Documentation/git-sh-i18n.txt
-@@ -0,0 +1,57 @@
-+git-sh-i18n(1)
-+==============
-+
-+NAME
-+----
-+git-sh-i18n - Git's i18n setup code for shell scripts
-+
-+SYNOPSIS
-+--------
-+'. "$(git --exec-path)/git-sh-i18n"'
-+
-+DESCRIPTION
-+-----------
-+
-+This is not a command the end user would want to run. Ever.
-+This documentation is meant for people who are studying the
-+Porcelain-ish scripts and/or are writing new ones.
-+
-+The 'git sh-i18n scriptlet is designed to be sourced (using
-+`.`) by Git's porcelain programs implemented in shell
-+script. It provides wrappers for the GNU `gettext` and
-+`eval_gettext` functions accessible through the `gettext.sh`
-+script, and provides pass-through fallbacks on systems
-+without GNU gettext.
-+
-+FUNCTIONS
-+---------
-+
-+gettext::
-+ On GNU systems this will be the `gettext` function from
-+ `gettext.sh`, on Solaris it`ll be the `gettext(1)`
-+ command.
-+
-+ If neither of those implementations are available a
-+ dummy fall-through function is provided.
-+
-+eval_gettext::
-+ On GNU systems this will be the `eval_gettext` function
-+ from `gettext.sh`, on Solaris we provide an
-+ `eval_gettext` using the
-+ linkgit:git-sh-i18n--envsubst[1] helper.
-+
-+ If neither of those implementations are available a
-+ dummy fall-through function is provided.
-+
-+Author
-+------
-+Written by Ævar Arnfjörð Bjarmason <avarab@gmail.com>
-+
-+Documentation
-+--------------
-+Documentation by Ævar Arnfjörð Bjarmason and the git-list
-+<git@vger.kernel.org>.
-+
-+GIT
-+---
-+Part of the linkgit:git[1] suite
-diff --git a/Makefile b/Makefile
-index 1f41812..e2dab69 100644
---- a/Makefile
-+++ b/Makefile
-@@ -381,6 +381,7 @@ SCRIPT_SH += git-web--browse.sh
- SCRIPT_LIB += git-mergetool--lib
- SCRIPT_LIB += git-parse-remote
- SCRIPT_LIB += git-sh-setup
-+SCRIPT_LIB += git-sh-i18n
-
- SCRIPT_PERL += git-add--interactive.perl
- SCRIPT_PERL += git-difftool.perl
-diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
-new file mode 100644
-index 0000000..ea05e16
---- /dev/null
-+++ b/git-sh-i18n.sh
-@@ -0,0 +1,17 @@
-+#!/bin/sh
-+#
-+# Copyright (c) 2010 Ævar Arnfjörð Bjarmason
-+#
-+# This is a skeleton no-op implementation of gettext for Git. It'll be
-+# replaced by something that uses gettext.sh in a future patch series.
-+
-+gettext () {
-+ printf "%s" "$1"
-+}
-+
-+eval_gettext () {
-+ printf "%s" "$1" | (
-+ export PATH $(git sh-i18n--envsubst --variables "$1");
-+ git sh-i18n--envsubst "$1"
-+ )
-+}
---
-1.7.4.1
-
View
31 ab/i18n-sh-only/0003-i18n-git-am-add-git-sh-i18n.patch
@@ -1,31 +0,0 @@
-From 1101131ca06781fcb0f3462531373b45aef17e1b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Tue, 7 Sep 2010 14:03:50 +0000
-Subject: [PATCH 03/53] i18n: git-am add git-sh-i18n
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Source git-sh-i18n in git-am.sh, it's needed to import the Git gettext
-shell functions.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-am.sh | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/git-am.sh b/git-am.sh
-index 6cdd591..79c5ea2 100755
---- a/git-am.sh
-+++ b/git-am.sh
-@@ -37,6 +37,7 @@ rerere-autoupdate update the index with reused conflict resolution if possible
- rebasing* (internal use for git-rebase)"
-
- . git-sh-setup
-+. git-sh-i18n
- prefix=$(git rev-parse --show-prefix)
- set_reflog_action am
- require_work_tree
---
-1.7.4.1
-
View
50 ab/i18n-sh-only/0004-i18n-git-am-one-line-gettext-msg-echo.patch
@@ -1,50 +0,0 @@
-From fb951646406019c78f7cf0e9abc0b70c857bab50 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Tue, 7 Sep 2010 14:20:05 +0000
-Subject: [PATCH 04/53] i18n: git-am one-line gettext $msg; echo
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-One-line `gettext $msg; echo' messages are the simplest use case for
-gettext(1).
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-am.sh | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/git-am.sh b/git-am.sh
-index 79c5ea2..f54f13d 100755
---- a/git-am.sh
-+++ b/git-am.sh
-@@ -115,7 +115,7 @@ go_next () {
-
- cannot_fallback () {
- echo "$1"
-- echo "Cannot fall back to three-way merge."
-+ gettext "Cannot fall back to three-way merge."; echo
- exit 1
- }
-
-@@ -645,7 +645,7 @@ do
-
- if test -z "$GIT_AUTHOR_EMAIL"
- then
-- echo "Patch does not have a valid e-mail address."
-+ gettext "Patch does not have a valid e-mail address."; echo
- stop_here $this
- fi
-
-@@ -696,7 +696,7 @@ do
- action=again
- while test "$action" = again
- do
-- echo "Commit Body is:"
-+ gettext "Commit Body is:"; echo
- echo "--------------------------"
- cat "$dotest/final-commit"
- echo "--------------------------"
---
-1.7.4.1
-
View
46 ab/i18n-sh-only/0005-i18n-git-am-multi-line-getttext-msg-echo.patch
@@ -1,46 +0,0 @@
-From e3c2a55e6786415ca35c9666b4998ac86834bfd6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Tue, 7 Sep 2010 14:35:18 +0000
-Subject: [PATCH 05/53] i18n: git-am multi-line getttext $msg; echo
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When we have multi-line `gettext $msg; echo' messages we can't
-preserve the existing indenting because gettext(1) can't accept input
-on stdin.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-am.sh | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/git-am.sh b/git-am.sh
-index f54f13d..5a152b0 100755
---- a/git-am.sh
-+++ b/git-am.sh
-@@ -757,16 +757,16 @@ do
- # working tree.
- resolved=
- git diff-index --quiet --cached HEAD -- && {
-- echo "No changes - did you forget to use 'git add'?"
-- echo "If there is nothing left to stage, chances are that something else"
-- echo "already introduced the same changes; you might want to skip this patch."
-+ gettext "No changes - did you forget to use 'git add'?
-+If there is nothing left to stage, chances are that something else
-+already introduced the same changes; you might want to skip this patch."; echo
- stop_here_user_resolve $this
- }
- unmerged=$(git ls-files -u)
- if test -n "$unmerged"
- then
-- echo "You still have unmerged paths in your index"
-- echo "did you forget to use 'git add'?"
-+ gettext "You still have unmerged paths in your index
-+did you forget to use 'git add'?"; echo
- stop_here_user_resolve $this
- fi
- apply_status=0
---
-1.7.4.1
-
View
50 ab/i18n-sh-only/0006-i18n-git-am-eval_gettext-messages.patch
@@ -1,50 +0,0 @@
-From b0b283a37e270a1fd33a22a41e24cff82c8db1a2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Tue, 7 Sep 2010 14:12:59 +0000
-Subject: [PATCH 06/53] i18n: git-am eval_gettext messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Messages that use variables to be interpolated need to use
-eval_gettext(), this wrapper will eval the message and expand the
-variable for us.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-am.sh | 12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/git-am.sh b/git-am.sh
-index 5a152b0..7c0273c 100755
---- a/git-am.sh
-+++ b/git-am.sh
-@@ -99,9 +99,9 @@ stop_here_user_resolve () {
- printf '%s\n' "$resolvemsg"
- stop_here $1
- fi
-- echo "When you have resolved this problem run \"$cmdline --resolved\"."
-- echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
-- echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
-+ eval_gettext "When you have resolved this problem run \"\$cmdline --resolved\".
-+If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
-+To restore the original branch and stop patching run \"\$cmdline --abort\"."; echo
-
- stop_here $1
- }
-@@ -608,9 +608,9 @@ do
- go_next && continue
-
- test -s "$dotest/patch" || {
-- echo "Patch is empty. Was it split wrong?"
-- echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
-- echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
-+ eval_gettext "Patch is empty. Was it split wrong?
-+If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
-+To restore the original branch and stop patching run \"\$cmdline --abort\"."; echo
- stop_here $this
- }
- rm -f "$dotest/original-commit" "$dotest/author-script"
---
-1.7.4.1
-
View
27 ab/i18n-sh-only/0007-i18n-git-am-echo-gettext-message.patch
@@ -1,27 +0,0 @@
-From 8d12c7574f21b09414094828370cbd428eaf7b49 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Sat, 12 Feb 2011 23:08:51 +0000
-Subject: [PATCH 07/53] i18n: git-am echo + gettext message
-
----
- git-am.sh | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/git-am.sh b/git-am.sh
-index 7c0273c..688f689 100755
---- a/git-am.sh
-+++ b/git-am.sh
-@@ -89,8 +89,8 @@ safe_to_abort () {
- then
- return 0
- fi
-- echo >&2 "You seem to have moved HEAD since the last 'am' failure."
-- echo >&2 "Not rewinding to ORIG_HEAD"
-+ echo >&2 "$(gettext "You seem to have moved HEAD since the last 'am' failure.
-+Not rewinding to ORIG_HEAD")"
- return 1
- }
-
---
-1.7.4.1
-
View
88 ab/i18n-sh-only/0008-i18n-git-am-die-messages.patch
@@ -1,88 +0,0 @@
-From 325aef2abfbf7c72a77f4e29cd3293fcbc775ec5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Tue, 7 Sep 2010 14:11:04 +0000
-Subject: [PATCH 08/53] i18n: git-am die messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The die messages in git-am need to use:
-
- die "$(gettext "string")"
-
-Since gettext(1) emits the message instead of returning it like the C
-equivalent, and our die() function in git-sh-setup needs to get a
-string as an argument.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-am.sh | 14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/git-am.sh b/git-am.sh
-index 688f689..cbd48a9 100755
---- a/git-am.sh
-+++ b/git-am.sh
-@@ -44,7 +44,7 @@ require_work_tree
- cd_to_toplevel
-
- git var GIT_COMMITTER_IDENT >/dev/null ||
-- die "You need to set your committer info first"
-+ die "$(gettext "You need to set your committer info first")"
-
- if git rev-parse --verify -q HEAD >/dev/null
- then
-@@ -359,7 +359,7 @@ do
- --rebasing)
- rebasing=t threeway=t keep=t scissors=f no_inbody_headers=t ;;
- -d|--dotest)
-- die "-d option is no longer supported. Do not use."
-+ die "$(gettext "-d option is no longer supported. Do not use.")"
- ;;
- --resolvemsg)
- shift; resolvemsg=$1 ;;
-@@ -422,12 +422,12 @@ then
- false
- ;;
- esac ||
-- die "previous rebase directory $dotest still exists but mbox given."
-+ die "$(eval_gettext "previous rebase directory \$dotest still exists but mbox given.")"
- resume=yes
-
- case "$skip,$abort" in
- t,t)
-- die "Please make up your mind. --skip or --abort?"
-+ die "$(gettext "Please make up your mind. --skip or --abort?")"
- ;;
- t,)
- git rerere clear
-@@ -454,7 +454,7 @@ then
- else
- # Make sure we are not given --skip, --resolved, nor --abort
- test "$skip$resolved$abort" = "" ||
-- die "Resolve operation not in progress, we are not resuming."
-+ die "$(gettext "Resolve operation not in progress, we are not resuming.")"
-
- # Start afresh.
- mkdir -p "$dotest" || exit
-@@ -519,7 +519,7 @@ case "$resolved" in
- if test "$files"
- then
- test -n "$HAS_HEAD" && : >"$dotest/dirtyindex"
-- die "Dirty index: cannot apply patches (dirty: $files)"
-+ die "$(eval_gettext "Dirty index: cannot apply patches (dirty: \$files)")"
- fi
- esac
-
-@@ -692,7 +692,7 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."; ec
- if test "$interactive" = t
- then
- test -t 0 ||
-- die "cannot be interactive without stdin connected to a terminal."
-+ die "$(gettext "cannot be interactive without stdin connected to a terminal.")"
- action=again
- while test "$action" = again
- do
---
-1.7.4.1
-
View
43 ab/i18n-sh-only/0009-i18n-git-am-cannot_fallback-messages.patch
@@ -1,43 +0,0 @@
-From 2d9912720a29bd085cc5c9be23136ba9d5cde404 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Tue, 7 Sep 2010 14:36:09 +0000
-Subject: [PATCH 09/53] i18n: git-am cannot_fallback messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Translate messages with gettext(1) before they're passed to the
-cannot_fallback function, just like we handle the die function.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-am.sh | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/git-am.sh b/git-am.sh
-index cbd48a9..5c06eda 100755
---- a/git-am.sh
-+++ b/git-am.sh
-@@ -130,7 +130,7 @@ fall_back_3way () {
- "$dotest/patch" &&
- GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
- git write-tree >"$dotest/patch-merge-base+" ||
-- cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge."
-+ cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")"
-
- say Using index info to reconstruct a base tree...
- if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
-@@ -139,8 +139,8 @@ fall_back_3way () {
- mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
- mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
- else
-- cannot_fallback "Did you hand edit your patch?
--It does not apply to blobs recorded in its index."
-+ cannot_fallback "$(gettext "Did you hand edit your patch?
-+It does not apply to blobs recorded in its index.")"
- fi
-
- test -f "$dotest/patch-merge-index" &&
---
-1.7.4.1
-
View
45 ab/i18n-sh-only/0010-i18n-git-am-clean_abort-messages.patch
@@ -1,45 +0,0 @@
-From 99ccbc4baaa45b7b726c42449e0397f2c9e966ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Tue, 7 Sep 2010 14:54:27 +0000
-Subject: [PATCH 10/53] i18n: git-am clean_abort messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Messages that used the clean_abort function needed both gettext(1) and
-eval_gettext(). These need to be interpolated in a string like the die
-and cannot_fallback messages.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-am.sh | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/git-am.sh b/git-am.sh
-index 5c06eda..ed48673 100755
---- a/git-am.sh
-+++ b/git-am.sh
-@@ -255,7 +255,7 @@ split_patches () {
- stgit-series)
- if test $# -ne 1
- then
-- clean_abort "Only one StGIT patch series can be applied at once"
-+ clean_abort "$(gettext "Only one StGIT patch series can be applied at once")"
- fi
- series_dir=`dirname "$1"`
- series_file="$1"
-@@ -307,9 +307,9 @@ split_patches () {
- ;;
- *)
- if test -n "$parse_patch" ; then
-- clean_abort "Patch format $patch_format is not supported."
-+ clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")"
- else
-- clean_abort "Patch format detection failed."
-+ clean_abort "$(gettext "Patch format detection failed.")"
- fi
- ;;
- esac
---
-1.7.4.1
-
View
38 ab/i18n-sh-only/0011-i18n-git-am-Apply-message.patch
@@ -1,38 +0,0 @@
-From 3ff50358d51cc35eb9c36008cfbf2af41767c05d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Tue, 7 Sep 2010 14:37:41 +0000
-Subject: [PATCH 11/53] i18n: git-am "Apply?" message
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Make the "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all" message
-translatable, and leave a note in a TRANSLATORS comment explaining
-that translators have to preserve a mention of the y/n/e/v/a
-characters since the program will expect them, and not their
-localized equivalents.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-am.sh | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/git-am.sh b/git-am.sh
-index ed48673..2c8770b 100755
---- a/git-am.sh
-+++ b/git-am.sh
-@@ -700,7 +700,10 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."; ec
- echo "--------------------------"
- cat "$dotest/final-commit"
- echo "--------------------------"
-- printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
-+ # TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
-+ # in your translation. The program will only accept English
-+ # input at this point.
-+ gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
- read reply
- case "$reply" in
- [yY]*) action=yes ;;
---
-1.7.4.1
-
View
84 ab/i18n-sh-only/0012-i18n-git-am-core-say-messages.patch
@@ -1,84 +0,0 @@
-From 9799925b29c25ffe563ac5339d6c12a98afc6df7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Tue, 7 Sep 2010 14:55:56 +0000
-Subject: [PATCH 12/53] i18n: git-am core say messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Make the core git-am messages that use say() translatable. These are
-visible on almost every git am invocation.
-
-There are tests that depend on the "Applying" output that need to be
-skipped along with this translation.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-am.sh | 6 +++---
- t/t4150-am.sh | 5 ++++-
- t/t4151-am-abort.sh | 2 +-
- 3 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/git-am.sh b/git-am.sh
-index 2c8770b..a15c5cc 100755
---- a/git-am.sh
-+++ b/git-am.sh
-@@ -739,7 +739,7 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."; ec
- stop_here $this
- fi
-
-- say "Applying: $FIRSTLINE"
-+ say "$(eval_gettext "Applying: \$FIRSTLINE")"
-
- case "$resolved" in
- '')
-@@ -784,7 +784,7 @@ did you forget to use 'git add'?"; echo
- # Applying the patch to an earlier tree and merging the
- # result may have produced the same tree as ours.
- git diff-index --quiet --cached HEAD -- && {
-- say No changes -- Patch already applied.
-+ say "$(gettext "No changes -- Patch already applied.")"
- go_next
- continue
- }
-@@ -810,7 +810,7 @@ did you forget to use 'git add'?"; echo
- GIT_AUTHOR_DATE=
- fi
- parent=$(git rev-parse --verify -q HEAD) ||
-- say >&2 "applying to an empty history"
-+ say >&2 "$(gettext "applying to an empty history")"
-
- if test -n "$committer_date_is_author_date"
- then
-diff --git a/t/t4150-am.sh b/t/t4150-am.sh
-index 850fc96..aa3d4ad 100755
---- a/t/t4150-am.sh
-+++ b/t/t4150-am.sh
-@@ -464,7 +464,10 @@ test_expect_success 'am newline in subject' '
- git checkout first &&
- test_tick &&
- sed -e "s/second/second \\\n foo/" patch1 >patchnl &&
-- git am <patchnl >output.out 2>&1 &&
-+ git am <patchnl >output.out 2>&1
-+'
-+
-+test_expect_success C_LOCALE_OUTPUT 'output: am newline in subject' '
- grep "^Applying: second \\\n foo$" output.out
- '
-
-diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
-index c95c4cc..b9d8f5e 100755
---- a/t/t4151-am-abort.sh
-+++ b/t/t4151-am-abort.sh
-@@ -43,7 +43,7 @@ do
- test_cmp expect actual
- '
-
-- test_expect_success "am$with3 --skip continue after failed am$with3" '
-+ test_expect_success C_LOCALE_OUTPUT "am$with3 --skip continue after failed am$with3" '
- test_must_fail git am$with3 --skip >output &&
- test "$(grep "^Applying" output)" = "Applying: 6" &&
- test_cmp file-2-expect file-2 &&
---
-1.7.4.1
-
View
33 ab/i18n-sh-only/0013-i18n-git-am-printf-1-message-to-eval_gettext.patch
@@ -1,33 +0,0 @@
-From b22fb20a4b0dc3d53ffa1e10460da3bfbc0c1748 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Tue, 7 Sep 2010 14:57:02 +0000
-Subject: [PATCH 13/53] i18n: git-am printf(1) message to eval_gettext
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Convert a message that used printf(1) format to use eval_gettext. It's
-easier for translators to handle the latter, since the eval format
-automatically gives them context via variable names.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-am.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/git-am.sh b/git-am.sh
-index a15c5cc..2a42ea2 100755
---- a/git-am.sh
-+++ b/git-am.sh
-@@ -794,7 +794,7 @@ did you forget to use 'git add'?"; echo
- fi
- if test $apply_status != 0
- then
-- printf 'Patch failed at %s %s\n' "$msgnum" "$FIRSTLINE"
-+ eval_gettext 'Patch failed at $msgnum $FIRSTLINE'; echo
- stop_here_user_resolve $this
- fi
-
---
-1.7.4.1
-
View
28 ab/i18n-sh-only/0014-i18n-git-pull-add-git-sh-i18n.patch
@@ -1,28 +0,0 @@
-From a151b584557f28ad91685dad4ca2c4924bd656df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 18:09:43 +0000
-Subject: [PATCH 14/53] i18n: git-pull add git-sh-i18n
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-pull.sh | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/git-pull.sh b/git-pull.sh
-index e31226b..0b623bf 100755
---- a/git-pull.sh
-+++ b/git-pull.sh
-@@ -9,6 +9,7 @@ LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEA
- SUBDIRECTORY_OK=Yes
- OPTIONS_SPEC=
- . git-sh-setup
-+. git-sh-i18n
- set_reflog_action "pull $*"
- require_work_tree
- cd_to_toplevel
---
-1.7.4.1
-
View
73 ab/i18n-sh-only/0015-i18n-git-pull-die-messages.patch
@@ -1,73 +0,0 @@
-From 96ef508bd3e0292f4f7eb1a96e688c662501e313 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 18:13:50 +0000
-Subject: [PATCH 15/53] i18n: git-pull die messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-pull.sh | 19 ++++++++++---------
- 1 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/git-pull.sh b/git-pull.sh
-index 0b623bf..b19e097 100755
---- a/git-pull.sh
-+++ b/git-pull.sh
-@@ -18,20 +18,20 @@ cd_to_toplevel
- die_conflict () {
- git diff-index --cached --name-status -r --ignore-submodules HEAD --
- if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
-- die "Pull is not possible because you have unmerged files.
-+ die "$(gettext "Pull is not possible because you have unmerged files.
- Please, fix them up in the work tree, and then use 'git add/rm <file>'
--as appropriate to mark resolution, or use 'git commit -a'."
-+as appropriate to mark resolution, or use 'git commit -a'.")"
- else
-- die "Pull is not possible because you have unmerged files."
-+ die "$(gettext "Pull is not possible because you have unmerged files.")"
- fi
- }
-
- die_merge () {
- if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
-- die "You have not concluded your merge (MERGE_HEAD exists).
--Please, commit your changes before you can merge."
-+ die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).
-+Please, commit your changes before you can merge.")"
- else
-- die "You have not concluded your merge (MERGE_HEAD exists)."
-+ die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")"
- fi
- }
-
-@@ -207,9 +207,10 @@ test true = "$rebase" && {
- # On an unborn branch
- if test -f "$GIT_DIR/index"
- then
-- die "updating an unborn branch with changes added to the index"
-+ die "$(gettext "updating an unborn branch with changes added to the index")"
- fi
- else
-+ # XXX: This is an abomination
- require_clean_work_tree "pull with rebase" "Please commit or stash them."
- fi
- oldremoteref= &&
-@@ -263,11 +264,11 @@ case "$merge_head" in
- ?*' '?*)
- if test -z "$orig_head"
- then
-- die "Cannot merge multiple branches into empty head"
-+ die "$(gettext "Cannot merge multiple branches into empty head")"
- fi
- if test true = "$rebase"
- then
-- die "Cannot rebase onto multiple branches"
-+ die "$(gettext "Cannot rebase onto multiple branches")"
- fi
- ;;
- esac
---
-1.7.4.1
-
View
36 ab/i18n-sh-only/0016-i18n-git-pull-eval_gettext-die-message.patch
@@ -1,36 +0,0 @@
-From a6bbf4e97653ec1bcade23ee1623bc9895693ebb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 18:47:44 +0000
-Subject: [PATCH 16/53] i18n: git-pull eval_gettext + die message
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-pull.sh | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/git-pull.sh b/git-pull.sh
-index b19e097..36f34d6 100755
---- a/git-pull.sh
-+++ b/git-pull.sh
-@@ -244,12 +244,12 @@ then
- echo >&2 "Warning: commit $orig_head."
- git update-index -q --refresh
- git read-tree -u -m "$orig_head" "$curr_head" ||
-- die 'Cannot fast-forward your working tree.
-+ die "$(eval_gettext "Cannot fast-forward your working tree.
- After making sure that you saved anything precious from
--$ git diff '$orig_head'
-+$ git diff \$orig_head
- output, run
- $ git reset --hard
--to recover.'
-+to recover.")"
-
- fi
-
---
-1.7.4.1
-
View
33 ab/i18n-sh-only/0017-i18n-git-pull-eval_gettext-warning-message.patch
@@ -1,33 +0,0 @@
-From 0536d9a8f19c891682a968d285d3610909818994 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 18:49:29 +0000
-Subject: [PATCH 17/53] i18n: git-pull eval_gettext + warning message
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-pull.sh | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/git-pull.sh b/git-pull.sh
-index 36f34d6..e8e534a 100755
---- a/git-pull.sh
-+++ b/git-pull.sh
-@@ -239,9 +239,9 @@ then
- # $orig_head commit, but we are merging into $curr_head.
- # First update the working tree to match $curr_head.
-
-- echo >&2 "Warning: fetch updated the current branch head."
-- echo >&2 "Warning: fast-forwarding your working tree from"
-- echo >&2 "Warning: commit $orig_head."
-+ echo >&2 "$(eval_gettext "Warning: fetch updated the current branch head.
-+Warning: fast-forwarding your working tree from
-+Warning: commit \$orig_head.")"
- git update-index -q --refresh
- git read-tree -u -m "$orig_head" "$curr_head" ||
- die "$(eval_gettext "Cannot fast-forward your working tree.
---
-1.7.4.1
-
View
40 ab/i18n-sh-only/0018-i18n-git-pull-split-up-no-candidate-message.patch
@@ -1,40 +0,0 @@
-From 969ef13af5c0493d11111fd248cb2a02b8d30e5e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 18:53:21 +0000
-Subject: [PATCH 18/53] i18n: git-pull split up "no candidate" message
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-pull.sh | 11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/git-pull.sh b/git-pull.sh
-index e8e534a..95b1fb2 100755
---- a/git-pull.sh
-+++ b/git-pull.sh
-@@ -155,13 +155,14 @@ error_on_no_merge_candidates () {
-
- if [ $# -gt 1 ]; then
- if [ "$rebase" = true ]; then
-- printf "There is no candidate for rebasing against "
-+ gettext "There is no candidate for rebasing against among the refs that you just fetched.
-+Generally this means that you provided a wildcard refspec which had no
-+matches on the remote end."; echo
- else
-- printf "There are no candidates for merging "
-+ gettext "There are no candidates for merging against among the refs that you just fetched.
-+Generally this means that you provided a wildcard refspec which had no
-+matches on the remote end."; echo
- fi
-- echo "among the refs that you just fetched."
-- echo "Generally this means that you provided a wildcard refspec which had no"
-- echo "matches on the remote end."
- elif [ $# -gt 0 ] && [ "$1" != "$remote" ]; then
- echo "You asked to pull from the remote '$1', but did not specify"
- echo "a branch. Because this is not the default configured remote"
---
-1.7.4.1
-
View
43 ab/i18n-sh-only/0019-i18n-git-pull-You-asked-to-pull-message.patch
@@ -1,43 +0,0 @@
-From 8eb125e53136484c336e6aafd5dce2d7f3253af2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 19:02:23 +0000
-Subject: [PATCH 19/53] i18n: git-pull "You asked to pull" message
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Gettextize the "You asked to pull" error message. This message
-interpolated $1 which won't work with eval_gettext for obvious
-reasons, so I needed to provide an alias for it.
-
-This also made the message easier to translate, and I added a
-TRANSLATORS comment to make it even easier.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-pull.sh | 9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/git-pull.sh b/git-pull.sh
-index 95b1fb2..821c48d 100755
---- a/git-pull.sh
-+++ b/git-pull.sh
-@@ -164,9 +164,12 @@ Generally this means that you provided a wildcard refspec which had no
- matches on the remote end."; echo
- fi
- elif [ $# -gt 0 ] && [ "$1" != "$remote" ]; then
-- echo "You asked to pull from the remote '$1', but did not specify"
-- echo "a branch. Because this is not the default configured remote"
-- echo "for your current branch, you must specify a branch on the command line."
-+ requested_remote=$1
-+ # TRANSLATORS: $requested_remote will be a remote name, like
-+ # "origin" or "avar"
-+ eval_gettext "You asked to pull from the remote '\$requested_remote', but did not specify
-+a branch. Because this is not the default configured remote
-+for your current branch, you must specify a branch on the command line."; echo
- elif [ -z "$curr_branch" ]; then
- echo "You are not currently on a branch, so I cannot use any"
- echo "'branch.<branchname>.merge' in your configuration file."
---
-1.7.4.1
-
View
37 ab/i18n-sh-only/0020-i18n-git-pull-.-not-currently-on-a-branch-message.patch
@@ -1,37 +0,0 @@
-From c7d7d56866ff7d77a1cc68caa86ef149a208ed53 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 19:03:26 +0000
-Subject: [PATCH 20/53] i18n: git-pull "[...] not currently on a branch" message
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-pull.sh | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/git-pull.sh b/git-pull.sh
-index 821c48d..14d9eb5 100755
---- a/git-pull.sh
-+++ b/git-pull.sh
-@@ -171,11 +171,11 @@ matches on the remote end."; echo
- a branch. Because this is not the default configured remote
- for your current branch, you must specify a branch on the command line."; echo
- elif [ -z "$curr_branch" ]; then
-- echo "You are not currently on a branch, so I cannot use any"
-- echo "'branch.<branchname>.merge' in your configuration file."
-- echo "Please specify which remote branch you want to use on the command"
-- echo "line and try again (e.g. 'git pull <repository> <refspec>')."
-- echo "See git-pull(1) for details."
-+ gettext "You are not currently on a branch, so I cannot use any
-+'branch.<branchname>.merge' in your configuration file.
-+Please specify which remote branch you want to use on the command
-+line and try again (e.g. 'git pull <repository> <refspec>').
-+See git-pull(1) for details."; echo
- elif [ -z "$upstream" ]; then
- echo "You asked me to pull without telling me which branch you"
- echo "want to $op_type $op_prep, and 'branch.${curr_branch}.merge' in"
---
-1.7.4.1
-
View
125 ab/i18n-sh-only/0021-i18n-git-pull-rebase-against-merge-with-messages.patch
@@ -1,125 +0,0 @@
-From 43e6a9f21a8637ddd8973ed29f134e675d8da8d0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 19:22:37 +0000
-Subject: [PATCH 21/53] i18n: git-pull "rebase against" / "merge with" messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Gettextize the two messages that used "rebase against" and "merge
-with". Split them into two depending on whether we are rebasing or not.
-
-This results in some duplication, but makes it much easier for
-translators to translate these messages.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-pull.sh | 84 ++++++++++++++++++++++++++++++++++++----------------------
- 1 files changed, 52 insertions(+), 32 deletions(-)
-
-diff --git a/git-pull.sh b/git-pull.sh
-index 14d9eb5..ea87ac7 100755
---- a/git-pull.sh
-+++ b/git-pull.sh
-@@ -140,15 +140,6 @@ error_on_no_merge_candidates () {
- esac
- done
-
-- if test true = "$rebase"
-- then
-- op_type=rebase
-- op_prep=against
-- else
-- op_type=merge
-- op_prep=with
-- fi
--
- curr_branch=${curr_branch#refs/heads/}
- upstream=$(git config "branch.$curr_branch.merge")
- remote=$(git config "branch.$curr_branch.remote")
-@@ -177,30 +168,59 @@ Please specify which remote branch you want to use on the command
- line and try again (e.g. 'git pull <repository> <refspec>').
- See git-pull(1) for details."; echo
- elif [ -z "$upstream" ]; then
-- echo "You asked me to pull without telling me which branch you"
-- echo "want to $op_type $op_prep, and 'branch.${curr_branch}.merge' in"
-- echo "your configuration file does not tell me, either. Please"
-- echo "specify which branch you want to use on the command line and"
-- echo "try again (e.g. 'git pull <repository> <refspec>')."
-- echo "See git-pull(1) for details."
-- echo
-- echo "If you often $op_type $op_prep the same branch, you may want to"
-- echo "use something like the following in your configuration file:"
-- echo
-- echo " [branch \"${curr_branch}\"]"
-- echo " remote = <nickname>"
-- echo " merge = <remote-ref>"
-- test rebase = "$op_type" &&
-- echo " rebase = true"
-- echo
-- echo " [remote \"<nickname>\"]"
-- echo " url = <url>"
-- echo " fetch = <refspec>"
-- echo
-- echo "See git-config(1) for details."
-+ if test true = "$rebase"
-+ then
-+ eval_gettext "You asked me to pull without telling me which branch you
-+want to rebase against, and 'branch.\${curr_branch}.merge' in
-+your configuration file does not tell me, either. Please
-+specify which branch you want to use on the command line and
-+try again (e.g. 'git pull <repository> <refspec>').
-+See git-pull(1) for details.
-+
-+If you often rebase against the same branch, you may want to
-+use something like the following in your configuration file:
-+
-+ [branch \"\${curr_branch}\"]
-+ remote = <nickname>
-+ merge = <remote-ref>
-+ rebase = true
-+
-+ [remote \"<nickname>\"]
-+ url = <url>
-+ fetch = <refspec>
-+
-+See git-config(1) for details."; echo
-+ else
-+ eval_gettext "You asked me to pull without telling me which branch you
-+want to merge with, and 'branch.\${curr_branch}.merge' in
-+your configuration file does not tell me, either. Please
-+specify which branch you want to use on the command line and
-+try again (e.g. 'git pull <repository> <refspec>').
-+See git-pull(1) for details.
-+
-+If you often merge with the same branch, you may want to
-+use something like the following in your configuration file:
-+
-+ [branch \"\${curr_branch}\"]
-+ remote = <nickname>
-+ merge = <remote-ref>
-+
-+ [remote \"<nickname>\"]
-+ url = <url>
-+ fetch = <refspec>
-+
-+See git-config(1) for details."; echo
-+ fi
- else
-- echo "Your configuration specifies to $op_type $op_prep the ref '${upstream#refs/heads/}'"
-- echo "from the remote, but no such ref was fetched."
-+ upstream_branch="${upstream#refs/heads/}"
-+ if test true = "$rebase"
-+ then
-+ eval_gettext "Your configuration specifies to rebase against the ref '\$upstream_branch'
-+from the remote, but no such ref was fetched."; echo
-+ else
-+ eval_gettext "Your configuration specifies to merge with the ref '\$upstream_branch'
-+from the remote, but no such ref was fetched."; echo
-+ fi
- fi
- exit 1
- }
---
-1.7.4.1
-
View
28 ab/i18n-sh-only/0022-i18n-git-submodule-add-git-sh-i18n.patch
@@ -1,28 +0,0 @@
-From 6977e82fa380fea2aefdde3123e851af93dfa29e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 20:43:25 +0000
-Subject: [PATCH 22/53] i18n: git-submodule add git-sh-i18n
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-submodule.sh | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/git-submodule.sh b/git-submodule.sh
-index 3a13397..1d128f0 100755
---- a/git-submodule.sh
-+++ b/git-submodule.sh
-@@ -14,6 +14,7 @@ USAGE="[--quiet] add [-b branch] [-f|--force] [--reference <repository>] [--] <r
- or: $dashless [--quiet] sync [--] [<path>...]"
- OPTIONS_SPEC=
- . git-sh-setup
-+. git-sh-i18n
- . git-parse-remote
- require_work_tree
-
---
-1.7.4.1
-
View
38 ab/i18n-sh-only/0023-i18n-git-submodule-echo-eval_gettext-messages.patch
@@ -1,38 +0,0 @@
-From f0850dc5de27eb4cd3a21528a27db26b18c97217 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 20:26:03 +0000
-Subject: [PATCH 23/53] i18n: git-submodule echo + eval_gettext messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-submodule.sh | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/git-submodule.sh b/git-submodule.sh
-index 1d128f0..7a10a01 100755
---- a/git-submodule.sh
-+++ b/git-submodule.sh
-@@ -217,7 +217,7 @@ cmd_add()
- then
- if test -d "$path"/.git -o -f "$path"/.git
- then
-- echo "Adding existing repo at '$path' to the index"
-+ echo "$(eval_gettext "Adding existing repo at '\$path' to the index")"
- else
- die "'$path' already exists and is not a valid git repo"
- fi
-@@ -629,7 +629,7 @@ cmd_summary() {
- ;; # removed
- *)
- # unexpected type
-- echo >&2 "unexpected mode $mod_dst"
-+ echo >&2 "$(eval_gettext "unexpected mode \$mod_dst")"
- continue ;;
- esac
- fi
---
-1.7.4.1
-
View
29 ab/i18n-sh-only/0024-i18n-git-submodule-say-eval_gettext-messages.patch
@@ -1,29 +0,0 @@
-From 9e50cd767ddba47ae52da0f39a2f1267ea748050 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 20:25:45 +0000
-Subject: [PATCH 24/53] i18n: git-submodule say + eval_gettext messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-submodule.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/git-submodule.sh b/git-submodule.sh
-index 7a10a01..ba80b22 100755
---- a/git-submodule.sh
-+++ b/git-submodule.sh
-@@ -841,7 +841,7 @@ cmd_sync()
- ;;
- esac
-
-- say "Synchronizing submodule url for '$name'"
-+ say "$(eval_gettext "Synchronizing submodule url for '\$name'")"
- git config submodule."$name".url "$url"
-
- if test -e "$path"/.git
---
-1.7.4.1
-
View
175 ab/i18n-sh-only/0025-i18n-git-submodule-die-eval_gettext-messages.patch
@@ -1,175 +0,0 @@
-From bb500e91229cd465e6e6afa018a407bb5a04d5af Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 20:06:09 +0000
-Subject: [PATCH 25/53] i18n: git-submodule die + eval_gettext messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-submodule.sh | 38 +++++++++++++++++++-------------------
- 1 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/git-submodule.sh b/git-submodule.sh
-index ba80b22..dcdda53 100755
---- a/git-submodule.sh
-+++ b/git-submodule.sh
-@@ -35,7 +35,7 @@ resolve_relative_url ()
- {
- remote=$(get_default_remote)
- remoteurl=$(git config "remote.$remote.url") ||
-- die "remote ($remote) does not have a url defined in .git/config"
-+ die "$(eval_gettext "remote (\$remote) does not have a url defined in .git/config")"
- url="$1"
- remoteurl=${remoteurl%/}
- sep=/
-@@ -53,7 +53,7 @@ resolve_relative_url ()
- sep=:
- ;;
- *)
-- die "cannot strip one component off url '$remoteurl'"
-+ die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
- ;;
- esac
- ;;
-@@ -88,7 +88,7 @@ module_name()
- name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
- sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
- test -z "$name" &&
-- die "No submodule mapping found in .gitmodules for path '$path'"
-+ die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$path'")"
- echo "$name"
- }
-
-@@ -112,7 +112,7 @@ module_clone()
- else
- git-clone -n "$url" "$path"
- fi ||
-- die "Clone of '$url' into submodule path '$path' failed"
-+ die "$(eval_gettext "Clone of '\$url' into submodule path '\$path' failed")"
- }
-
- #
-@@ -185,7 +185,7 @@ cmd_add()
- realrepo=$repo
- ;;
- *)
-- die "repo URL: '$repo' must be absolute or begin with ./|../"
-+ die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")"
- ;;
- esac
-
-@@ -202,7 +202,7 @@ cmd_add()
- s|/*$||
- ')
- git ls-files --error-unmatch "$path" > /dev/null 2>&1 &&
-- die "'$path' already exists in the index"
-+ die "$(eval_gettext "'\$path' already exists in the index")"
-
- if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
- then
-@@ -219,7 +219,7 @@ cmd_add()
- then
- echo "$(eval_gettext "Adding existing repo at '\$path' to the index")"
- else
-- die "'$path' already exists and is not a valid git repo"
-+ die "$(eval_gettext "'\$path' already exists and is not a valid git repo")"
- fi
-
- case "$repo" in
-@@ -242,16 +242,16 @@ cmd_add()
- '') git checkout -f -q ;;
- ?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
- esac
-- ) || die "Unable to checkout submodule '$path'"
-+ ) || die "$(eval_gettext "Unable to checkout submodule '\$path'")"
- fi
-
- git add $force "$path" ||
-- die "Failed to add submodule '$path'"
-+ die "$(eval_gettext "Failed to add submodule '\$path'")"
-
- git config -f .gitmodules submodule."$path".path "$path" &&
- git config -f .gitmodules submodule."$path".url "$repo" &&
- git add --force .gitmodules ||
-- die "Failed to register submodule '$path'"
-+ die "$(eval_gettext "Failed to register submodule '\$path'")"
- }
-
- #
-@@ -301,7 +301,7 @@ cmd_foreach()
- cmd_foreach "--recursive" "$@"
- fi
- ) ||
-- die "Stopping at '$path'; script returned non-zero status."
-+ die "$(eval_gettext "Stopping at '\$path'; script returned non-zero status.")"
- fi
- done
- }
-@@ -344,7 +344,7 @@ cmd_init()
-
- url=$(git config -f .gitmodules submodule."$name".url)
- test -z "$url" &&
-- die "No url found for submodule path '$path' in .gitmodules"
-+ die "$(eval_gettext "No url found for submodule path '\$path' in .gitmodules")"
-
- # Possibly a url relative to parent
- case "$url" in
-@@ -354,14 +354,14 @@ cmd_init()
- esac
-
- git config submodule."$name".url "$url" ||
-- die "Failed to register url for submodule path '$path'"
-+ die "$(eval_gettext "Failed to register url for submodule path '\$path'")"
-
- upd="$(git config -f .gitmodules submodule."$name".update)"
- test -z "$upd" ||
- git config submodule."$name".update "$upd" ||
-- die "Failed to register update mode for submodule path '$path'"
-+ die "$(eval_gettext "Failed to register update mode for submodule path '\$path'")"
-
-- say "Submodule '$name' ($url) registered for path '$path'"
-+ say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$path'")"
- done
- }
-
-@@ -449,7 +449,7 @@ cmd_update()
- else
- subsha1=$(clear_local_git_env; cd "$path" &&
- git rev-parse --verify HEAD) ||
-- die "Unable to find current revision in submodule path '$path'"
-+ die "$(eval_gettext "Unable to find current revision in submodule path '\$path'")"
- fi
-
- if ! test -z "$update"
-@@ -469,7 +469,7 @@ cmd_update()
- then
- (clear_local_git_env; cd "$path" &&
- git-fetch) ||
-- die "Unable to fetch in submodule path '$path'"
-+ die "$(eval_gettext "Unable to fetch in submodule path '\$path'")"
- fi
-
- # Is this something we just cloned?
-@@ -505,7 +505,7 @@ cmd_update()
- if test -n "$recursive"
- then
- (clear_local_git_env; cd "$path" && eval cmd_update "$orig_flags") ||
-- die "Failed to recurse into submodule path '$path'"
-+ die "$(eval_gettext "Failed to recurse into submodule path '\$path'")"
- fi
- done
- }
-@@ -797,7 +797,7 @@ cmd_status()
- cd "$path" &&
- eval cmd_status "$orig_args"
- ) ||
-- die "Failed to recurse into submodule path '$path'"
-+ die "$(eval_gettext "Failed to recurse into submodule path '\$path'")"
- fi
- done
- }
---
-1.7.4.1
-
View
56 ab/i18n-sh-only/0026-i18n-git-submodule-update_module-say-die-messages.patch
@@ -1,56 +0,0 @@
-From cd79e74cfd6df0da991eb505b000391436b98c0b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 20:30:45 +0000
-Subject: [PATCH 26/53] i18n: git-submodule $update_module say + die messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Gettextize $update_module say and die messages. These messages needed
-to be split up to make them translatable.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-submodule.sh | 17 ++++++++---------
- 1 files changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/git-submodule.sh b/git-submodule.sh
-index dcdda53..c35fab0 100755
---- a/git-submodule.sh
-+++ b/git-submodule.sh
-@@ -482,24 +482,23 @@ cmd_update()
- case "$update_module" in
- rebase)
- command="git rebase"
-- action="rebase"
-- msg="rebased onto"
-+ die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$path'")"
-+ say_msg="$(eval_gettext "Submodule path '\$path': rebased into '\$sha1'")"
- ;;
- merge)
- command="git merge"
-- action="merge"
-- msg="merged in"
-+ die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$path'")"
-+ say_msg="$(eval_gettext "Submodule path '\$path': merged in '\$sha1'")"
- ;;
- *)
- command="git checkout $force -q"
-- action="checkout"
-- msg="checked out"
-+ die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$path'")"
-+ say_msg="$(eval_gettext "Submodule path '\$path': checked out '\$sha1'")"
- ;;
- esac
-
-- (clear_local_git_env; cd "$path" && $command "$sha1") ||
-- die "Unable to $action '$sha1' in submodule path '$path'"
-- say "Submodule path '$path': $msg '$sha1'"
-+ (clear_local_git_env; cd "$path" && $command "$sha1") || die $die_msg
-+ say $say_msg
- fi
-
- if test -n "$recursive"
---
-1.7.4.1
-
View
34 ab/i18n-sh-only/0027-i18n-git-submodule-cached-cannot-be-used-message.patch
@@ -1,34 +0,0 @@
-From 9025cacebb814611c42aa1c81e7a2148faf1be5b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 20:07:45 +0000
-Subject: [PATCH 27/53] i18n: git-submodule "cached cannot be used" message
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Gettextize the "--cached cannot be used with --files" message. Since
-this message starts with "--" we have to pass "--" as the first
-argument. This works with both GNU gettext 0.18.1 (as expected), and
-the gettext(1) on Solaris 10.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-submodule.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/git-submodule.sh b/git-submodule.sh
-index c35fab0..28523b7 100755
---- a/git-submodule.sh
-+++ b/git-submodule.sh
-@@ -588,7 +588,7 @@ cmd_summary() {
- if [ -n "$files" ]
- then
- test -n "$cached" &&
-- die "--cached cannot be used with --files"
-+ die "$(gettext -- "--cached cannot be used with --files")"
- diff_cmd=diff-files
- head=
- fi
---
-1.7.4.1
-
View
50 ab/i18n-sh-only/0028-i18n-git-submodule-Submodule-change-.-messages.patch
@@ -1,50 +0,0 @@
-From 5fcfc6121a67b6b8a6f35804cedf85118082059b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 20:25:16 +0000
-Subject: [PATCH 28/53] i18n: git-submodule "Submodule change[...]" messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Gettextize the "Submodules changed but not updated" and "Submodule
-changes to be committed" messages. This is explicitly tested for so we
-need to skip some tests with C_LOCALE_OUTPUT.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-submodule.sh | 4 ++--
- t/t7401-submodule-summary.sh | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/git-submodule.sh b/git-submodule.sh
-index 28523b7..5fe29a2 100755
---- a/git-submodule.sh
-+++ b/git-submodule.sh
-@@ -713,9 +713,9 @@ cmd_summary() {
- done |
- if test -n "$for_status"; then
- if [ -n "$files" ]; then
-- echo "# Submodules changed but not updated:"
-+ gettext "# Submodules changed but not updated:"; echo
- else
-- echo "# Submodule changes to be committed:"
-+ gettext "# Submodule changes to be committed:"; echo
- fi
- echo "#"
- sed -e 's|^|# |' -e 's|^# $|#|'
-diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh
-index 7d7fde0..efd220b 100755
---- a/t/t7401-submodule-summary.sh
-+++ b/t/t7401-submodule-summary.sh
-@@ -226,7 +226,7 @@ EOF
- test_cmp expected actual
- "
-
--test_expect_success '--for-status' "
-+test_expect_success C_LOCALE_OUTPUT '--for-status' "
- git submodule summary --for-status HEAD^ >actual &&
- test_cmp actual - <<EOF
- # Submodule changes to be committed:
---
-1.7.4.1
-
View
55 ab/i18n-sh-only/0029-i18n-git-submodule-errmsg-messages.patch
@@ -1,55 +0,0 @@
-From 0ebae7c708528ff9f04040fc8a9e5e5cbc3c55bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 20:34:08 +0000
-Subject: [PATCH 29/53] i18n: git-submodule $errmsg messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Gettextize warning messages stored in the $errmsg variable using
-eval_gettext interpolation. This is explicitly tested for so we need
-to skip some tests with C_LOCALE_OUTPUT.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-submodule.sh | 6 +++---
- t/t7401-submodule-summary.sh | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/git-submodule.sh b/git-submodule.sh
-index 5fe29a2..b6c9a5b 100755
---- a/git-submodule.sh
-+++ b/git-submodule.sh
-@@ -646,13 +646,13 @@ cmd_summary() {
- total_commits=
- case "$missing_src,$missing_dst" in
- t,)
-- errmsg=" Warn: $name doesn't contain commit $sha1_src"
-+ errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_src")"
- ;;
- ,t)
-- errmsg=" Warn: $name doesn't contain commit $sha1_dst"
-+ errmsg="$(eval_gettext " Warn: \$name doesn't contain commit \$sha1_dst")"
- ;;
- t,t)
-- errmsg=" Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
-+ errmsg="$(eval_gettext " Warn: \$name doesn't contain commits \$sha1_src and \$sha1_dst")"
- ;;
- *)
- errmsg=
-diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh
-index efd220b..1b703fb 100755
---- a/t/t7401-submodule-summary.sh
-+++ b/t/t7401-submodule-summary.sh
-@@ -155,7 +155,7 @@ EOF
- rm -f sm1 &&
- test_create_repo sm1 &&
- head6=$(add_file sm1 foo6 foo7)
--test_expect_success 'nonexistent commit' "
-+test_expect_success C_LOCALE_OUTPUT 'nonexistent commit' "
- git submodule summary >actual &&
- cat >expected <<-EOF &&
- * sm1 $head4...$head6:
---
-1.7.4.1
-
View
55 ab/i18n-sh-only/0030-i18n-git-submodule-Entering-.-message.patch
@@ -1,55 +0,0 @@
-From 38bac978d09fb7dacc53ba04df20caed974e2d99 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 20:25:45 +0000
-Subject: [PATCH 30/53] i18n: git-submodule "Entering [...]" message
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Gettextize the "Entering [...]" message. This is explicitly tested for
-so we need to skip some tests with C_LOCALE_OUTPUT.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-submodule.sh | 2 +-
- t/t7407-submodule-foreach.sh | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/git-submodule.sh b/git-submodule.sh
-index b6c9a5b..fceacf8 100755
---- a/git-submodule.sh
-+++ b/git-submodule.sh
-@@ -289,7 +289,7 @@ cmd_foreach()
- do
- if test -e "$path"/.git
- then
-- say "Entering '$prefix$path'"
-+ say "$(eval_gettext "Entering '\$prefix\$path'")"
- name=$(module_name "$path")
- (
- prefix="$prefix$path/"
-diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
-index e5be13c..4aa2d34 100755
---- a/t/t7407-submodule-foreach.sh
-+++ b/t/t7407-submodule-foreach.sh
-@@ -68,7 +68,7 @@ Entering 'sub3'
- $pwd/clone-foo3-sub3-$sub3sha1
- EOF
-
--test_expect_success 'test basic "submodule foreach" usage' '
-+test_expect_success C_LOCALE_OUTPUT 'test basic "submodule foreach" usage' '
- git clone super clone &&
- (
- cd clone &&
-@@ -153,7 +153,7 @@ Entering 'sub2'
- Entering 'sub3'
- EOF
-
--test_expect_success 'test messages from "foreach --recursive"' '
-+test_expect_success C_LOCALE_OUTPUT 'test messages from "foreach --recursive"' '
- (
- cd clone2 &&
- git submodule foreach --recursive "true" > ../actual
---
-1.7.4.1
-
View
51 ab/i18n-sh-only/0031-i18n-git-submodule-.-path-is-ignored-message.patch
@@ -1,51 +0,0 @@
-From 65d9b133f5153a1fe4233975559372b120ce8427 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 20:14:24 +0000
-Subject: [PATCH 31/53] i18n: git-submodule "[...] path is ignored" message
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Gettextize the "The following path is ignored" message. This is
-explicitly tested for so we need to skip some tests with
-C_LOCALE_OUTPUT.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-submodule.sh | 6 +++---
- t/t7400-submodule-basic.sh | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/git-submodule.sh b/git-submodule.sh
-index fceacf8..43a10e2 100755
---- a/git-submodule.sh
-+++ b/git-submodule.sh
-@@ -206,9 +206,9 @@ cmd_add()
-
- if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
- then
-- echo >&2 "The following path is ignored by one of your .gitignore files:" &&
-- echo >&2 $path &&
-- echo >&2 "Use -f if you really want to add it."
-+ echo >&2 "$(eval_gettext "The following path is ignored by one of your .gitignore files:
-+\$path
-+Use -f if you really want to add it.")"
- exit 1
- fi
-
-diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
-index 874279e..1911688 100755
---- a/t/t7400-submodule-basic.sh
-+++ b/t/t7400-submodule-basic.sh
-@@ -86,7 +86,7 @@ test_expect_success 'submodule add' '
- test_cmp empty untracked
- '
-
--test_expect_success 'submodule add to .gitignored path fails' '
-+test_expect_success C_LOCALE_OUTPUT 'submodule add to .gitignored path fails' '
- (
- cd addtest-ignore &&
- cat <<-\EOF >expect &&
---
-1.7.4.1
-
View
49 ab/i18n-sh-only/0032-i18n-git-submodule-path-not-initialized-message.patch
@@ -1,49 +0,0 @@
-From 7a682fdbe13616be77f54596a23eb5fd9329584c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 20:25:45 +0000
-Subject: [PATCH 32/53] i18n: git-submodule "path not initialized" message
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Gettextize the "Submodule path '$path' not initialized" message. This
-is explicitly tested for so we need to skip some tests with
-C_LOCALE_OUTPUT.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-submodule.sh | 4 ++--
- t/t7400-submodule-basic.sh | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/git-submodule.sh b/git-submodule.sh
-index 43a10e2..bc24b2f 100755
---- a/git-submodule.sh
-+++ b/git-submodule.sh
-@@ -436,8 +436,8 @@ cmd_update()
- # Only mention uninitialized submodules when its
- # path have been specified
- test "$#" != "0" &&
-- say "Submodule path '$path' not initialized" &&
-- say "Maybe you want to use 'update --init'?"
-+ say "$(eval_gettext "Submodule path '\$path' not initialized
-+Maybe you want to use 'update --init'?")"
- continue
- fi
-
-diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
-index 1911688..eded7e9 100755
---- a/t/t7400-submodule-basic.sh
-+++ b/t/t7400-submodule-basic.sh
-@@ -349,7 +349,7 @@ test_expect_success 'apply submodule diff' '
- test_cmp empty staged
- '
-
--test_expect_success 'update --init' '
-+test_expect_success C_LOCALE_OUTPUT 'update --init' '
- mv init init2 &&
- git config -f .gitmodules submodule.example.url "$(pwd)/init2" &&
- git config --remove-section submodule.example &&
---
-1.7.4.1
-
View
82 ab/i18n-sh-only/0033-i18n-git-submodule-blob-and-submodule-messages.patch
@@ -1,82 +0,0 @@
-From 6e67bddcada7919fdfb8bc6ee16e2dcb09d60eaf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Mon, 13 Sep 2010 20:36:51 +0000
-Subject: [PATCH 33/53] i18n: git-submodule "blob" and "submodule" messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Gettextize the words "blob" and "submodule", which will be
-interpolated in a message emitted by git-submodule. This is
-explicitly tested for so we need to skip some tests with
-C_LOCALE_OUTPUT.
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-submodule.sh | 6 ++++--
- t/t7401-submodule-summary.sh | 8 ++++----
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/git-submodule.sh b/git-submodule.sh
-index bc24b2f..aced079 100755
---- a/git-submodule.sh
-+++ b/git-submodule.sh
-@@ -677,11 +677,13 @@ cmd_summary() {
- sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
- if test $status = T
- then
-+ blob="$(gettext "blob")"
-+ submodule="$(gettext "submodule")"
- if test $mod_dst = 160000
- then
-- echo "* $name $sha1_abbr_src(blob)->$sha1_abbr_dst(submodule)$total_commits:"
-+ echo "* $name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:"
- else
-- echo "* $name $sha1_abbr_src(submodule)->$sha1_abbr_dst(blob)$total_commits:"
-+ echo "* $name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:"
- fi
- else
- echo "* $name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
-diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh
-index 1b703fb..548473b 100755
---- a/t/t7401-submodule-summary.sh
-+++ b/t/t7401-submodule-summary.sh
-@@ -121,7 +121,7 @@ git add sm1 &&
- rm -f sm1 &&
- mv sm1-bak sm1
-
--test_expect_success 'typechanged submodule(submodule->blob), --cached' "
-+test_expect_success C_LOCALE_OUTPUT 'typechanged submodule(submodule->blob), --cached' "
- git submodule summary --cached >actual &&
- cat >expected <<-EOF &&
- * sm1 $head4(submodule)->$head5(blob) (3):
-@@ -131,7 +131,7 @@ EOF
- test_cmp actual expected
- "
-
--test_expect_success 'typechanged submodule(submodule->blob), --files' "
-+test_expect_success C_LOCALE_OUTPUT 'typechanged submodule(submodule->blob), --files' "
- git submodule summary --files >actual &&
- cat >expected <<-EOF &&
- * sm1 $head5(blob)->$head4(submodule) (3):
-@@ -143,7 +143,7 @@ EOF
-
- rm -rf sm1 &&
- git checkout-index sm1
--test_expect_success 'typechanged submodule(submodule->blob)' "
-+test_expect_success C_LOCALE_OUTPUT 'typechanged submodule(submodule->blob)' "
- git submodule summary >actual &&
- cat >expected <<-EOF &&
- * sm1 $head4(submodule)->$head5(blob):
-@@ -166,7 +166,7 @@ EOF
- "
-
- commit_file
--test_expect_success 'typechanged submodule(blob->submodule)' "
-+test_expect_success C_LOCALE_OUTPUT 'typechanged submodule(blob->submodule)' "
- git submodule summary >actual &&
- cat >expected <<-EOF &&
- * sm1 $head5(blob)->$head6(submodule) (2):
---
-1.7.4.1
-
View
28 ab/i18n-sh-only/0034-i18n-git-stash-add-git-sh-i18n.patch
@@ -1,28 +0,0 @@
-From 017365688aa22ffac937da9804cc318bc0eb193c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Tue, 14 Sep 2010 11:17:26 +0000
-Subject: [PATCH 34/53] i18n: git-stash add git-sh-i18n
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-stash.sh | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/git-stash.sh b/git-stash.sh
-index a305fb1..ff18364 100755
---- a/git-stash.sh
-+++ b/git-stash.sh
-@@ -14,6 +14,7 @@ SUBDIRECTORY_OK=Yes
- OPTIONS_SPEC=
- START_DIR=`pwd`
- . git-sh-setup
-+. git-sh-i18n
- require_work_tree
- cd_to_toplevel
-
---
-1.7.4.1
-
View
29 ab/i18n-sh-only/0035-i18n-git-stash-echo-gettext-message.patch
@@ -1,29 +0,0 @@
-From aafc156d2fb0bea1ae430c826023f264c2acaaf9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Tue, 14 Sep 2010 11:43:41 +0000
-Subject: [PATCH 35/53] i18n: git-stash echo + gettext message
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-stash.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/git-stash.sh b/git-stash.sh
-index ff18364..9259f13 100755
---- a/git-stash.sh
-+++ b/git-stash.sh
-@@ -401,7 +401,7 @@ apply_stash () {
- status=$?
- if test -n "$INDEX_OPTION"
- then
-- echo >&2 'Index was not unstashed.'
-+ echo >&2 "$(gettext "Index was not unstashed.")"
- fi
- exit $status
- fi
---
-1.7.4.1
-
View
38 ab/i18n-sh-only/0036-i18n-git-stash-say-gettext-messages.patch
@@ -1,38 +0,0 @@
-From b6de2ef7e29652c3d91c26751c0446d08d97fad6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Tue, 14 Sep 2010 11:42:53 +0000
-Subject: [PATCH 36/53] i18n: git-stash say + gettext messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-stash.sh | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/git-stash.sh b/git-stash.sh
-index 9259f13..1fe8918 100755
---- a/git-stash.sh
-+++ b/git-stash.sh
-@@ -167,7 +167,7 @@ save_stash () {
- git update-index -q --refresh
- if no_changes
- then
-- say 'No local changes to save'
-+ say "$(gettext "No local changes to save")"
- exit 0
- fi
- test -f "$GIT_DIR/logs/$ref_stash" ||
-@@ -496,7 +496,7 @@ branch)
- case $# in
- 0)
- save_stash &&
-- say '(To restore them type "git stash apply")'
-+ say "$(gettext "(To restore them type \"git stash apply\")")"
- ;;
- *)
- usage
---
-1.7.4.1
-
View
163 ab/i18n-sh-only/0037-i18n-git-stash-die-gettext-messages.patch
@@ -1,163 +0,0 @@
-From 35dc4bd312fda4364f763b7d971f8a029ab916da Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= <avarab@gmail.com>
-Date: Tue, 14 Sep 2010 11:19:41 +0000
-Subject: [PATCH 37/53] i18n: git-stash die + gettext messages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
----
- git-stash.sh | 36 ++++++++++++++++++------------------
- 1 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/git-stash.sh b/git-stash.sh
-index 1fe8918..753ddf2 100755
---- a/git-stash.sh
-+++ b/git-stash.sh
-@@ -40,7 +40,7 @@ no_changes () {
- clear_stash () {
- if test $# != 0