[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/package-vc-fixes b8f6ce839a 43/48: Allow the direct installation
From: |
Philip Kaludercic |
Subject: |
scratch/package-vc-fixes b8f6ce839a 43/48: Allow the direct installation of package specifications |
Date: |
Wed, 16 Nov 2022 04:50:10 -0500 (EST) |
branch: scratch/package-vc-fixes
commit b8f6ce839af6ee6c0b2f61db82d9c73e9f31fa69
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>
Allow the direct installation of package specifications
* lisp/emacs-lisp/package-vc.el (package-vc-install): Handle package
specifications as an argument.
---
lisp/emacs-lisp/package-vc.el | 45 +++++++++++++++++++++++++++----------------
1 file changed, 28 insertions(+), 17 deletions(-)
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 5127c328d8..ee76a48043 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -614,20 +614,25 @@ If no such revision can be found, return nil."
(line-number-at-pos nil t))))))))
;;;###autoload
-(defun package-vc-install (name-or-url &optional name rev backend)
- "Fetch a package NAME-OR-URL and set it up for using with Emacs.
-If NAME-OR-URL is a URL, download the package from the repository
-at that URL; the function will try to guess the name of the package
-from the URL. Otherwise NAME-OR-URL should be a symbol whose name
-is the package name, and the URL for the package will be taken from
-the package's metadata.
+(defun package-vc-install (package &optional name rev backend)
+ "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.
+
By default, this function installs the last version of the package
available from its repository, but if REV is given and non-nil, it
specifies the revision to install. If REV has the special value
`:last-release' (interactively, the prefix argument), that stands
for the last released version of the package.
-When calling from Lisp, optional argument NAME overrides the package
-name as deduced from NAME-OR-URL.
+
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
@@ -646,17 +651,23 @@ regular package, but it will not remove a source package."
(and current-prefix-arg :last-release)))))
(package-vc--archives-initialize)
(cond
- ((null name-or-url)
+ ((null package)
(signal 'wrong-type-argument nil))
- ((and-let* (((stringp name-or-url))
- (backend (or backend (package-vc--guess-backend name-or-url))))
+ ((consp package)
+ (package-vc--unpack
+ (package-desc-create :name (car package)
+ :kind 'vc)
+ (cdr package)
+ rev))
+ ((and-let* (((stringp package))
+ (backend (or backend (package-vc--guess-backend package))))
(package-vc--unpack
(package-desc-create
- :name (or name (intern (file-name-base name-or-url)))
+ :name (or name (intern (file-name-base package)))
:kind 'vc)
- (list :vc-backend backend :url name-or-url)
+ (list :vc-backend backend :url package)
rev)))
- ((and-let* ((desc (assoc name-or-url package-archive-contents #'string=)))
+ ((and-let* ((desc (assoc package package-archive-contents #'string=)))
(package-vc--unpack
(let ((copy (copy-package-desc (cadr desc))))
(setf (package-desc-kind copy) 'vc)
@@ -666,9 +677,9 @@ regular package, but it will not remove a source package."
(url (alist-get :url extras))
(backend (package-vc--guess-backend url)))
(list :vc-backend backend :url url))
- (user-error "Package `%s' has no VC data" name-or-url))
+ (user-error "Package `%s' has no VC data" package))
rev)))
- ((user-error "Unknown package to fetch: %s" name-or-url))))
+ ((user-error "Unknown package to fetch: %s" package))))
;;;###autoload
(defun package-vc-checkout (pkg-desc directory &optional rev)
- scratch/package-vc-fixes 6080b169f3 47/48: Avoid duplicate source packages in 'package-alist', (continued)
- scratch/package-vc-fixes 6080b169f3 47/48: Avoid duplicate source packages in 'package-alist', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 9bbfdbba24 06/48: Mark 'package-vc-update' as interactive, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes e8043ebc57 03/48: Rename '-ensure-packages' to -install-selected-packages', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 155c3673d7 13/48: Allow specifying a :lisp-dir for package descriptions, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 4b0a5e30b9 16/48: Fix type error in package-vc prompt function, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 7ee6f3e32d 20/48: Fix 'package-vc-install-selected-packages' recursive load, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 3dc2ec3fce 21/48: Make documentation building for source packages more robust, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 692edc9e72 26/48: Have 'package-vc-selected-packages' consider all installed packages, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 1a3b38f8b9 41/48: Remove duplicate package descriptions after updating, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes d744f988f3 42/48: Only fetch elpa-packages.eld when necessary, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes b8f6ce839a 43/48: Allow the direct installation of package specifications,
Philip Kaludercic <=
- scratch/package-vc-fixes 18ee1e728a 48/48: Ensure 'package-vc-prepare-patch' runs in the right directory, Philip Kaludercic, 2022/11/16