[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa-admin 0e7eab5 304/439: Merge commit 'facd92f4c026525706a48
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa-admin 0e7eab5 304/439: Merge commit 'facd92f4c026525706a48b96b4e0b24543ce1d94' |
Date: |
Sun, 17 Oct 2021 15:48:25 -0400 (EDT) |
branch: elpa-admin
commit 0e7eab5d5fe5e5252aa2f5397a30dc711259d26a
Merge: f85cb8d f25cda3
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Commit: Stephen Leake <stephen_leake@stephe-leake.org>
Merge commit 'facd92f4c026525706a48b96b4e0b24543ce1d94'
---
GNUmakefile | 8 +++++---
README | 2 +-
admin/archive-contents.el | 22 ++++++++++++++--------
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 79e252f..8bfd49b 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -171,9 +171,11 @@ elcs := $(call SET-diff, $(naive_elcs), $(patsubst %.el,
%.elc, $(nbc_els)))
# '(dolist (al (quote ($(patsubst %, "%", $(autoloads))))) (load
(expand-file-name al) nil t))'
%.elc: %.el
@echo 'Byte compiling $<'
- @$(EMACS) \
- --eval "(setq package-directory-list nil package-user-dir
\"$(abspath packages)\")" \
- -f package-initialize \
+ @$(EMACS) \
+ --eval "(setq package-directory-list nil \
+ load-prefer-newer t \
+ package-user-dir \"$(abspath packages)\")" \
+ -f package-initialize \
-L $(dir $@) -f batch-byte-compile $<
.PHONY: elcs
diff --git a/README b/README
index b827780..e0c9faf 100644
--- a/README
+++ b/README
@@ -229,7 +229,7 @@ In the `external' case, the copy of the code is not kept in
`master` but in the
To add a new externals package, first add this `elpa.git' repository as a
new remote in your existing repository. Then push a local branch to a
-new remote branch in `elpa.git', named externals/<pkgname>. For example:
+new remote branch in `elpa.git', named `externals/<pkgname>`. For example:
git push elpa <mybranch>:externals/<pkgname>
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 17909b9..32f5285 100644
--- 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-2018 Free Software Foundation, Inc
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
@@ -626,14 +626,20 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(message "Running git pull in %S" default-directory)
(archive-call t "git" "pull"))
((file-exists-p ".git")
- (message "Updating worktree in %S" default-directory)
- (archive-call t "git" "merge"))
+ (unless (with-temp-buffer
+ (archive-call t "git" "status" "--branch" "--porcelain=2")
+ (goto-char (point-min))
+ ;; Nothing to pull (nor push, actually).
+ (search-forward "\n# branch.ab +0 -0" nil t))
+ (message "Updating worktree in %S" default-directory)
+ (archive-call t "git" "merge")))
(t (error "No .git in %S" default-directory)))
- (message "Updated %s:%s%s" dirname
- (if (and (eobp) (bolp)
- (eq (line-beginning-position 0) (point-min)))
- " " "\n")
- (buffer-string)))))
+ (unless (and (eobp) (bobp))
+ (message "Updated %s:%s%s" dirname
+ (if (and (eobp) (bolp)
+ (eq (line-beginning-position 0) (point-min)))
+ " " "\n")
+ (buffer-string))))))
;;; Maintain external packages.
- [nongnu] elpa-admin 602f32e 277/439: Merge yasnippet 0.12.1 from upstream, (continued)
- [nongnu] elpa-admin 602f32e 277/439: Merge yasnippet 0.12.1 from upstream, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 5ac89c8 281/439: * packages/yasnippet: Merge version 0.12.2 from upstream., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d5be3dd 283/439: * README: mention make check_copyrights, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d220792 286/439: Add 'packages/mmm-mode/' from commit '00c10a69c8c90178530219730ccea14ab634a74e', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 8c08096 285/439: * GNUmakefile (org-fetch): Don't stop the whole update if it fails., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d276c3d 288/439: * README: Don't clone a clone., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 5dc3bcb 289/439: Use "git worktree list" in archive-contents.el, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin eb92dfc 293/439: Fix repo links for :core packages, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin dbd4e0b 295/439: Merge remote-tracking branch 'refs/remotes/origin/master', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d58576c 301/439: * GNUmakefile (FILTER-nonsrc): Don't compile .dir-locals.el files., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 0e7eab5 304/439: Merge commit 'facd92f4c026525706a48b96b4e0b24543ce1d94',
Philip Kaludercic <=
- [nongnu] elpa-admin 21c69f7 308/439: Merge commit 'c304ac9a80ab7e96f705771a3842a48bf5a32c8a', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 75bab1c 309/439: * admin/archive-contents.el: Fix case of non-versions dependencies, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 26a2da8 312/439: More specific externals example., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin cdefe40 311/439: Improve copying of :core files; update .gitignore, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 86e31b7 313/439: Merge branch 'master' of git://bzr.sv.gnu.org/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin adf3b7f 316/439: Neater HTML table of old package versions (bug#35331), Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 55ff372 317/439: * admin/archive-contents.el: Improve package HTML headers, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d0cae44 318/439: * admin/archive-contents.el: Unbreak elpa.gnu.org build, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 0b90b0a 322/439: * GNUmakefile (check_copyrights): Only look at "copyright" in comments, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin cabbab9 323/439: * packages/yasnippet: Merge 0.14.0 from upstream., Philip Kaludercic, 2021/10/17