emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master 6b3eb55: * GNUmakefile (%.elc): Use load-prefer-newer


From: Stefan Monnier
Subject: [elpa] master 6b3eb55: * GNUmakefile (%.elc): Use load-prefer-newer
Date: Tue, 15 Jan 2019 11:40:56 -0500 (EST)

branch: master
commit 6b3eb558fb0049fd459f9b317d62e8a1f28aef05
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * GNUmakefile (%.elc): Use load-prefer-newer
    
    * admin/archive-contents.el (archive--pull): Skip uptodate worktrees.
---
 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 <address@hidden>
 
@@ -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.
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]