From: "Mathieu Liénard--Mayor" <mathieu.lienard--mayor@ensimag.fr>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: Mathieu Lienard--Mayor <Mathieu.Lienard--Mayor@ensimag.imag.fr>,
<git@vger.kernel.org>, <gitster@pobox.com>,
Jorge Juan Garcia Garcia
<Jorge-Juan.Garcia-Garcia@ensimag.imag.fr>
Subject: Re: [PATCH v2 1/2] rm: better error message on failure for multiple files
Date: Mon, 10 Jun 2013 16:57:00 +0200 [thread overview]
Message-ID: <580989b4b95a7302a42c7f25024c3375@ensibm.imag.fr> (raw)
In-Reply-To: <vpqtxl6ghf5.fsf@anie.imag.fr>
Le 2013-06-10 16:38, Matthieu Moy a écrit :
> Mathieu Lienard--Mayor <Mathieu.Lienard--Mayor@ensimag.imag.fr>
> writes:
>
>> When 'git rm' fails, it now displays a single message
>> with the list of files involved, instead of displaying
>> a list of messages with one file each.
>>
>> As an example, the old message:
>> error: 'foo.txt' has changes staged in the index
>> (use --cached to keep the file, or -f to force removal)
>> error: 'bar.txt' has changes staged in the index
>> (use --cached to keep the file, or -f to force removal)
>>
>> would now be displayed as:
>> error: the following files have changes staged in the index:
>> foo.txt
>> bar.txt
>> (use --cached to keep the file, or -f to force removal)
>>
>> 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>list
>
> There's a "list" after my email, probably a typo.
yes, that's a leftover from a rebase-i
>
>> +/*
>> + * PRECONDITION: files_list is a non-empty string_list
>> + */
>
> Avoid repeating in comments what the code already says. "file_list is
> non-empty" is sufficient, we already know it's a string_list.
Okay
>
>> + if (files_staged.nr)
>> + errs = print_error_files(&files_staged,
>> + _("the following files have staged "
>> + "content different from both the"
>> + "\nfile and the HEAD:"),
>> + _("\n(use -f to force removal)"));
>> + if (files_cached.nr)
>> + errs = print_error_files(&files_cached,
>> + _("the following files have changes "
>> + "staged in the index:"),
>> + _("\n(use --cached to keep the file, "
>> + "or -f to force removal)"));
>
> What happens if both conditions are true? It seems the second will
> override the first. I think it'd be OK because what matters is that
> errs
> is set by someone, no matter who, and the error message is displayed
> on
> screen, not contained in the variable, but this looks weird.
>
> I'd find it more readable with "errs |= print_error_files(...)".
Well the current code is only using errs=error(...), using the same
variable errs over and over, no matter how many times it loops.
That's why i implemented it similarly.
>
> And actually, you may want to move the if (....nr) inside
> print_error_files (wich could then be called
> print_error_files_maybe).
>
> At least, there should be a test where two conditions are true.
I'll do that, to be sure about the behaviour.
>
>> + if (files_submodule.nr)
>> + errs = print_error_files(&files_submodule,
>> + _("the following submodules (or one "
>> + "of its nested submodule) use a "
>> + ".git directory:"),
>> + _("\n(use 'rm -rf' if you really "
>> + "want to remove i including all "
>
> i -> it
> ?
--
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 14:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1370874127-4326-1-git-send-email-Mathieu.Lienard--Mayor@ensimag.imag.fr>
2013-06-10 14:22 ` [PATCH 2/2] rm: introduce advice.rmHints to shorten messages Mathieu Lienard--Mayor
2013-06-10 14:38 ` [PATCH v2 1/2] rm: better error message on failure for multiple files Matthieu Moy
2013-06-10 14:57 ` Mathieu Liénard--Mayor [this message]
2013-06-10 15:08 ` Matthieu Moy
2013-06-10 14:28 Mathieu Lienard--Mayor
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=580989b4b95a7302a42c7f25024c3375@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).