From: Jeremy Bryant via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: philipk@posteo.net, 68929@debbugs.gnu.org,
monnier@iro.umontreal.ca, justin@burkett.cc
Subject: bug#68929: [PATCH] Copy which-key from GNU ELPA into core
Date: Mon, 29 Apr 2024 22:00:55 +0100 [thread overview]
Message-ID: <87edananp4.fsf@jeremybryant.net> (raw)
In-Reply-To: <86ttk2lvz9.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 15 Apr 2024 14:13:30 +0300")
Eli Zaretskii <eliz@gnu.org> writes:
>> From: Jeremy Bryant <jb@jeremybryant.net>
>> Cc: philipk@posteo.net, 68929@debbugs.gnu.org, monnier@iro.umontreal.ca,
>> justin@burkett.cc
>> Date: Sun, 14 Apr 2024 22:52:08 +0100
>>
>> > Is line length the only issue you are looking at? What about other
>> > requirements of our logs and ChangeLog files, including those imposed
>> > by authors.el? The most problematic issue is when the file names
>> > and/or its leading directories in the log message don't fit the actual
>> > place and name of the file in the tree. Did you look at those issues?
>> > They typically come up when preparing a release tarball, and are quite
>> > annoying at that time, especially if there are a lot of them, because
>> > they require manual fixes.
>>
>> Yes, sorry, I have only looked at the line length because it came up as
>> a blocker.
>>
>> As far as the file names, this appears stable, but the place in the tree
>> would move as part of this proposed integration, to be in
>> lisp/which-key.el rather than at the root as is the case for the ELPA
>> version. Is this a problem and how was it resolved with other moves
>> from ELPA to core?
>
> Sorry, I don't remember the details. I probably fixed some issues by
> hand, and for some others added/modified the relevant data structures
> in admin/authors.el, which see.
>
>> Upon inspection, the earlier historical commits do not generally conform to the
>> Changelog format.
>> How to investigate any issues for authors.el? Is there a function try
>> and run?
>
> The function is "M-x authors", defined in admin/authors.el. It first
> updates ChangeLog.4, and then attempts the regenerate AUTHORS; you
> will need to "git reset" to return to the current versions once you
> are finished. The following extract from admin/make-tarball.txt gives
> some guidance, and more information is available in comments to
> authors.el:
>
> After "M-x authors" finishes, if there is an "*Authors Errors*"
> buffer, address the issues. If there was a ChangeLog typo, fix
> the relevant entry. If a file was deleted or renamed, consider
> adding an appropriate entry to variables authors-ignored-files,
> authors-valid-file-names, or authors-renamed-files-alist in
> authors.el. If some authors are "ignored", consider adding
> entries to the author-aliases variable.
>
> If necessary, repeat 'C-u M-x authors' after making those changes.
>
> If you see too many problems than you can handle, feel free to give up
> on them and leave them until the first pretest.
Eli, thanks for the patient explanations however I have not the time to
work on this in detail due to the complexity.
Philip, as you separately proposed to investigate. Here is a compact
updated summary of Stefan's prior
recommendations to merge the history to preserve the contributor
history/assignments:
"BTW, rather than adding a file, another way to add it to `emacs.git` is
by `git merge --allow-unrelated-histories`.
If you want to do that, you'll want to first create a new commit which
moves the files to their "final" destination, like:
git rm .gitignore .github Makefile LICENSE.md ...
git mv which-key.el lisp/which-key.el
git mv which-key-tests.el test/lisp/which-key-tests.el
git commit -m 'Move files in preparation for merge into emacs.git'
and then you can `git merge` that new commit into Emacs, preserving
the history.
The commands above should be done in a branch containing the which-key history.
Then you go to a branch of Emacs [add a remote pointing to the which-key
repo modified as above] and do
git merge --no-verify --allow-unrelated-histories --no-edit which-key-integration/which-key-prepare-integration
git push"
Start with the upstream which includes all changes discussed
https://github.com/justbur/emacs-which-key/
next prev parent reply other threads:[~2024-04-29 21:00 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <RT-Ticket-2038816@rt.gnu.org>
[not found] ` <87zfvl8r4e.fsf@jeremybryant.net>
[not found] ` <874jdspsqb.fsf@bernoul.li>
2024-02-28 20:56 ` Incorporate package macrostep into Emacs or NonGNU ELPA? Jeremy Bryant via Emacs development discussions.
2024-02-28 21:16 ` Stefan Monnier
2024-02-28 23:04 ` Jeremy Bryant
2024-02-29 20:44 ` Jeremy Bryant
2024-03-01 4:15 ` Adam Porter
2024-03-01 23:26 ` Stefan Monnier
2024-03-02 21:50 ` Jeremy Bryant
2024-03-02 22:51 ` Stefan Monnier
2024-03-03 7:26 ` Adam Porter
2024-03-03 7:51 ` Eli Zaretskii
2024-03-03 7:53 ` Adam Porter
2024-03-03 8:57 ` Eli Zaretskii
2024-03-03 14:28 ` Stefan Monnier
2024-03-04 11:25 ` Ihor Radchenko
2024-03-04 15:35 ` Stefan Monnier
2024-03-03 22:40 ` Jeremy Bryant
2024-03-04 12:00 ` Eli Zaretskii
2024-03-11 22:47 ` Jeremy Bryant
[not found] ` <jwvsf0wqrqg.fsf-monnier+emacs@gnu.org>
[not found] ` <87r0fugl5o.fsf@jeremybryant.net>
[not found] ` <jwvle613zk7.fsf-monnier+emacs@gnu.org>
[not found] ` <rt-4.2.16-14-g9a593ee-16065-1711725597-1342.2038816-6-0@rt.gnu.org>
[not found] ` <87h6g6jthh.fsf@jeremybryant.net>
[not found] ` <rt-4.2.16-14-g9a593ee-24903-1712948497-1603.2038816-5-0@rt.gnu.org>
[not found] ` <jwvjzl25qpv.fsf-monnier+emacs@gnu.org>
2024-02-04 22:02 ` bug#68929: [PATCH] Copy which-key from GNU ELPA into core Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-05 2:15 ` Justin Burkett
2024-02-05 3:08 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-05 12:32 ` Eli Zaretskii
2024-02-06 2:51 ` Justin Burkett
2024-02-07 21:53 ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-08 6:09 ` Eli Zaretskii
2024-02-08 22:25 ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-11 21:32 ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-15 8:29 ` Eli Zaretskii
2024-02-17 13:10 ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-17 16:58 ` Eli Zaretskii
2024-02-07 22:01 ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-08 6:16 ` Eli Zaretskii
2024-02-08 15:42 ` Justin Burkett
2024-02-08 16:10 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-08 16:54 ` Eli Zaretskii
2024-02-08 22:27 ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-09 6:51 ` Eli Zaretskii
2024-02-07 8:20 ` Philip Kaludercic
2024-02-07 21:48 ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-08 6:03 ` Eli Zaretskii
2024-03-01 23:08 ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-03-02 9:33 ` Philip Kaludercic
[not found] ` <87r0faibbg.fsf@jeremybryant.net>
2024-04-12 20:40 ` bug#68929: which-key tests " Philip Kaludercic
[not found] ` <87wmp2ibjj.fsf@jeremybryant.net>
2024-04-14 9:21 ` bug#68929: [PATCH] Copy which-key " Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-14 10:13 ` Eli Zaretskii
2024-04-14 21:52 ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-15 11:13 ` Eli Zaretskii
2024-04-29 21:00 ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
2024-05-01 7:31 ` Philip Kaludercic
2024-02-23 23:07 ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-14 21:56 ` bug#68929: Fwd: Re: bug#68929: which-key tests " Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-15 8:39 ` Mattias Engdegård
2024-03-02 6:51 ` Incorporate package macrostep into Emacs or NonGNU ELPA? Eli Zaretskii
2024-03-02 21:36 ` Jeremy Bryant
2024-03-17 21:48 ` Incorporate package macrostep into Emacs core Jeremy Bryant via Emacs development discussions.
2024-03-18 9:09 ` Philip Kaludercic
2024-03-18 23:03 ` Jeremy Bryant
2024-03-19 6:36 ` Philip Kaludercic
2024-03-19 7:11 ` Gerd Möllmann
2024-03-19 7:26 ` Philip Kaludercic
2024-03-19 7:30 ` Gerd Möllmann
2024-03-19 9:33 ` Philip Kaludercic
2024-03-19 9:48 ` Gerd Möllmann
2024-03-19 17:03 ` Jonathan Oddie
2024-03-19 21:57 ` Jeremy Bryant via Emacs development discussions.
2024-03-22 20:47 ` Jeremy Bryant
2024-03-22 20:50 ` Stefan Monnier
2024-03-18 12:48 ` Eli Zaretskii
2024-03-18 13:22 ` Stefan Monnier
2024-03-18 22:58 ` Jeremy Bryant
2024-03-19 12:26 ` Eli Zaretskii
2024-04-18 21:19 ` Jeremy Bryant
2024-04-19 6:38 ` Eli Zaretskii
2024-04-19 19:30 ` Jeremy Bryant
2024-04-19 22:26 ` Stefan Monnier
2024-04-20 6:07 ` Eli Zaretskii
2024-04-20 17:14 ` Adam Porter
2024-04-20 6:00 ` Eli Zaretskii
2024-04-23 21:37 ` Jeremy Bryant
2024-04-25 15:30 ` Eli Zaretskii
2024-04-25 21:27 ` Jeremy Bryant
2024-04-26 8:15 ` Eshel Yaron
2024-04-27 9:52 ` Eli Zaretskii
2024-04-29 21:38 ` Jeremy Bryant
2024-05-02 9:32 ` Eli Zaretskii
2024-05-02 22:03 ` Jeremy Bryant
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=87edananp4.fsf@jeremybryant.net \
--to=bug-gnu-emacs@gnu.org \
--cc=68929@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=jb@jeremybryant.net \
--cc=justin@burkett.cc \
--cc=monnier@iro.umontreal.ca \
--cc=philipk@posteo.net \
/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.