From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Emanuel Berg Newsgroups: gmane.emacs.bugs,gmane.emacs.erc.general 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 Message-ID: <87jznb4v9o.fsf@dataswamp.org> References: <87v87yvnly.fsf@dataswamp.org> <834jfikb4d.fsf@gnu.org> <87mstavias.fsf@dataswamp.org> <87wmseoskl.fsf@dataswamp.org> <87plxyowpg.fsf__13716.8874776521$1705633220$gmane$org@neverwas.me> <87il3ki2tg.fsf@dataswamp.org> <87il3jh8mu.fsf__35629.5012797759$1706056526$gmane$org@neverwas.me> <87il3jh64c.fsf@dataswamp.org> <87jznzf0dz.fsf@dataswamp.org> <87h6j3eyir.fsf@dataswamp.org> <87a5of68c7.fsf@dataswamp.org> <87h6im9ryz.fsf__23711.5776095138$1707191176$gmane$org@neverwas.me> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30982"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-erc@gnu.org To: 68401@debbugs.gnu.org Cancel-Lock: sha1:rMc77vz/4BNryh5Db3NL03TGHAA= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Feb 11 02:59:11 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rYz7e-0007r8-N5 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 11 Feb 2024 02:59:10 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rYz7K-0000OG-EN; Sat, 10 Feb 2024 20:58:51 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rYz7G-0000NV-SH for bug-gnu-emacs@gnu.org; Sat, 10 Feb 2024 20:58:46 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rYz7G-0006Hb-J7 for bug-gnu-emacs@gnu.org; Sat, 10 Feb 2024 20:58:46 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rYz7W-0001IA-2L for bug-gnu-emacs@gnu.org; Sat, 10 Feb 2024 20:59:02 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <87v87yvnly.fsf@dataswamp.org> Resent-From: Emanuel Berg Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 11 Feb 2024 01:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68401 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.17076167324932 (code B ref -1); Sun, 11 Feb 2024 01:59:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 11 Feb 2024 01:58:52 +0000 Original-Received: from localhost ([127.0.0.1]:34848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYz7L-0001HS-Lu for submit@debbugs.gnu.org; Sat, 10 Feb 2024 20:58:52 -0500 Original-Received: from lists.gnu.org ([2001:470:142::17]:37912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYz7I-0001Gz-JK for submit@debbugs.gnu.org; Sat, 10 Feb 2024 20:58:49 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rYz6x-0000JB-2U for bug-gnu-emacs@gnu.org; Sat, 10 Feb 2024 20:58:27 -0500 Original-Received: from ciao.gmane.io ([116.202.254.214]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rYz6v-0006FC-73 for bug-gnu-emacs@gnu.org; Sat, 10 Feb 2024 20:58:26 -0500 Original-Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1rYz6p-0006sx-Rs for bug-gnu-emacs@gnu.org; Sun, 11 Feb 2024 02:58:19 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: bug-gnu-emacs@gnu.org Original-Followup-To: gmane.emacs.bugs,gmane.emacs.erc.general Mail-Copies-To: never Received-SPF: pass client-ip=116.202.254.214; envelope-from=geb-bug-gnu-emacs@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:279805 gmane.emacs.erc.general:2427 Archived-At: 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