[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa-admin 1325337 262/439: [admin int] Simplify ‘archive-giti
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa-admin 1325337 262/439: [admin int] Simplify ‘archive-gitignore-externals’. |
Date: |
Sun, 17 Oct 2021 15:48:15 -0400 (EDT) |
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))))
- [nongnu] elpa-admin cc33931 222/439: Add test capability to ELPA, (continued)
- [nongnu] elpa-admin cc33931 222/439: Add test capability to ELPA, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 968d870 212/439: Merge commit 'cce1d8b50b1ceccb80c20398cd659db3a6348aac' as 'packages/gnome-c-style', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 2ba4dc8 215/439: Merge commit '6bf96861b98e91ca9c3bd146697580b42d30f5d9', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin f79a619 218/439: * packages/gnome-c-style/gnome-c-tests.el: Add copyright blurb, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 73a80fc 227/439: Update packages/yasnippet by subtree-merging from its github-based upstream, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 0907441 229/439: packages/yasnippet: subtree pull from external, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin cc63328 234/439: * GNUmakefile (.gitignore): New rule, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 8208d1c 245/439: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 32ff16d 247/439: Merge commit 'ff57536e7c8e7dd2b5bfdf803fe78327b572e080', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin da3bd64 263/439: [admin int] Use ‘archive--read-externals-list’ more., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 1325337 262/439: [admin int] Simplify ‘archive-gitignore-externals’.,
Philip Kaludercic <=
- [nongnu] elpa-admin 285d815 049/439: Fix last change., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin b824440 047/439: Minor rephrasing in README, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin dfa5808 053/439: Rework archive-contents.el to handle new packages/ structure., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin da7456c 065/439: write README in markdown, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 7ce78d5 071/439: Note that 'autogen.sh' should be run to generate 'configure' and 'Makefile.in' (see #11), Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin a745b29 076/439: * admin/archive-contents.el: Create web pages., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 1daf0bb 085/439: Merge branch 'master' of github.com:rocky/emacs-loc-changes, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin e71d997 087/439: Merge remote-tracking branch 'repo.or.cz/elpa', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin cd01c51 080/439: Remove the angle brackets, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 30c8a11 248/439: Merge commit '5f47b1f64cad8a06e945e2a1287b986a3676554d', Philip Kaludercic, 2021/10/17