]> git.eshelyaron.com Git - emacs.git/commitdiff
Assume VC data is directly usable in 'package-archive-contents'
authorPhilip Kaludercic <philipk@posteo.net>
Tue, 2 Aug 2022 15:12:45 +0000 (17:12 +0200)
committerPhilip Kaludercic <philipk@posteo.net>
Tue, 2 Aug 2022 15:12:45 +0000 (17:12 +0200)
* package-vc.el (package-vc-fetch): Remove string parsing and
translation code.

lisp/emacs-lisp/package-vc.el

index 7e76725a05c17e4e0c497753c5e964a9831659d5..f5263d08b961e6af081b0eff4df1cfa6bb5d51fa 100644 (file)
@@ -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)))))