From: "Mathieu Liénard--Mayor" <mathieu.lienard--mayor@ensimag.fr>
To: Mathieu Lienard--Mayor <Mathieu.Lienard--Mayor@ensimag.imag.fr>
Cc: <git@vger.kernel.org>, <gitster@pobox.com>,
Jorge Juan Garcia Garcia
<Jorge-Juan.Garcia-Garcia@ensimag.imag.fr>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: Re: [PATCH 2/2] rm: introduce advice.rmHints to shorten messages
Date: Mon, 10 Jun 2013 14:54:23 +0200 [thread overview]
Message-ID: <18c54938bf29444008aec7b3e48912dc@ensibm.imag.fr> (raw)
In-Reply-To: <1370868700-27189-2-git-send-email-Mathieu.Lienard--Mayor@ensimag.imag.fr>
Please ignore this, manipulation error while in the git send-email
command line.
Le 2013-06-10 14:51, Mathieu Lienard--Mayor a écrit :
> Introduce advice.rmHints to choose whether to display advice or not
> when git rm fails. Defaults to true, in order to preserve current
> behavior.
>
> As an example, the message:
> error: 'foo.txt' has changes staged in the index
> (use --cached to keep the file, or -f to force removal)
>
> would look like, with advice.rmHints=false:
> error: 'foo.txt' has changes staged in the index
>
> Signed-off-by: Mathieu Lienard--Mayor
> <Mathieu.Lienard--Mayor@ensimag.imag.fr>
> Signed-off-by: Jorge Juan Garcia Garcia
> <Jorge-Juan.Garcia-Garcia@ensimag.imag.fr>
> Signed-off-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
> ---
> Documentation/config.txt | 3 ++
> advice.c | 2 +
> advice.h | 1 +
> builtin/rm.c | 36 ++++++++++++---------
> t/t3600-rm.sh | 77
> ++++++++++++++++++++++++++++++++++++++++++++++
> 5 files changed, 104 insertions(+), 15 deletions(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 6e53fc5..eb04479 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -199,6 +199,9 @@ advice.*::
> amWorkDir::
> Advice that shows the location of the patch file when
> linkgit:git-am[1] fails to apply it.
> + rmHints::
> + In case of failure in the output of linkgit:git-rm[1],
> + show directions on how to proceed from the current state.
> --
>
> core.fileMode::
> diff --git a/advice.c b/advice.c
> index a8deee6..a4c169c 100644
> --- a/advice.c
> +++ b/advice.c
> @@ -14,6 +14,7 @@ int advice_resolve_conflict = 1;
> int advice_implicit_identity = 1;
> int advice_detached_head = 1;
> int advice_set_upstream_failure = 1;
> +int advice_rm_hints = 1;
>
> static struct {
> const char *name;
> @@ -33,6 +34,7 @@ static struct {
> { "implicitidentity", &advice_implicit_identity },
> { "detachedhead", &advice_detached_head },
> { "setupstreamfailure", &advice_set_upstream_failure },
> + { "rmhints", &advice_rm_hints },
>
> /* make this an alias for backward compatibility */
> { "pushnonfastforward", &advice_push_update_rejected }
> diff --git a/advice.h b/advice.h
> index 94caa32..36104c4 100644
> --- a/advice.h
> +++ b/advice.h
> @@ -17,6 +17,7 @@ extern int advice_resolve_conflict;
> extern int advice_implicit_identity;
> extern int advice_detached_head;
> extern int advice_set_upstream_failure;
> +extern int advice_rm_hints;
>
> int git_default_advice_config(const char *var, const char *value);
> void advise(const char *advice, ...);
> diff --git a/builtin/rm.c b/builtin/rm.c
> index 1bff656..c9081cd 100644
> --- a/builtin/rm.c
> +++ b/builtin/rm.c
> @@ -62,9 +62,11 @@ static int check_submodules_use_gitfiles(void)
>
> if (!submodule_uses_gitfile(name))
> errs = error(_("submodule '%s' (or one of its nested "
> - "submodules) uses a .git directory\n"
> - "(use 'rm -rf' if you really want to remove "
> - "it including all of its history)"), name);
> + "submodules) uses a .git directory%s"), name,
> + advice_rm_hints
> + ? "\n(use 'rm -rf' if you really want to remove "
> + "it including all of its history)"
> + : "");
> }
>
> return errs;
> @@ -204,8 +206,9 @@ static int check_local_mod(unsigned char *head,
> int index_only)
> "\n %s",
> files_staged.items[j].string);
> }
> - strbuf_addstr(&msg_staged,
> - "\n(use -f to force removal)");
> + if (advice_rm_hints)
> + strbuf_addstr(&msg_staged,
> + "\n(use -f to force removal)");
> errs = error(_("%s"), msg_staged.buf);
> }
> if (files_cached.nr) {
> @@ -220,9 +223,10 @@ static int check_local_mod(unsigned char *head,
> int index_only)
> "\n %s",
> files_cached.items[j].string);
> }
> - strbuf_addstr(&msg_cached,
> - "\n(use --cached to keep the file, "
> - "or -f to force removal)");
> + if (advice_rm_hints)
> + strbuf_addstr(&msg_cached,
> + "\n(use --cached to keep the file, "
> + "or -f to force removal)");
> errs = error(_("%s"), msg_cached.buf);
> }
> if (files_submodule.nr) {
> @@ -237,10 +241,11 @@ static int check_local_mod(unsigned char *head,
> int index_only)
> "\n %s",
> files_submodule.items[j].string);
> }
> - strbuf_addstr(&msg_sub,
> - "\n(use 'rm -rf' if you really want "
> - "to remove i including all "
> - "of its history)");
> + if (advice_rm_hints)
> + strbuf_addstr(&msg_sub,
> + "\n(use 'rm -rf' if you really want "
> + "to remove i including all "
> + "of its history)");
> errs = error(_("%s"), msg_sub.buf);
> }
> if (files_local.nr) {
> @@ -253,9 +258,10 @@ static int check_local_mod(unsigned char *head,
> int index_only)
> "\n %s",
> files_local.items[j].string);
> }
> - strbuf_addstr(&msg_local,
> - "\n(use --cached to keep the file, "
> - "or -f to force removal)");
> + if (advice_rm_hints)
> + strbuf_addstr(&msg_local,
> + "\n(use --cached to keep the file, "
> + "or -f to force removal)");
> errs = error(_("%s"), msg_local.buf);
> }
>
> diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
> index 0c44e9f..ab10cc6 100755
> --- a/t/t3600-rm.sh
> +++ b/t/t3600-rm.sh
> @@ -687,4 +687,81 @@ test_expect_failure SYMLINKS 'rm across a
> symlinked leading path (w/ index)' '
> test_path_is_file e/f
> '
>
> +test_expect_success 'setup for testing rm messages' '
> + >bar.txt &&
> + >foo.txt &&
> + git add bar.txt foo.txt
> +'
> +
> +test_expect_success 'rm files with different staged content' '
> + cat >expect << EOF &&
> +error: the following files have staged content different from both
> the
> +file and the HEAD:
> + bar.txt
> + foo.txt
> +(use -f to force removal)
> +EOF
> + echo content1 >foo.txt &&
> + echo content1 >bar.txt &&
> + test_must_fail git rm foo.txt bar.txt 2>actual &&
> + test_cmp expect actual
> +'
> +
> +test_expect_success 'rm files with different staged content without
> hints' '
> + cat >expect << EOF &&
> +error: the following files have staged content different from both
> the
> +file and the HEAD:
> + bar.txt
> + foo.txt
> +EOF
> + echo content2 >foo.txt &&
> + echo content2 >bar.txt &&
> + test_must_fail git -c advice.rmhints=false rm foo.txt bar.txt
> 2>actual &&
> + test_cmp expect actual
> +'
> +
> +test_expect_success 'rm file with local modification' '
> + cat >expect << EOF &&
> +error: the following files have local modifications:
> + foo.txt
> +(use --cached to keep the file, or -f to force removal)
> +EOF
> + git commit -m "testing rm 3" &&
> + echo content3 >foo.txt &&
> + test_must_fail git rm foo.txt 2>actual &&
> + test_cmp expect actual
> +'
> +
> +test_expect_success 'rm file with local modification without hints'
> '
> + cat >expect << EOF &&
> +error: the following files have local modifications:
> + bar.txt
> +EOF
> + echo content4 >bar.txt &&
> + test_must_fail git -c advice.rmhints=false rm bar.txt 2>actual &&
> + test_cmp expect actual
> +'
> +
> +test_expect_success 'rm file with changes in the index' '
> + cat >expect << EOF &&
> +error: the following files have changes staged in the index:
> + foo.txt
> +(use --cached to keep the file, or -f to force removal)
> +EOF
> + git reset --hard &&
> + echo content5 >foo.txt &&
> + git add foo.txt &&
> + test_must_fail git rm foo.txt 2>actual &&
> + test_cmp expect actual
> +'
> +
> +test_expect_success 'rm file with changes in the index without
> hints' '
> + cat >expect << EOF &&
> +error: the following files have changes staged in the index:
> + foo.txt
> +EOF
> + test_must_fail git -c advice.rmhints=false rm foo.txt 2>actual &&
> + test_cmp expect actual
> +'
> +
> test_done
--
Mathieu Liénard--Mayor,
2nd year at Grenoble INP - ENSIMAG
(+33)6 80 56 30 02
next prev parent reply other threads:[~2013-06-10 12:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-10 12:51 [PATCH 1/2] rm: better error message on failure for multiple files Mathieu Lienard--Mayor
2013-06-10 12:51 ` [PATCH 2/2] rm: introduce advice.rmHints to shorten messages Mathieu Lienard--Mayor
2013-06-10 12:54 ` Mathieu Liénard--Mayor [this message]
2013-06-10 16:57 ` Junio C Hamano
2013-06-10 17:17 ` Mathieu Liénard--Mayor
2013-06-10 12:53 ` [PATCH 1/2] rm: better error message on failure for multiple files Mathieu Liénard--Mayor
-- strict thread matches above, loose matches on Subject: below --
2013-06-12 8:06 [PATCH v5 " Mathieu Lienard--Mayor
2013-06-12 8:06 ` [PATCH 2/2] rm: introduce advice.rmHints to shorten messages Mathieu Lienard--Mayor
[not found] <1370874127-4326-1-git-send-email-Mathieu.Lienard--Mayor@ensimag.imag.fr>
2013-06-10 14:22 ` Mathieu Lienard--Mayor
2013-06-08 8:33 [PATCH 1/2] rm: better error message on failure for multiple files Mathieu Lienard--Mayor
2013-06-08 8:33 ` [PATCH 2/2] rm: introduce advice.rmHints to shorten messages Mathieu Lienard--Mayor
2013-06-08 14:01 ` Ramkumar Ramachandra
2013-06-10 7:52 ` Mathieu Liénard--Mayor
2013-06-10 7:55 ` Ramkumar Ramachandra
2013-06-10 8:24 ` Matthieu Moy
2013-06-10 8:26 ` Ramkumar Ramachandra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=18c54938bf29444008aec7b3e48912dc@ensibm.imag.fr \
--to=mathieu.lienard--mayor@ensimag.fr \
--cc=Jorge-Juan.Garcia-Garcia@ensimag.imag.fr \
--cc=Mathieu.Lienard--Mayor@ensimag.imag.fr \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).