[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] elpa-admin 1325337 262/357: [admin int] Simplify ‘archive-gitign
From: |
Stefan Monnier |
Subject: |
[elpa] elpa-admin 1325337 262/357: [admin int] Simplify ‘archive-gitignore-externals’. |
Date: |
Thu, 10 Dec 2020 18:06:55 -0500 (EST) |
branch: elpa-admin
commit 1325337db43b98d79439728e75520d89e501df53
Author: Thien-Thi Nguyen <ttn@gnu.org>
Commit: Thien-Thi Nguyen <ttn@gnu.org>
[admin int] Simplify ‘archive-gitignore-externals’.
* admin/archive-contents.el (archive-gitignore-externals):
Use one pass over the externals-list file contents,
instead of four, to collect core and external package names.
---
admin/archive-contents.el | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 66ea520..4cdc5f1 100755
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -1,6 +1,6 @@
;;; archive-contents.el --- Auto-generate an Emacs Lisp package archive. -*-
lexical-binding:t -*-
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
@@ -803,15 +803,10 @@ If WITH-CORE is non-nil, it means we manage :core
packages as well."
;;; Manage .gitignore
(defun archive-gitignore-externals (elf gf)
- (let* ((el (read (find-file-noselect elf)))
- (exts (delq nil
- (mapcar (lambda (x)
- (if (eq :external (nth 1 x)) (car x)))
- el)))
- (core (delq nil
- (mapcar (lambda (x)
- (if (eq :core (nth 1 x)) (car x)))
- el))))
+ (let ((pkgs (cl-loop
+ for (name kind . _) in (read (find-file-noselect elf))
+ when (memq kind '(:external :core))
+ collect name)))
(with-current-buffer (find-file-noselect gf)
(goto-char (point-min))
(when (re-search-forward
@@ -820,7 +815,7 @@ If WITH-CORE is non-nil, it means we manage :core packages
as well."
(replace-match ""))
(insert "# External packages with their own .git tree [autogenerated].\n"
(mapconcat (lambda (p) (format "packages/%s/\n" p))
- (sort (append exts core) #'string<)
+ (sort pkgs #'string<)
""))
(save-buffer))))
- [elpa] elpa-admin 345dc39 189/357: * GNUmakefile: Use LC_ALL rather than LANG, (continued)
- [elpa] elpa-admin 345dc39 189/357: * GNUmakefile: Use LC_ALL rather than LANG, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 368a212 219/357: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 7edd6ff 205/357: Dereference symlinks when creating tarballs, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 2f122b0 251/357: Merge branch 'master' into new-website, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin da3bd64 263/357: [admin int] Use ‘archive--read-externals-list’ more., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 34ecb5f 257/357: Respect .elpaignore when compiling and optimize compilation., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 186d10f 269/357: Clear executable bit for Emacs Lisp files., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin ac713ed 242/357: Merge commit 'bdbbc65028af8deb55a4e474be43b5b99e6cc539', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 5660f25 261/357: [admin] Add abstraction: archive--read-externals-list, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a23a8b8 271/357: Merge branch 'scratch/hook-helpers', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 1325337 262/357: [admin int] Simplify ‘archive-gitignore-externals’.,
Stefan Monnier <=
- [elpa] elpa-admin 84f67ae 294/357: * admin/archive-contents.el (archive--insert-repolinks): Fix last change, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 655d2e7 305/357: Update packages/ack from upstream, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin c943660 310/357: Merge commit '98405112baa5ce2a118d1c65184c005d8ddaa1a9', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin adf3b7f 316/357: Neater HTML table of old package versions (bug#35331), Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 9c8cf14 320/357: * admin/archive-contents.el (archive-refresh-pkg-file): Resurrect., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 4fc4d47 321/357: Merge commit '5b562e4ddfc449cd61c82ef7646a6c501b913b6c', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin cabbab9 323/357: * packages/yasnippet: Merge 0.14.0 from upstream., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 5ef13b0 326/357: Merge commit '33afdb46e1cd61251736816d965495525b36c9cd', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin d30f5d1 337/357: * GNUmakefile (RULE-singlepkg): New rule(s) to compile single-pkg (bug#38140), Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a186f57 335/357: * README: Convert to org-mode and prepare for export., Stefan Monnier, 2020/12/10