From: Bart Schaefer <schaefer@brasslantern.com>
To: zsh-workers@zsh.org
Subject: Re: HIST_IGNORE_DUPS also ignores command lines that differ by a space between quotes
Date: Wed, 20 Mar 2024 10:46:44 -0700 [thread overview]
Message-ID: <CAH+w=7YdYNUOaAZimuc02DvumHwVJdWYEATocc-ku95-DNAZig@mail.gmail.com> (raw)
In-Reply-To: <20240319123444.GB4811@qaa.vinc17.org>
On Tue, Mar 19, 2024 at 5:34 AM Vincent Lefevre <vincent@vinc17.net> wrote:
>
> On 2024-03-19 12:08:26 +0100, Mikael Magnusson wrote:
> > and in hashtable.c (weird place for it):
> > /* Compare two strings with normalized white-space */
>
> It is placed in hashtable.c perhaps because of its use for cmpnodes
Yes. That's connected to what I said about history search also
working the way ignoredups does.
That placement is not necessary given that it isn't a static function
... if it ever was, that's buried somewhere in the pre-version-control
zsh-workers archives.
> > seems you could simply replace histstrcmp with strcmp and be happy.
>
> Thanks. This now works as expected.
>
> BTW, without this change, the following commands are regarded as
> the same for HIST_IGNORE_DUPS, while they are very different:
Although this statement is correct, I'm reluctant to discard a quarter
century of practice about which there has not previously been a
complaint. It could lead to significantly larger history files and/or
the "expiration" of commands with more obvious distinctions -- not
because those distinctions are more "important" but because they're
more likely to be noticed and their loss complained about.
So how about this as a compromise:
diff --git a/Src/hashtable.c b/Src/hashtable.c
index 75b06c4ad..e1f575a52 100644
--- a/Src/hashtable.c
+++ b/Src/hashtable.c
@@ -1397,6 +1397,14 @@ histstrcmp(const char *str1, const char *str2)
{
while (inblank(*str1)) str1++;
while (inblank(*str2)) str2++;
+
+ /* If significant whitespace has already been eliminated,
+ * there is no reason to expend similar effort here. Also,
+ * this is more accurate in cases of quoted whitespace.
+ */
+ if (isset(HISTREDUCEBLANKS))
+ return strcmp(str1, str2);
+
while (*str1 && *str2) {
if (inblank(*str1)) {
if (!inblank(*str2))
next prev parent reply other threads:[~2024-03-20 17:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-13 12:38 Vincent Lefevre
2024-03-14 5:13 ` Bart Schaefer
2024-03-15 12:53 ` Vincent Lefevre
2024-03-16 16:00 ` Bart Schaefer
2024-03-19 10:57 ` Vincent Lefevre
2024-03-19 11:08 ` Mikael Magnusson
2024-03-19 12:34 ` Vincent Lefevre
2024-03-20 17:46 ` Bart Schaefer [this message]
2024-03-20 17:48 ` Bart Schaefer
2024-03-20 23:48 ` Vincent Lefevre
2024-03-21 5:22 ` Jun T
2024-03-21 5:36 ` Bart Schaefer
2024-03-21 9:41 ` Jun T
2024-03-21 10:21 ` Vincent Lefevre
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAH+w=7YdYNUOaAZimuc02DvumHwVJdWYEATocc-ku95-DNAZig@mail.gmail.com' \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.org \
/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://git.vuxu.org/mirror/zsh/
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 NNTP newsgroup(s).