Re: redundant message in builtin/rm.c
Junio C Hamano writes: > Thanks both. Perhaps we should do something like this? > > -- >8 -- > Subject: builtin/rm.c: consolidate error reporting for removing submodules Sounds good, yes. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: redundant message in builtin/rm.c
Ralf Thielow writes:
> It's more readable if "\n" is at the end of a line.
>
> Q_("the following submodule (or one of its nested submodules)\n"
> "uses a .git directory:"
Thanks both. Perhaps we should do something like this?
-- >8 --
Subject: builtin/rm.c: consolidate error reporting for removing submodules
We have two (not identical) copies of error reporting when
attempting to remove submodules that have their repositories
embedded within them. Add a helper function so that we do not have
to repeat similar error messages with subtly different wording
without a good reason.
Noticed by Jiang Xin.
Signed-off-by: Junio C Hamano
---
builtin/rm.c | 41 -
1 file changed, 20 insertions(+), 21 deletions(-)
diff --git a/builtin/rm.c b/builtin/rm.c
index 5d0c068..694568a 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -57,6 +57,21 @@ static void print_error_files(struct string_list *files_list,
}
}
+static void error_removing_concrete_submodules(struct string_list *files, int
*errs)
+{
+ print_error_files(files,
+ Q_("the following submodule (or one of its nested "
+"submodules)\n"
+"uses a .git directory:",
+"the following submodules (or one of its nested "
+"submodules)\n"
+"use a .git directory:", files->nr),
+ _("\n(use 'rm -rf' if you really want to remove "
+ "it including all of its history)"),
+ errs);
+ string_list_clear(files, 0);
+}
+
static int check_submodules_use_gitfiles(void)
{
int i;
@@ -85,16 +100,8 @@ static int check_submodules_use_gitfiles(void)
if (!submodule_uses_gitfile(name))
string_list_append(&files, name);
}
- print_error_files(&files,
- Q_("the following submodule (or one of its nested "
-"submodules)\n uses a .git directory:",
-"the following submodules (or one of its nested "
-"submodules)\n use a .git directory:",
-files.nr),
- _("\n(use 'rm -rf' if you really want to remove "
- "it including all of its history)"),
- &errs);
- string_list_clear(&files, 0);
+
+ error_removing_concrete_submodules(&files, &errs);
return errs;
}
@@ -236,17 +243,9 @@ static int check_local_mod(unsigned char *head, int
index_only)
" or -f to force removal)"),
&errs);
string_list_clear(&files_cached, 0);
- print_error_files(&files_submodule,
- Q_("the following submodule (or one of its nested "
-"submodule)\nuses a .git directory:",
-"the following submodules (or one of its nested "
-"submodule)\nuse a .git directory:",
-files_submodule.nr),
- _("\n(use 'rm -rf' if you really "
- "want to remove it including all "
- "of its history)"),
- &errs);
- string_list_clear(&files_submodule, 0);
+
+ error_removing_concrete_submodules(&files_submodule, &errs);
+
print_error_files(&files_local,
Q_("the following file has local modifications:",
"the following files have local modifications:",
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: redundant message in builtin/rm.c
2013/7/26 Jiang Xin :
> Hi,
>
> Commit v1.8.3-1-g914dc02 (rm: better error message on failure for
> multiple files)
> introduced many messages need to be translated. I found two similar messages
> each has a slight typo, and the differences cause redundant works for
> l10n translators.
>
> # builtin/rm.c, line: 90
>
> Q_("the following submodule (or one of its nested "
> "submodules)\n uses a .git directory:",
> "the following submodules (or one of its nested "
> "submodules)\n use a .git directory:",
>
> ( no space before "use(s) a .git directory" ?)
>
> # builtin/rm.c, line: 240
>
> Q_("the following submodule (or one of its nested "
> "submodule)\nuses a .git directory:",
> "the following submodules (or one of its nested "
> "submodule)\nuse a .git directory:",
>
> ( "nested submodule" should be "nested submodules" ?)
>
It's more readable if "\n" is at the end of a line.
Q_("the following submodule (or one of its nested submodules)\n"
"uses a .git directory:"
> --
> Jiang Xin
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
redundant message in builtin/rm.c
Hi,
Commit v1.8.3-1-g914dc02 (rm: better error message on failure for
multiple files)
introduced many messages need to be translated. I found two similar messages
each has a slight typo, and the differences cause redundant works for
l10n translators.
# builtin/rm.c, line: 90
Q_("the following submodule (or one of its nested "
"submodules)\n uses a .git directory:",
"the following submodules (or one of its nested "
"submodules)\n use a .git directory:",
( no space before "use(s) a .git directory" ?)
# builtin/rm.c, line: 240
Q_("the following submodule (or one of its nested "
"submodule)\nuses a .git directory:",
"the following submodules (or one of its nested "
"submodule)\nuse a .git directory:",
( "nested submodule" should be "nested submodules" ?)
--
Jiang Xin
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
