[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa-admin 1b69bf6 340/439: * admin/archive-contents.el: Don't
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa-admin 1b69bf6 340/439: * admin/archive-contents.el: Don't use "git log" when not needed |
Date: |
Sun, 17 Oct 2021 15:48:32 -0400 (EDT) |
branch: elpa-admin
commit 1b69bf6bc70df3eb2de05307e6ca3f14a25f927d
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* admin/archive-contents.el: Don't use "git log" when not needed
(archive--get-release-revision): `call-process` can return something
else than a number.
(archive--make-one-tarball): Change last argument so it's only
computed when needed.
---
admin/archive-contents.el | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index b83bf8b..e16fc0d 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -140,7 +140,7 @@ commit which modified the \"Version:\" pseudo header."
(let* ((default-directory (archive--dirname dir))
(release-rev
(with-temp-buffer
- (if (zerop
+ (if (equal 0 ;Don't signal an error if call errors out.
(archive--call
(current-buffer)
"git" "log" "-n1" "--oneline" "--no-patch"
@@ -172,7 +172,7 @@ commit which modified the \"Version:\" pseudo header."
rev (buffer-string))))))))
(defun archive--make-one-tarball (tarball dir pkgname metadata
- &optional revision)
+ &optional revision-function)
"Create file TARBALL for PKGNAME if not done yet."
(archive--message "Building tarball %s..." tarball)
(if (file-readable-p tarball)
@@ -190,7 +190,8 @@ commit which modified the \"Version:\" pseudo header."
(cons (match-string 1 file) file))
(directory-files destdir nil re))))
(delete-file (expand-file-name (format "%s-pkg.el" pkgname) dir))
- (when revision (archive--select-revision dir pkgname revision))
+ (when revision-function
+ (archive--select-revision dir pkgname (funcall revision-function)))
;; FIXME: Build Info files and corresponding `dir' file.
(archive--write-pkg-file dir pkgname metadata)
;; FIXME: Allow renaming files or selecting a subset of the files!
@@ -312,8 +313,9 @@ commit which modified the \"Version:\" pseudo header."
(format "%s-%s.tar" pkgname vers))))
(archive--make-one-tarball tarball
dir pkgname metadata
- (archive--get-release-revision
- dir pkgname vers version-map)))))))))
+ (lambda ()
+ (archive--get-release-revision
+ dir pkgname vers
version-map))))))))))
(defun archive--call (destination program &rest args)
"Like ‘call-process’ for PROGRAM, DESTINATION, ARGS.
- [nongnu] elpa-admin f6670e0 334/439: * .gitignore: Ignore all the unregistered files under `packages`, (continued)
- [nongnu] elpa-admin f6670e0 334/439: * .gitignore: Ignore all the unregistered files under `packages`, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d5c6272 339/439: * admin/archive-contents.el: foo.tar.sig is not an old tarball, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin de02176 397/439: * elpa-admin.el: Use :lisp-dir in default value of :main-file and :renames, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d5001e6 404/439: * elpa-admin.el: Keep the number of old tarballs under check, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 9126fc7 365/439: * elpa-admin.el: Fix date computation for :core packages, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 39eb0cf 343/439: * admin/archive-contents.el (batch-generate-description-file): New function, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin a5cffdb 374/439: * elpa-admin.el (elpaa--pull): Set the upstream branch if needed, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d47f83f 373/439: * elpa-admin.el (elpaa--fetch): Use the default branch rather than "master", Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin b1bcdc4 367/439: * elpa-admin.el (elpaa--pull): Be slightly less chatty, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 7e57ea1 371/439: * elpa-admin.el (elpaa--push): Don't checkout branch, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 1b69bf6 340/439: * admin/archive-contents.el: Don't use "git log" when not needed,
Philip Kaludercic <=
- [nongnu] elpa-admin 14d46c2 375/439: * elpa-admin.el (elpaa--pull): Fix up oversight in last change, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 47280ce 402/439: * elpa-admin.el: Don't mention skipping :core if there are no :core, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 059dde5 344/439: * GNUmakefile (RULE-singlepkg): Add rules to install&compile each package, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin e22c225 395/439: * elpa-admin.el (elpaa--fetch): Only show upstream commits, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 2658af9 345/439: * admin/archive-contents.el: Add preliminary code to fetch upstream updates, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 0b84023 372/439: * elpa-admin.el: Fix confusing uses of word "external", Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 3926bbc 381/439: * elpa-admin.el (elpaa--release-email): Improve the Cc address, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 913bb04 376/439: * GNUmakefile: Rewrite the all-in-place code, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin ceb7580 390/439: * elpa-admin.el (elpaa--sandboxed-ro-binds): Add `/bin`, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 995404d 401/439: * elpa-admin.el: Allow generating autoloads for "unlisted" packages, Philip Kaludercic, 2021/10/17