emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

feature/package+vc ffb06d9100 1/2: Assume VC data is directly usable in


From: Philip Kaludercic
Subject: feature/package+vc ffb06d9100 1/2: Assume VC data is directly usable in 'package-archive-contents'
Date: Tue, 2 Aug 2022 11:40:47 -0400 (EDT)

branch: feature/package+vc
commit ffb06d910043bcbfad939e43442f81fe3421f0d5
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>

    Assume VC data is directly usable in 'package-archive-contents'
    
    * package-vc.el (package-vc-fetch): Remove string parsing and
    translation code.
---
 lisp/emacs-lisp/package-vc.el | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 7e76725a05..f5263d08b9 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -184,26 +184,14 @@ be requested using REV."
                 (:rev . ,rev))))
     ((when-let* ((desc (cadr (assoc name-or-url package-archive-contents
                                     #'string=)))
-                 (spec (or (alist-get :vc (package-desc-extras desc))
-                           (user-error "Package has no VC header"))))
-       (unless (string-match
-                (rx bos
-                    (group (+ alnum))
-                    (+ blank) (group (+ (not blank)))
-                    (? (+ blank) (group (+ (not blank)))
-                       (? (+ blank) (group (+ (not blank)))))
-                    eos)
-                spec)
-         (user-error "Invalid repository specification %S" spec))
+                 (upstream (or (alist-get :vc (package-desc-extras desc))
+                               (user-error "Package has no VC data"))))
        (package-desc-create
         :name (if (stringp name-or-url)
                   (intern name-or-url)
                 name-or-url)
         :kind 'vc
-        :extras `((:upstream . ,(list (intern (match-string 1 spec))
-                                      (match-string 2 spec)
-                                      (match-string 3 spec)
-                                      (match-string 4 spec)))
+        :extras `((:upstream . ,upstream)
                   (:rev . ,rev)))))
     ((user-error "Unknown package to fetch: %s" name-or-url)))))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]