From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eshel Yaron via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#65386: [PATCH] ; Refine some 'package-vc' docstrings Date: Sun, 20 Aug 2023 09:15:08 +0200 Message-ID: References: <83msymyfun.fsf@gnu.org> <83h6ouxn7m.fsf@gnu.org> Reply-To: Eshel Yaron 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="16964"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: philipk@posteo.net, 65386@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Aug 20 09:16:39 2023 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 1qXcfv-0004FN-CA for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 20 Aug 2023 09:16:39 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qXcff-0000vH-4u; Sun, 20 Aug 2023 03:16:23 -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 1qXcfJ-0000r9-7G for bug-gnu-emacs@gnu.org; Sun, 20 Aug 2023 03:16:05 -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 1qXcfI-0005KW-SD for bug-gnu-emacs@gnu.org; Sun, 20 Aug 2023 03:16:00 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qXcfK-0002D0-9e for bug-gnu-emacs@gnu.org; Sun, 20 Aug 2023 03:16:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eshel Yaron Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 20 Aug 2023 07:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65386 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 65386-submit@debbugs.gnu.org id=B65386.16925157178436 (code B ref 65386); Sun, 20 Aug 2023 07:16:02 +0000 Original-Received: (at 65386) by debbugs.gnu.org; 20 Aug 2023 07:15:17 +0000 Original-Received: from localhost ([127.0.0.1]:52874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXcea-0002C0-0F for submit@debbugs.gnu.org; Sun, 20 Aug 2023 03:15:16 -0400 Original-Received: from mail.eshelyaron.com ([107.175.124.16]:39440 helo=eshelyaron.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXceX-0002Bo-Mx for 65386@debbugs.gnu.org; Sun, 20 Aug 2023 03:15:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=eshelyaron.com; s=mail; t=1692515710; bh=Cwdi27zLTZfuFN97LNIB9zKHL+p2A6Qoblqwrnm9Mvg=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=fNlIZgGtrRcahZe14ig/276Y0JmjJKnKn999W/7rUgMCOPfRLC6KxpcAN3X+nwzMi lpQSJ+UKW+36d/BiITRrgHdKZVl3aNsm+Zqi4iCYqoqVwMhgjifl6hMcaSPtoWyL3Z CiRtU623SakvAwi4sh94N8CbIt3RjZ+wcMDKEl1PE1vspjuax3l648iMi0Vrl2eQ3c HldM/fVFT6YXlz0xZHvE2DOYanqJsG3VLeRyOZXaOdaURiXUwLQfcG3o/ZH8Ularkm CjyrzSm5R1F1z2a5gvVOLM1k1viVJUIbpZXv7Uv+5xcCkm6lnJWIDf+OojGuv5xMzd QHTrdw8QzqqQA== In-Reply-To: <83h6ouxn7m.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 20 Aug 2023 09:05:49 +0300") 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:267959 Archived-At: --=-=-= Content-Type: text/plain Hi, >> > What is the significance of "from source" here? >> >> It's just for indicating that we're talking about VC packages >> specifically. Does that make sense? > > Then how about > > List of packages to install from their VCS repositories. > SGTM, updated in the new patch (v3) I've attached below. >> >> + "Send patch for REVISIONS to maintainer of the package PKG-DESC using SUBJECT. >> > >> > This should mention email, otherwise SUBJECT is confusing. Maybe use >> > "Email" instead of "Send". >> >> Alright, I made a couple more changes to this one. > > Now you have lost the reference to SUBJECT. Was that necessary? We > generally try to mention all the mandatory arguments in the first line > of the doc string. The sentence below seems to be squeezable into 79 > columns: > > Email patches for REVISIONS to maintainer of package PKG-DESC using SUBJECT. > > (Dropping articles is a frequent trick to make the first line fit.) Nicely squeezed :) I've adopted your phrasing in the patch below. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=v3-0001-Refine-some-package-vc-docstrings.patch >From 2b977167f8c384d8769b71ad28ca4d4f175503f4 Mon Sep 17 00:00:00 2001 From: Eshel Yaron Date: Fri, 18 Aug 2023 21:59:10 +0200 Subject: [PATCH v3] ; Refine some 'package-vc' docstrings * lisp/emacs-lisp/package-vc.el (package-vc-heuristic-alist) (package-vc-install-dependencies, package-vc-upgrade) (package-vc-install, package-vc-install-from-checkout) (package-vc-prepare-patch, package-vc-upgrade-all) (package-vc-allow-side-effects): Refine docstrings. (package-vc-default-backend): Refine docstring and custom type. --- lisp/emacs-lisp/package-vc.el | 167 ++++++++++++++++++++-------------- 1 file changed, 100 insertions(+), 67 deletions(-) diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index db8b41aee6a..52a4296e88f 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -94,7 +94,12 @@ package-vc-heuristic-alist (+ (or alnum "-" "." "_")) (? "/"))) eos) . Bzr)) - "Heuristic mapping URL regular expressions to VC backends." + "Alist mapping repository URLs to VC backends. +`package-vc-install' consults this alist to determine the VC backend +from the repository URL. Each element of the alist has the form +(URL-REGEXP . BACKEND). `package-vc-install' will use BACKEND of +the first association for which the URL of the repository matches +the URL-REGEXP of the association." :type `(alist :key-type (regexp :tag "Regular expression matching URLs") :value-type (choice :tag "VC Backend" ,@(mapcar (lambda (b) `(const ,b)) @@ -102,14 +107,19 @@ package-vc-heuristic-alist :version "29.1") (defcustom package-vc-default-backend 'Git - "Default VC backend used when cloning a package repository. -If no repository type was specified or could be guessed by -`package-vc-heuristic-alist', this is the default VC backend -used as fallback. The value must be a member of -`vc-handled-backends' and the named backend must implement -the `clone' function." - :type `(choice ,@(mapcar (lambda (b) (list 'const b)) - vc-handled-backends)) + "Default VC backend to use for cloning package repositories. +`package-vc-install' uses this backend when you specify neither +the backend nor a repository URL that's recognized via +`package-vc-heuristic-alist'. + +The value must be a member of `vc-handled-backends' that supports +the `clone' VC function." + :type `(choice ,@(seq-keep + (lambda (be) + (when (or (vc-find-backend-function be 'clone) + (alist-get 'clone (get be 'vc-functions))) + (list 'const be))) + vc-handled-backends)) :version "29.1") (defcustom package-vc-register-as-project t @@ -140,20 +150,21 @@ package-vc-install-selected-packages (package-desc-create :name name :kind 'vc)) spec))))))) -(defcustom package-vc-selected-packages '() - "List of packages that must be installed. -Each member of the list is of the form (NAME . SPEC), where NAME -is a symbol designating the package and SPEC is one of: + +(defcustom package-vc-selected-packages nil + "List of packages to install from their VCS repositories. +Each element is of the form (NAME . SPEC), where NAME is a symbol +designating the package and SPEC is one of: - nil, if any package version can be installed; - a version string, if that specific revision is to be installed; -- a property list, describing a package specification. For more - details, please consult the subsection \"Specifying Package - Sources\" in the Info node `(emacs)Fetching Package Sources'. +- a property list, describing a package specification. For possible + values, see the subsection \"Specifying Package Sources\" in the + Info node `(emacs)Fetching Package Sources'. -This user option will be automatically updated to store package -specifications for packages that are not specified in any -archive." +The command `package-vc-install' updates the value of this user +option to store package specifications for packages that are not +specified in any archive." :type '(alist :tag "List of packages you want to be installed" :key-type (symbol :tag "Package") :value-type @@ -345,19 +356,26 @@ package-vc--generate-description-file nil pkg-file nil 'silent)))) (defcustom package-vc-allow-side-effects nil - "Whether to process :make and :shell-command spec arguments. + "Whether to run extra build commands when installing VC packages. + +Some packages specify \"make\" targets or other shell commands +that should run prior to building the package, by including the +:make or :shell-command keywords in their specification. By +default, Emacs ignores these keywords when installing and +upgrading VC packages, but if the value is a list of package +names (symbols), the build commands will be run for those +packages. A non-nil non-list value says to always respect :make +and :shell-command keywords. It may be necessary to run :make and :shell-command arguments in order to initialize a package or build its documentation, but please be careful when changing this option, as installing and updating a package can run potentially harmful code. -When set to a list of symbols (packages), run commands for only -packages in the list. When nil, never run commands. Otherwise -when non-nil, run commands for any package with :make or -:shell-command specified. - -Package specs are loaded from trusted package archives." +This applies to package specifications that come from your +configured package archives, as well as from entries in +`package-vc-selected-packages' and specifications that you give +to `package-vc-install' directly." :type '(choice (const :tag "Run for all packages" t) (repeat :tag "Run only for selected packages" (symbol :tag "Package name")) (const :tag "Never run" nil)) @@ -414,15 +432,15 @@ package-vc--build-documentation (when clean-up (delete-file file)))) -(defun package-vc-install-dependencies (requirements) - "Install missing dependencies, and return missing ones. -The return value will be nil if everything was found, or a list -of (NAME VERSION) pairs of all packages that couldn't be found. +(defun package-vc-install-dependencies (deps) + "Install missing dependencies according to DEPS. + +DEPS is a list of elements (PACKAGE VERSION-LIST), where +PACKAGE is a package name and VERSION-LIST is the required +version of that package. -REQUIREMENTS should be a list of additional requirements; each -element in this list should have the form (PACKAGE VERSION-LIST), -where PACKAGE is a package name and VERSION-LIST is the required -version of that package." +Return a list of dependencies that couldn't be met (or nil, when +this function successfully installs all given dependencies)." (let ((to-install '()) (missing '())) (cl-labels ((search (pkg) "Attempt to find all dependencies for PKG." @@ -458,7 +476,7 @@ package-vc-install-dependencies (or (not desc-a) (not desc-b) (not (depends-on-p desc-b desc-a)) (depends-on-p desc-a desc-b))))) - (mapc #'search requirements) + (mapc #'search deps) (cl-callf sort to-install #'version-order) (cl-callf seq-uniq to-install #'duplicate-p) (cl-callf sort to-install #'dependent-order)) @@ -719,7 +737,7 @@ package-vc--read-package-desc ;;;###autoload (defun package-vc-upgrade-all () - "Attempt to upgrade all installed VC packages." + "Upgrade all installed VC packages." (interactive) (dolist (package package-alist) (dolist (pkg-desc (cdr package)) @@ -729,7 +747,7 @@ package-vc-upgrade-all ;;;###autoload (defun package-vc-upgrade (pkg-desc) - "Attempt to upgrade the package PKG-DESC." + "Upgrade the package described by PKG-DESC from package's VC repository." (interactive (list (package-vc--read-package-desc "Upgrade VC package: " t))) ;; HACK: To run `package-vc--unpack-1' after checking out the new ;; revision, we insert a hook into `vc-post-command-functions', and @@ -792,34 +810,45 @@ package-vc--release-rev ;;;###autoload (defun package-vc-install (package &optional rev backend name) - "Fetch a PACKAGE and set it up for using with Emacs. - -If PACKAGE is a string containing an URL, download the package -from the repository at that URL; the function will try to guess -the name of the package from the URL. This can be overridden by -passing the optional argument NAME. If PACKAGE is a cons-cell, -it should have the form (NAME . SPEC), where NAME is a symbol -indicating the package name and SPEC is a plist as described in -`package-vc-selected-packages'. Otherwise PACKAGE should be a -symbol whose name is the package name, and the URL for the -package will be taken from the package's metadata. + "Fetch a package described by PACKAGE and set it up for use with Emacs. + +PACKAGE specifies which package to install, where to find its +source repository and how to build it. + +If PACKAGE is a symbol, install the package with that name +according to metadata that package archives provide for it. This +is the simplest way to call this function, but it only works if +the package you want to install is listed in a package archive +you have configured. + +If PACKAGE is a string, it specifies the URL of the package +repository. In this case, optional argument BACKEND specifies +the VC backend to use for cloning the repository; if it's nil, +this function tries to infer which backend to use according to +the value of `package-vc-heuristic-alist' and if that fails it +uses `package-vc-default-backend'. Optional argument NAME +specifies the package name in this case; if it's nil, this +package uses `file-name-base' on the URL to obtain the package +name, otherwise NAME is the package name as a symbol. + +PACKAGE can also be a cons cell (PNAME . SPEC) where PNAME is the +package name as a symbol, and SPEC is a plist that specifes how +to fetch and build the package. For possible values, see the +subsection \"Specifying Package Sources\" in the Info +node `(emacs)Fetching Package Sources'. By default, this function installs the last revision of the package available from its repository. If REV is a string, it -describes the revision to install, as interpreted by the VC -backend. The special value `:last-release' (interactively, the -prefix argument), will use the commit of the latest release, if -it exists. The last release is the latest revision which changed -the \"Version:\" header of the package's main Lisp file. - -Optional argument BACKEND specifies the VC backend to use for cloning -the package's repository; this is only possible if NAME-OR-URL is a URL, -a string. If BACKEND is omitted or nil, the function -uses `package-vc-heuristic-alist' to guess the backend. -Note that by default, a VC package will be prioritized over a -regular package, but it will not remove a VC package. - -\(fn PACKAGE &optional REV BACKEND)" +describes the revision to install, as interpreted by the relevant +VC backend. The special value `:last-release' (interactively, +the prefix argument), says to use the commit of the latest +release, if it exists. The last release is the latest revision +which changed the \"Version:\" header of the package's main Lisp +file. + +If you use this function to install a package that you also have +installed from a package archive, the version this function +installs takes precedence." (interactive (progn ;; Initialize the package system to get the list of package @@ -895,7 +924,7 @@ package-vc-checkout ;;;###autoload (defun package-vc-install-from-checkout (dir name) - "Set up the package NAME in DIR by linking it into the ELPA directory. + "Install the package NAME from its source directory DIR. Interactively, prompt the user for DIR, which should be a directory under version control, typically one created by `package-vc-checkout'. If invoked interactively with a prefix argument, prompt the user @@ -937,13 +966,17 @@ package-vc-rebuild ;;;###autoload (defun package-vc-prepare-patch (pkg-desc subject revisions) - "Send patch for REVISIONS to maintainer of the package PKG using SUBJECT. -The function uses `vc-prepare-patch', passing SUBJECT and -REVISIONS directly. PKG-DESC must be a package description. + "Email patches for REVISIONS to maintainer of package PKG-DESC using SUBJECT. + +PKG-DESC is a package description and SUBJECT is the subject of +the message. + Interactively, prompt for PKG-DESC, SUBJECT, and REVISIONS. When invoked with a numerical prefix argument, use the last N revisions. When invoked interactively in a Log View buffer with -marked revisions, use those." +marked revisions, use those. + +See also `vc-prepare-patch'." (interactive (list (package-vc--read-package-desc "Package to prepare a patch for: " t) (and (not vc-prepare-patches-separately) -- 2.41.0 --=-=-=--