From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jeremy Bryant via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#68929: [PATCH] Copy which-key from GNU ELPA into core Date: Sun, 14 Apr 2024 22:52:08 +0100 Message-ID: <87plurzk6v.fsf@jeremybryant.net> References: <871q9rvqbi.fsf@jeremybryant.net> <87mssc65y8.fsf@posteo.net> <87y1bwrll4.fsf@jeremybryant.net> <86h6ijxzjk.fsf@gnu.org> <87msrh4kkc.fsf@jeremybryant.net> <87jzml3rlz.fsf@posteo.net> <87wmp2ibjj.fsf@jeremybryant.net> <871q78i9kb.fsf@jeremybryant.net> <86y19gmevj.fsf@gnu.org> Reply-To: Jeremy Bryant Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11872"; mail-complaints-to="usenet@ciao.gmane.io" Cc: philipk@posteo.net, 68929@debbugs.gnu.org, monnier@iro.umontreal.ca, justin@burkett.cc To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Apr 14 23:53:13 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 1rw7mj-0002uS-0K for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 14 Apr 2024 23:53:13 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rw7mO-0003pA-JF; Sun, 14 Apr 2024 17:52:52 -0400 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 1rw7mM-0003ov-W4 for bug-gnu-emacs@gnu.org; Sun, 14 Apr 2024 17:52:51 -0400 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 1rw7mM-0005ir-OC for bug-gnu-emacs@gnu.org; Sun, 14 Apr 2024 17:52:50 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rw7mX-0007ds-P7 for bug-gnu-emacs@gnu.org; Sun, 14 Apr 2024 17:53:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jeremy Bryant Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 14 Apr 2024 21:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68929 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 68929-submit@debbugs.gnu.org id=B68929.171313155229125 (code B ref 68929); Sun, 14 Apr 2024 21:53:01 +0000 Original-Received: (at 68929) by debbugs.gnu.org; 14 Apr 2024 21:52:32 +0000 Original-Received: from localhost ([127.0.0.1]:36352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rw7m3-0007Zf-IZ for submit@debbugs.gnu.org; Sun, 14 Apr 2024 17:52:32 -0400 Original-Received: from out-177.mta1.migadu.com ([95.215.58.177]:45957) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rw7lz-0007Xo-Vh for 68929@debbugs.gnu.org; Sun, 14 Apr 2024 17:52:29 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jeremybryant.net; s=key1; t=1713131530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=61mgSz4VVZyi3nVTFEBAdR7X2L8OSmgx4ee08bOAhfk=; b=RC1wS5XBGUjXTdo7DlQgz47RBSv6uTtBHkVLIXv5/x5rGioCL/pX9s+pljebuVg6zXREGl eG6koVtMEqM44Hpx1R8yeSHl9vr9fLRc/fMCadtTkKOvN7EDmUchi6rJ6Z57LR8YCS/eNv fxw2LNASOViKUgeMP46hhZCbp0zNOixnatxb/4mIZNwjyl+s7T1QQ11NomI6SrEUYNDD87 7nJN4TmER7Sa4qt8R4mXCOMF/PtLH4Bji8Vg5gKhH4ds+SZYmccYcFue5HqP6TF+EKFj4y hSBMouPQas5qVtxbApxaIVdQfpIGBZeAQ9e+0R49hns/F5VjAUNlPFnkorRIFA== In-Reply-To: <86y19gmevj.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 14 Apr 2024 13:13:04 +0300") X-Migadu-Flow: FLOW_OUT 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:283321 Archived-At: Eli Zaretskii writes: >> From: Jeremy Bryant >> Cc: Eli Zaretskii , 68929@debbugs.gnu.org, >> monnier@iro.umontreal.ca, justin@burkett.cc >> Date: Sun, 14 Apr 2024 10:21:24 +0100 >> >> > I am currently looking at the merging of history, there appear to be 2 >> > historical commits which exceed the line length in CONTRIBUTE. >> > If there is a recommended way to change them please let me know. >> >> I have worked out the change command that work locally to allow these 2 historical >> commits to be merged. (with thanks to Stefan) >> >> git merge --no-verify --allow-unrelated-histories --no-edit >> which-key-integration/which-key-prepare-integration >> >> >> FYI the two exceptions were below. Allowing these would preserve the >> copyright assignment tracking. >> $ git log --oneline | awk 'length($0)>78+8' >> ;; :group 'which-key |ad8eb57 Merge branch 'better-window-sizes' of >> https://github.com/bmag/emacs-which-key into better-window-sizes >> ;; :type 'string) |1fd43dc Merge branch 'frame-popup' of >> https://github.com/bmag/emacs-which-key into pr12 > > 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? 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?