[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] elpa-admin d54db67 139/357: * admin/archive-contents.el: Keep bot
From: |
Stefan Monnier |
Subject: |
[elpa] elpa-admin d54db67 139/357: * admin/archive-contents.el: Keep both home page a repository links. |
Date: |
Thu, 10 Dec 2020 18:06:31 -0500 (EST) |
branch: elpa-admin
commit d54db673728fde72d25c4bb92ed7ab229ed8ad78
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* admin/archive-contents.el: Keep both home page a repository links.
---
admin/archive-contents.el | 51 ++++++++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 23 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 241f1ad..96ecb76 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -161,6 +161,9 @@ Currently only refreshes the ChangeLog files."
dir (expand-file-name "packages/" srcdir)))))
))
+(defconst archive-default-url-format "http://elpa.gnu.org/packages/%s.html")
+(defconst archive-default-url-re (format archive-default-url-format ".*"))
+
(defun archive--metadata (dir pkg)
"Return a list (SIMPLE VERSION DESCRIPTION REQ EXTRAS),
where SIMPLE is non-nil if the package is simple;
@@ -193,7 +196,7 @@ PKG is the name of the package and DIR is the directory
where it is."
(simple (if pt (equal pt "simple") (= (length files) 1)))
(keywords (lm-keywords-list))
(url (or (lm-header "url")
- (format "http://elpa.gnu.org/packages/%s.html" pkg)))
+ (format archive-default-url-format pkg)))
(req
(if requires-str
(mapcar 'archive--convert-require
@@ -422,28 +425,30 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(replace-regexp-in-string "&" "&" txt)))
(defun archive--insert-repolinks (name srcdir mainsrcfile url)
- (if url
- (insert (format "<p>Origin: <a href=%S>%s</a></p>\n"
- url (archive--quote url)))
- (let* ((externals
- (with-temp-buffer
- (insert-file-contents
- (expand-file-name "../../../elpa/externals-list" srcdir))
- (read (current-buffer))))
- (external (eq :external (nth 1 (assoc name externals))))
- (git-sv "http://git.savannah.gnu.org/")
- (urls (if external
- '("cgit/emacs/elpa.git/?h=externals/"
-
"gitweb/?p=emacs/elpa.git;a=shortlog;h=refs/heads/externals/")
- '("cgit/emacs/elpa.git/tree/packages/"
- "gitweb/?p=emacs/elpa.git;a=tree;f=packages/"))))
- (insert (format
- (concat "<p>Browse repository: <a href=%S>%s</a>"
- " or <a href=%S>%s</a></p>\n")
- (concat git-sv (nth 0 urls) name)
- 'CGit
- (concat git-sv (nth 1 urls) name)
- 'Gitweb)))))
+ (when url
+ (insert (format "<p>Home page: <a href=%S>%s</a></p>\n"
+ url (archive--quote url)))
+ (when (string-match archive-default-url-re url)
+ (setq url nil)))
+ (let* ((externals
+ (with-temp-buffer
+ (insert-file-contents
+ (expand-file-name "../../../elpa/externals-list" srcdir))
+ (read (current-buffer))))
+ (external (eq :external (nth 1 (assoc name externals))))
+ (git-sv "http://git.savannah.gnu.org/")
+ (urls (if external
+ '("cgit/emacs/elpa.git/?h=externals/"
+
"gitweb/?p=emacs/elpa.git;a=shortlog;h=refs/heads/externals/")
+ '("cgit/emacs/elpa.git/tree/packages/"
+ "gitweb/?p=emacs/elpa.git;a=tree;f=packages/"))))
+ (insert (format
+ (concat (format "<p>Browse %srepository: " (if url "ELPA's " ""))
+ "<a href=%S>%s</a> or <a href=%S>%s</a></p>\n")
+ (concat git-sv (nth 0 urls) name)
+ 'CGit
+ (concat git-sv (nth 1 urls) name)
+ 'Gitweb))))
(defun archive--html-make-pkg (pkg files)
(let* ((name (symbol-name (car pkg)))
- [elpa] elpa-admin 968d870 212/357: Merge commit 'cce1d8b50b1ceccb80c20398cd659db3a6348aac' as 'packages/gnome-c-style', (continued)
- [elpa] elpa-admin 968d870 212/357: Merge commit 'cce1d8b50b1ceccb80c20398cd659db3a6348aac' as 'packages/gnome-c-style', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 4028a03 161/357: * GNUmakefile (%-pkg.el): Silence the emacs command line again., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin e6d646f 117/357: tutorials, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin b84cae0 119/357: * archive-contents.el (archive--simple-package-p): Quote the, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 80a4836 120/357: Merge branch 'master' of git://bzr.sv.gnu.org/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 94d527c 121/357: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin f1f09fa 118/357: more tutorial, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 674b934 123/357: mention `make check' in README, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a7a8990 132/357: Fix prefix of last merge and restore deleted files, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin b09c975 134/357: Change echo statements during build., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin d54db67 139/357: * admin/archive-contents.el: Keep both home page a repository links.,
Stefan Monnier <=
- [elpa] elpa-admin a25204a 142/357: [quarter-plane] Fix typo in Commentary., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 657ebb0 140/357: Add ergoemacs-mode; fix up externals maintenance, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 27c180f 145/357: * README: Update for new "Version: 0" convention., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 8f23f86 144/357: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a84afce 149/357: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin f645cb0 148/357: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin aec5d97 172/357: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 788c439 170/357: Merge commit 'fea2a8b1c10f9f29ba6924b17892de670b650756', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 2970d75 176/357: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 627a556 177/357: Update packages/darkroom by merging its external subtree, Stefan Monnier, 2020/12/10