From: Mikael Magnusson <mikachu@gmail.com>
To: zsh-workers@zsh.org
Subject: Re: HIST_IGNORE_DUPS also ignores command lines that differ by a space between quotes
Date: Tue, 19 Mar 2024 12:08:26 +0100 [thread overview]
Message-ID: <CAHYJk3Q_+7ZQvYSjwU3tZTSmqTgPrftcDtJtkqTTrR5n1WKFAg@mail.gmail.com> (raw)
In-Reply-To: <20240319105745.GA4811@qaa.vinc17.org>
in hist.c:
if ((isset(HISTIGNOREDUPS) || isset(HISTIGNOREALLDUPS)) && save > 0
&& hist_ring && histstrcmp(chline, hist_ring->node.nam) == 0) {
/* This history entry compares the same as the previous.
* In case minor changes were made, we overwrite the
* previous one with the current one. This also gets the
* timestamp right. Perhaps, preserve the HIST_OLD flag.
*/
he = hist_ring;
newflags |= he->node.flags & HIST_OLD; /* Avoid re-saving */
freehistdata(he, 0);
curline.histnum = curhist;
and in hashtable.c (weird place for it):
/* Compare two strings with normalized white-space */
/**/
int
histstrcmp(const char *str1, const char *str2)
{
while (inblank(*str1)) str1++;
while (inblank(*str2)) str2++;
while (*str1 && *str2) {
if (inblank(*str1)) {
if (!inblank(*str2))
break;
do str1++; while (inblank(*str1));
do str2++; while (inblank(*str2));
}
else {
if (*str1 != *str2)
break;
str1++;
str2++;
}
}
return *str1 - *str2;
}
seems you could simply replace histstrcmp with strcmp and be happy.
On Tue, Mar 19, 2024 at 11:58 AM Vincent Lefevre <vincent@vinc17.net> wrote:
>
> On 2024-03-16 09:00:28 -0700, Bart Schaefer wrote:
> > On Fri, Mar 15, 2024 at 5:53 AM Vincent Lefevre <vincent@vinc17.net> wrote:
> > > Note that spelling correction, which occurs *before* the line is put
> > > in the history, detects quoted text and won't try to correct it.
> >
> > Spelling correction is actually performed by the lexer, at the same
> > time as alias expansion.
> >
> > > it seems that "quoted status" can be taken into account at that point.
> >
> > Not without separately storing both the original and lexed state of
> > the text.
>
> I don't understand what you mean. The original text does *not*
> seem to be used, as what is put in the history is the contents
> *after* spelling correction. Moreover, the difference concerning
> spaces between word splitting and quoted text is already taking
> into account for HIST_REDUCE_BLANKS (which I'm using). I don't
> see why it cannot be used for HIST_IGNORE_DUPS too.
>
> qaa:~> echo fil "foo bar"
> zsh: correct 'fil' to 'file' [nyae]? y
> file foo bar
>
> Recalling the command from the history:
>
> qaa:~> echo file "foo bar"
>
> As you can see, in the history, "fil" has changed to "file" as
> corrected, and the 3 spaces after "fil"/"file" have been squashed
> to a single one due to HIST_REDUCE_BLANKS.
>
> > Which is in fact done internally, but for hopefully obvious
> > reasons is not done in the history file, which (during
> > reading/writing) is where most duplicate elimination has to occur.
>
> The history file is not concerned here. This happens with "zsh -f",
> where there is no history file:
>
> qaa:~> zsh -f
> qaa% setopt HIST_IGNORE_DUPS
> qaa% echo "a b"
> a b
> qaa% echo "a b"
> a b
> qaa% history
> 1 setopt HIST_IGNORE_DUPS
> 2 echo "a b"
>
> BTW, the zshoptions(1) man page correctly says "history list",
> not "history file":
>
> HIST_IGNORE_DUPS (-h)
> Do not enter command lines into the history list if they are
> duplicates of the previous event.
>
> --
> Vincent Lefèvre <vincent@vinc17.net> - Web: <https://www.vinc17.net/>
> 100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/>
> Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)
>
--
Mikael Magnusson
next prev parent reply other threads:[~2024-03-19 11:08 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 [this message]
2024-03-19 12:34 ` Vincent Lefevre
2024-03-20 17:46 ` Bart Schaefer
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=CAHYJk3Q_+7ZQvYSjwU3tZTSmqTgPrftcDtJtkqTTrR5n1WKFAg@mail.gmail.com \
--to=mikachu@gmail.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).