From: Emanuel Berg <incal@dataswamp.org>
To: 68401@debbugs.gnu.org
Cc: emacs-erc@gnu.org
Subject: bug#68401: 30.0.50; ERC 5.6-git: `erc-cmd-GMSG', `erc-cmd-AMSG', `erc-cmd-GME', `erc-cmd-AME'. 2nd attempt
Date: Sun, 11 Feb 2024 02:58:11 +0100 [thread overview]
Message-ID: <87jznb4v9o.fsf@dataswamp.org> (raw)
In-Reply-To: <87v87yvnly.fsf@dataswamp.org>
J.P. wrote:
>> * lisp/erc/erc.el (erc-cmd-AMSG): Make it consistent with the doc
>> string by only affecting the current connection.
>> (erc-cmd-GMSG, erc-cmd-AME, erc-cmd-GME): new IRC slash commands
>> (Bug#68401)
>
> Looks like you've combined ("fixed up") your patch with the
> provided test and data files. That's fine, but its changes
> should be listed in the commit message as well:
>
> * test/lisp/erc/erc-scenarios-misc-commands.el
> (erc-scenarios-misc-commands--AMSG-GMSG-AME-GME): New test.
> * test/lisp/erc/resources/commands/amsg-barnet.eld: New file.
> * test/lisp/erc/resources/commands/amsg-foonet.eld: New file.
Should those lines be added to the commit message? I was
unaware of those messages, if they have appeared previously.
Okay, I do that with 'git commit --amend', right?
> In the future, maybe look into "squashing" to
> preserve messages.
I think that was what I did, using the following commands.
I wrote them down after I did it, so maybe someone is missing.
ib is my local branch.
$ git log --graph --oneline --decorate -a
$ git rebase -i HEAD~5
$ git commit --amend
$ git rebase --onto origin/master 'ib^' ib
$ git pull
$ git format-patch master -M -o .ib
I was told there was an easier way, using diff, since all that
was called for was a commit that expressed the difference from
the initial checkout to the current state of the source -
ignoring the detour back and forth and their corresponding
commits. So maybe there is an easier way than all
those commands?
> Also, consider adding an entry to etc/ERC-NEWS if you think
> people can benefit from these commands.
OK.
>> + (erc--connected-and-joined-p)
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Seems one of these things is not like the others.
> Guessing that's unintentional.
Ah, you are right, good that you saw it. If I change that in
the source to the correct #'erc--connected-and-joined-p and
commit that, we are back at the previous situation. Only now
we have 2 commits instead of 5.
Should I change the code, commit the change, and do the whole
rebase stuff again to get a single patch?
Or is there an easier way?
> What's not great is that the test still passes in spite of
> this. It seems /GME is the only variant not covered, which
> I guess is my fault. Perhaps you should improve the test so
> it fails with the current patch applied and passes once
> it's fixed.
I'm not familiar with those tests so it is better you do
that part, I think.
> Is this FIXME comment regarding your paperwork accurate?
That had to do with my package on GNU ELPA [1] but that
package has appeared so I suppose the paperwork issue has
been solved.
[1] https://dataswamp.org/~incal/emacs-init/wrap-search.el
--
underground experts united
https://dataswamp.org/~incal
next prev parent reply other threads:[~2024-02-11 1:58 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <87v87yvnly.fsf@dataswamp.org>
2024-01-12 12:08 ` bug#68401: 30.0.50; ERC 5.6-git: `erc-cmd-GMSG', `erc-cmd-AMSG', `erc-cmd-GME', `erc-cmd-AME'. 2nd attempt Eli Zaretskii
2024-01-12 14:12 ` Emanuel Berg
2024-01-12 14:39 ` Eli Zaretskii
2024-01-13 2:09 ` Emanuel Berg
2024-01-13 2:31 ` Emanuel Berg
2024-01-13 2:45 ` Emanuel Berg
2024-01-13 7:23 ` Eli Zaretskii
2024-01-14 9:11 ` Emanuel Berg
[not found] ` <834jfikb4d.fsf@gnu.org>
2024-01-12 12:36 ` Emanuel Berg
[not found] ` <87ply6vidl.fsf@dataswamp.org>
2024-01-12 14:03 ` Eli Zaretskii
2024-01-12 14:30 ` Emanuel Berg
[not found] ` <87mstavias.fsf@dataswamp.org>
[not found] ` <87wmseoskl.fsf@dataswamp.org>
2024-01-19 2:58 ` J.P.
2024-01-22 10:18 ` Emanuel Berg
2024-01-22 15:11 ` J.P.
2024-01-22 17:00 ` Emanuel Berg
2024-01-22 19:23 ` Emanuel Berg
[not found] ` <87y1ch851b.fsf@igel.home>
2024-01-22 21:05 ` Emanuel Berg
2024-01-22 21:27 ` J.P.
2024-01-23 4:25 ` Emanuel Berg
2024-01-23 4:32 ` Emanuel Berg
2024-01-23 6:20 ` Emanuel Berg
2024-01-23 13:31 ` Emanuel Berg
2024-01-24 0:36 ` J.P.
2024-01-24 0:56 ` Emanuel Berg
2024-01-24 1:38 ` J.P.
2024-01-24 2:01 ` Emanuel Berg
2024-01-23 13:42 ` Emanuel Berg
2024-01-24 0:34 ` J.P.
2024-01-24 1:28 ` Emanuel Berg
2024-01-24 1:38 ` Emanuel Berg
2024-01-24 11:15 ` Emanuel Berg
2024-01-24 11:55 ` Emanuel Berg
2024-02-05 0:52 ` Emanuel Berg
2024-02-06 3:44 ` J.P.
2024-02-11 1:58 ` Emanuel Berg [this message]
2024-02-11 2:27 ` Emanuel Berg
2024-02-11 3:30 ` Emanuel Berg
2024-02-11 3:52 ` Emanuel Berg
2024-02-14 1:42 ` J.P.
2024-02-17 5:21 ` Emanuel Berg
2024-02-17 8:52 ` Emanuel Berg
2024-02-21 1:11 ` J.P.
[not found] ` <87ttm2boza.fsf@neverwas.me>
2024-02-21 1:16 ` Emanuel Berg
2024-03-01 0:18 ` J.P.
2024-01-12 10:43 Emanuel Berg
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=87jznb4v9o.fsf@dataswamp.org \
--to=incal@dataswamp.org \
--cc=68401@debbugs.gnu.org \
--cc=emacs-erc@gnu.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.