From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.devel Subject: Re: Reconsider defaults for use-package-vc-prefer-newest Date: Thu, 19 Sep 2024 20:31:25 +0000 Message-ID: <87frpvo06a.fsf@posteo.net> References: <87wmj7dftf.fsf@posteo.net> <87setvxyt6.fsf@gmail.com> <87jzf7o13b.fsf@posteo.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8590"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Martin =?utf-8?Q?Edstr=C3=B6m?= , "emacs-devel" , Tony Zorman To: Suhail Singh Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Sep 19 22:32:54 2024 Return-path: Envelope-to: ged-emacs-devel@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 1srNpd-00026h-Vm for ged-emacs-devel@m.gmane-mx.org; Thu, 19 Sep 2024 22:32:54 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srNoS-0008ED-5C; Thu, 19 Sep 2024 16:31:41 -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 1srNoM-0008By-0C for emacs-devel@gnu.org; Thu, 19 Sep 2024 16:31:36 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srNoH-0003rs-JG for emacs-devel@gnu.org; Thu, 19 Sep 2024 16:31:32 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id E165A240101 for ; Thu, 19 Sep 2024 22:31:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1726777886; bh=+q9PrJRnXMcDv1uhRov20/E/mpJke5cAc9VjmzRZetE=; h=From:To:Cc:Subject:Autocrypt:OpenPGP:Date:Message-ID:MIME-Version: Content-Type:From; b=Qd+AyFJsocG0B4NlyK3KXEctvAdJx8xwzw1ScfQRylKeCB6K5aedfw9NJVIh0KAFl JEDG64N/6FWkO4RO7gbVVOd+6I5ZG9em64UBJfj079i0JyAqFH+X1K9kP1o/Fo1grL gVGR4TwJ9QTJbksBLUauWZQ95d/5/kaOXYMamoa2Xb3I5/96m8Q/I9CB+psbslD+nt 8tC8UcIs1Are2AEUjVAksaPzCYWMyDHsfk52FTCBF3IAk1r1g4fNn1VJvMuMhlPzm7 qb5+XVmaYjk3tW1aQhwDwpLnLA+Ph+T0K28bi90yQ12ySQLPXdW8kDVaqNkaaSzqNQ j7S/uNT6kSAYg== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4X8nH215Qfz6tmv; Thu, 19 Sep 2024 22:31:25 +0200 (CEST) In-Reply-To: <87jzf7o13b.fsf@posteo.net> (Philip Kaludercic's message of "Thu, 19 Sep 2024 20:11:36 +0000") Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM OpenPGP: id=philipk@posteo.net; url="https://keys.openpgp.org/vks/v1/by-email/philipk@posteo.net"; preference=signencrypt Received-SPF: pass client-ip=185.67.36.66; envelope-from=philipk@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:323799 Archived-At: --=-=-= Content-Type: text/plain Philip Kaludercic writes: [...] >>> The current approach is to find the newest commit that touches a >>> version header and use that. >> >> Would it be possible to reflect the commit corresponding to the version >> in the "Other versions:" field in the output of M-x describe-package ? > > Why under "Other version:" (which links to other packages). IIRC the > commit of a VC package should appear under the commit header. There is > the possibility of using a symbolic name if available. > > I now notice that this is not the case as I had assumed... I'll try to > fix it as soon as possible. This is the fix: --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Insert-correct-commit-data-into-VC-package-descripti.patch >From 3a3cd2d4e6915d02bfb66680c2c00f3e179c7e0f Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Thu, 19 Sep 2024 22:27:26 +0200 Subject: [PATCH] Insert correct commit data into VC package descriptions * lisp/emacs-lisp/package-vc.el (package-vc-commit): Rename argument from PKG to PKG-DESC. (package-vc--generate-description-file): Update the "extras" section of the package description with the revision string at generation time. --- lisp/emacs-lisp/package-vc.el | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index 34610102aa0..e168096e153 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -265,13 +265,13 @@ package-vc--download-and-read-archives (add-hook 'package-read-archive-hook #'package-vc--read-archive-data 20) -(defun package-vc-commit (pkg) - "Return the last commit of a development package PKG." - (cl-assert (package-vc-p pkg)) +(defun package-vc-commit (pkg-desc) + "Return the last commit of a development package PKG-DESC." + (cl-assert (package-vc-p pkg-desc)) ;; FIXME: vc should be extended to allow querying the commit of a ;; directory (as is possible when dealing with git repositories). ;; This should be a fallback option. - (cl-loop with dir = (package-desc-dir pkg) + (cl-loop with dir = (package-desc-dir pkg-desc) for file in (directory-files dir t "\\.el\\'" t) when (vc-working-revision file) return it finally return "unknown")) @@ -359,7 +359,11 @@ package-vc--generate-description-file requires)))) (list :kind 'vc) (package--alist-to-plist-args - (package-desc-extras pkg-desc)))) + (let ((extras (copy-alist (package-desc-extras pkg-desc)))) + (setf (alist-get :commit extras) + (package-vc-commit pkg-desc)) + extras) + ))) "\n") nil pkg-file nil 'silent)))) -- 2.45.2 --=-=-= Content-Type: text/plain Would anyone mind me pushing this to emacs-30? [...] -- Philip Kaludercic on siskin --=-=-=--