[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa-admin 5cf5115 228/439: * admin/archive-contents.el (archiv
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa-admin 5cf5115 228/439: * admin/archive-contents.el (archive--pull): New function |
Date: |
Sun, 17 Oct 2021 15:48:07 -0400 (EDT) |
branch: elpa-admin
commit 5cf51150a4bf132a7c175a6da3f7da80fb505126
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* admin/archive-contents.el (archive--pull): New function
(archive--sync-emacs-repo, archive--external-package-sync): Use it.
---
admin/archive-contents.el | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 8f054ad..37b582d 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-2015 Free Software Foundation, Inc
+;; Copyright (C) 2011-2016 Free Software Foundation, Inc
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
@@ -556,6 +556,14 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
packages)
(archive--html-make-index archive-contents)))
+(defun archive--pull (dirname)
+ (let ((default-directory (file-name-as-directory
+ (expand-file-name dirname))))
+ (with-temp-buffer
+ (message "Running git pull in %S" default-directory)
+ (call-process "git" nil t nil "pull")
+ (message "Updated %s:\n%s" dirname (buffer-string)))))
+
;;; Maintain external packages.
(defconst archive--elpa-git-url "git://git.sv.gnu.org/emacs/elpa")
@@ -574,10 +582,8 @@ Return non-nil if there's an \"emacs\" repository present."
(if (not (file-directory-p emacs-repo-root))
(progn (message "No \"emacs\" subdir: will skip :core packages")
nil)
- (let ((default-directory emacs-repo-root))
- (message "Running git pull in %S" default-directory)
- (call-process "git" nil t nil "pull")
- t))))
+ (archive--pull emacs-repo-root)
+ t)))
(defun archive--find-non-trivial-file (dir)
(catch 'found-important-file
@@ -637,7 +643,7 @@ If WITH-CORE is non-nil, it means we manage :core packages
as well."
(let* ((branch (concat "externals/" name))
(output
(with-temp-buffer
- ;; FIXME: Use git-new-workdir!
+ ;; FIXME: Use `git worktree'!
(call-process "git" nil t nil "clone"
"--reference" ".." "--single-branch"
"--branch" branch
@@ -646,13 +652,7 @@ If WITH-CORE is non-nil, it means we manage :core packages
as well."
(message "Cloning branch %s:\n%s" name output)))
((not (file-directory-p (concat name "/.git")))
(message "%s is in the way of an external, please remove!" name))
- (t
- (let ((default-directory (file-name-as-directory
- (expand-file-name name))))
- (with-temp-buffer
- (message "Running git pull in %S" default-directory)
- (call-process "git" nil t nil "pull")
- (message "Updated %s:%s" name (buffer-string))))))))
+ (t (archive--pull name)))))
(defun archive--core-package-empty-dest-p (dest)
"Return non-nil if DEST is an empty variant."
- [nongnu] elpa-admin 5e1943e 157/439: Merge commit '469cd3bc117bfb8da0c03a2a2fb185e80c81d068', (continued)
- [nongnu] elpa-admin 5e1943e 157/439: Merge commit '469cd3bc117bfb8da0c03a2a2fb185e80c81d068', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin ed4d0fa 163/439: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 1b86fe8 166/439: Add 'packages/load-relative/' from commit '15ffaa9ebf1b7bbfcc307d1716eec135253b3b8d', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 8d5c048 169/439: Merge commit 'c876c3c62f03d7e945b049932a55496b3cdfe05d', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d5d2dd5 173/439: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin a0bc800 185/439: Squashed 'packages/pinentry/' content from commit 075deb6, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 627a556 177/439: Update packages/darkroom by merging its external subtree, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 642c7c1 203/439: Prevent accidental deletion of .git, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin a8b876c 207/439: * admin/archive-contents.el: Make :core handling optional, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 368a212 219/439: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 5cf5115 228/439: * admin/archive-contents.el (archive--pull): New function,
Philip Kaludercic <=
- [nongnu] elpa-admin 94d527c 121/439: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 80a4836 120/439: Merge branch 'master' of git://bzr.sv.gnu.org/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin f1f09fa 118/439: more tutorial, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin c5f517e 130/439: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin a7a8990 132/439: Fix prefix of last merge and restore deleted files, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin a84afce 149/439: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d4269e6 141/439: Make sure removal of $(ARCHIVE_TMP)/packages/$(pkg) does not prompt interactively., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 401790d 168/439: Add 'packages/load-relative/' from commit '064074d7dcc8d26d59ab9ceb099b43e6870c58d1', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 3cd0561 181/439: Improve README.md and add a screenshot, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin ed5d4e7 182/439: Skip "test" directories for copyright checks, Philip Kaludercic, 2021/10/17