From 1247bee73b4f62e5f31ca65caa8a1372a95a9a4b Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 5 Aug 2017 13:51:34 +0200 Subject: [PATCH 01/21] Update 2 drones Update auto-compile to 1.4.0-3-gef7d0fb Update packed to 2.0.1-1-ge8b20e2 --- .gitmodules | 4 ++-- lib/auto-compile | 2 +- lib/packed | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2919cce..40f4d77 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ collective = emacsg [submodule "auto-compile"] path = lib/auto-compile - url = git@github.com:tarsius/auto-compile.git + url = git@github.com:emacscollective/auto-compile.git [submodule "borg"] path = lib/borg url = git@github.com:emacscollective/borg.git @@ -36,7 +36,7 @@ info-path = Documentation [submodule "packed"] path = lib/packed - url = git@github.com:tarsius/packed.git + url = git@github.com:emacscollective/packed.git [submodule "use-package"] path = lib/use-package url = git@github.com:jwiegley/use-package.git diff --git a/lib/auto-compile b/lib/auto-compile index c978623..ef7d0fb 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit c9786234bdc32237e6c304e6a7c917504370358d +Subproject commit ef7d0fb0ac902e40a5010f8c54d3fe1f279723ef diff --git a/lib/packed b/lib/packed index 536f4a3..e8b20e2 160000 --- a/lib/packed +++ b/lib/packed @@ -1 +1 @@ -Subproject commit 536f4a3bda06cc09759fed1aa0cdebb068ff75a1 +Subproject commit e8b20e287222dbf08ebc46e405412c3213102a7e From 887ea9a48ad34e07296400266637983b5d8619b7 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Tue, 29 Aug 2017 11:34:05 +0200 Subject: [PATCH 02/21] Emacsg: bin/bootstrap: fix typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suggested-by: Štěpán Němec --- bin/borg-bootstrap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/borg-bootstrap b/bin/borg-bootstrap index 84d89dc..a47033b 100755 --- a/bin/borg-bootstrap +++ b/bin/borg-bootstrap @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2016 Jonas Bernoulli +# Copyright (C) 2016-2017 Jonas Bernoulli # # Author: Jonas Bernoulli # License: GPL v3 @@ -52,7 +52,7 @@ do then git config remote.pushDefault "$remote" else - branch=$(git rev-parse --abbref-ref HEAD) + branch=$(git rev-parse --abbrev-ref HEAD) test -n "$branch" && git config branch.master.remote "$remote" fi From 69bedcb8a1e3b66993a8a84f77feee6179c0e00b Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Tue, 19 Sep 2017 18:58:35 +0200 Subject: [PATCH 03/21] Update 10 drones Update auto-compile to 1.4.1 Update borg to v2.0.0 Update closql to v0.4.0 Update dash to 2.13.0-35-gdcb0ec1 Update diff-hl to 1.8.4-13-gbec9889 Update emacsql to 2.0.2-7-ge3bc9b1 Update epkg to v3.0.0 Update finalize to 2.0.0 Update git-modes to 1.2.6 Update magit to 2.11.0 Update packed to 2.0.2 Update use-package to 2.3-81-g360df30 Update with-editor to v2.6.0 --- lib/auto-compile | 2 +- lib/borg | 2 +- lib/closql | 2 +- lib/dash | 2 +- lib/emacsql | 2 +- lib/epkg | 2 +- lib/magit | 2 +- lib/packed | 2 +- lib/use-package | 2 +- lib/with-editor | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/auto-compile b/lib/auto-compile index ef7d0fb..a31819a 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit ef7d0fb0ac902e40a5010f8c54d3fe1f279723ef +Subproject commit a31819a1b75a2320edb0f7f25d6c6faf528bf41a diff --git a/lib/borg b/lib/borg index 35901e8..34eac58 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 35901e83837cefce9f740eb848d196db8c9e272c +Subproject commit 34eac585d6829e17ce59b09fe6ad5d675302c096 diff --git a/lib/closql b/lib/closql index 73e68bc..6659783 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 73e68bcfbe076e152beed1b8e5f894ca438f9770 +Subproject commit 66597831248bbe14ebc7bbf24b24cafebb5fd362 diff --git a/lib/dash b/lib/dash index b4faa93..dcb0ec1 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit b4faa9397e06206b646f684a603e320f962674d1 +Subproject commit dcb0ec1623517e54551b801846a272dd07fd55b2 diff --git a/lib/emacsql b/lib/emacsql index 1b37570..e3bc9b1 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit 1b37570bf5813e160fa18a766e20dfa690910519 +Subproject commit e3bc9b105f6f2de514dd689c8fa8f74f1d610a04 diff --git a/lib/epkg b/lib/epkg index f0959ca..1768e91 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit f0959ca39cdbcb72049b31cab6e7c449749bfefe +Subproject commit 1768e91e02a2d6441c2d82a711912a9498d2316e diff --git a/lib/magit b/lib/magit index f7c8924..4ad2ebf 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit f7c8924ca85fa0671c3c4c54d5e1cbe6106f3e8d +Subproject commit 4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5 diff --git a/lib/packed b/lib/packed index e8b20e2..94ea12b 160000 --- a/lib/packed +++ b/lib/packed @@ -1 +1 @@ -Subproject commit e8b20e287222dbf08ebc46e405412c3213102a7e +Subproject commit 94ea12b9d44bfa42c28d0548199f2fcd19e4aa6a diff --git a/lib/use-package b/lib/use-package index 7b05549..360df30 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 7b055494e39efba8b237202b7c97f40aa19e2579 +Subproject commit 360df30683a711c443f87e495ba14cdd125a505d diff --git a/lib/with-editor b/lib/with-editor index 4d3d50b..2417261 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 4d3d50b09dee3305a365d7eb005313d42dddd6ea +Subproject commit 241726118dee067a8d9880d53c6a781d580ba8a1 From 9756b42aa52b7c610318efc87fe274c990753d74 Mon Sep 17 00:00:00 2001 From: Richard Kim Date: Sun, 24 Sep 2017 10:15:09 -0700 Subject: [PATCH 04/21] Emacsg: Makefile: respect EMACS environment variable --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 64395e1..be44cf3 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,8 @@ # Author: Jonas Bernoulli # License: GPL v3 +EMACS ?= emacs + .PHONY: all help build build-init quick bootstrap .FORCE: @@ -19,24 +21,24 @@ help: build: @rm -f init.elc - @emacs -Q --batch -L lib/borg --load borg \ + @$(EMACS) -Q --batch -L lib/borg --load borg \ --funcall borg-initialize \ --funcall borg-batch-rebuild 2>&1 build-init: @rm -f init.elc - @emacs -Q --batch -L lib/borg --load borg \ + @$(EMACS) -Q --batch -L lib/borg --load borg \ --funcall borg-initialize \ --funcall borg-batch-rebuild-init 2>&1 quick: @rm -f init.elc - @emacs -Q --batch -L lib/borg --load borg \ + @$(EMACS) -Q --batch -L lib/borg --load borg \ --funcall borg-initialize \ --eval '(borg-batch-rebuild t)' 2>&1 lib/%: .FORCE - @emacs -Q --batch -L lib/borg --load borg \ + @$(EMACS) -Q --batch -L lib/borg --load borg \ --funcall borg-initialize \ --eval '(borg-build "$(@F)")' 2>&1 From f3778d700f109e4bc67a3f7088b9d41cc8f4b2db Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 27 Nov 2017 11:56:33 +0100 Subject: [PATCH 05/21] Assimilate magit-popup v2.12.0-2-g70e3cdd Update magit to 2.11.0-286-gaa0f18646 magit-popup is no longer part of the magit repository. --- .gitmodules | 3 +++ lib/magit | 2 +- lib/magit-popup | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 lib/magit-popup diff --git a/.gitmodules b/.gitmodules index 40f4d77..69e95e4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,6 +34,9 @@ path = lib/magit url = git@github.com:magit/magit.git info-path = Documentation +[submodule "magit-popup"] + path = lib/magit-popup + url = git@github.com:magit/magit-popup.git [submodule "packed"] path = lib/packed url = git@github.com:emacscollective/packed.git diff --git a/lib/magit b/lib/magit index 4ad2ebf..aa0f186 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5 +Subproject commit aa0f186467711534ec538e5bf9ea5fdbad0cfc1f diff --git a/lib/magit-popup b/lib/magit-popup new file mode 160000 index 0000000..70e3cdd --- /dev/null +++ b/lib/magit-popup @@ -0,0 +1 @@ +Subproject commit 70e3cdd6140ebdf477f86b88ac2bd1a8de115e88 From 8cf374b249684cc6fac81eb4b7e44e981f3b996c Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 27 Nov 2017 12:29:56 +0100 Subject: [PATCH 06/21] magit: add new magit-insert-modules to magit-status-sections-hook Instead of adding various `magit-insert-modules-*' functions directly. --- init.el | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/init.el b/init.el index 16ffe3c..b41a8c4 100644 --- a/init.el +++ b/init.el @@ -100,20 +100,9 @@ ("C-x M-g" . magit-dispatch-popup)) :config (magit-add-section-hook 'magit-status-sections-hook - 'magit-insert-modules-unpulled-from-upstream - 'magit-insert-unpulled-from-upstream) - (magit-add-section-hook 'magit-status-sections-hook - 'magit-insert-modules-unpulled-from-pushremote - 'magit-insert-unpulled-from-upstream) - (magit-add-section-hook 'magit-status-sections-hook - 'magit-insert-modules-unpushed-to-upstream - 'magit-insert-unpulled-from-upstream) - (magit-add-section-hook 'magit-status-sections-hook - 'magit-insert-modules-unpushed-to-pushremote - 'magit-insert-unpulled-from-upstream) - (magit-add-section-hook 'magit-status-sections-hook - 'magit-insert-submodules - 'magit-insert-unpulled-from-upstream)) + 'magit-insert-modules + 'magit-insert-stashes + 'append)) (use-package man :defer t From 76a26068ba3bf1d170f90951a6c815e02003ebb3 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 27 Nov 2017 12:31:34 +0100 Subject: [PATCH 07/21] Update 7 drones Update borg to v2.0.0-8-gba62a78 Update closql to v0.5.0 Update dash to 2.13.0-57-g91d8cb0 Update epkg to v3.0.0-8-g6114b78 Update finalize to 2.0.0-1-g0496a7b Update use-package to 2.3-94-g98f9e12 Update with-editor to v2.7.0-7-gee39f23 --- lib/borg | 2 +- lib/closql | 2 +- lib/dash | 2 +- lib/epkg | 2 +- lib/finalize | 2 +- lib/use-package | 2 +- lib/with-editor | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/borg b/lib/borg index 34eac58..ba62a78 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 34eac585d6829e17ce59b09fe6ad5d675302c096 +Subproject commit ba62a78d2b3f9f96306c5aa07492106073201936 diff --git a/lib/closql b/lib/closql index 6659783..49862bf 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 66597831248bbe14ebc7bbf24b24cafebb5fd362 +Subproject commit 49862bfdd1540d443d278fadef16a83388b360cb diff --git a/lib/dash b/lib/dash index dcb0ec1..91d8cb0 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit dcb0ec1623517e54551b801846a272dd07fd55b2 +Subproject commit 91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78 diff --git a/lib/epkg b/lib/epkg index 1768e91..6114b78 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 1768e91e02a2d6441c2d82a711912a9498d2316e +Subproject commit 6114b78b84cd8a96a117b7652d1e5138eee4b896 diff --git a/lib/finalize b/lib/finalize index 0f7d47c..0496a7b 160000 --- a/lib/finalize +++ b/lib/finalize @@ -1 +1 @@ -Subproject commit 0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27 +Subproject commit 0496a7b8f2f8b197010d8602b5fc529f5104704a diff --git a/lib/use-package b/lib/use-package index 360df30..98f9e12 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 360df30683a711c443f87e495ba14cdd125a505d +Subproject commit 98f9e120aaac902f611807002ed58215b2620bfd diff --git a/lib/with-editor b/lib/with-editor index 2417261..ee39f23 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 241726118dee067a8d9880d53c6a781d580ba8a1 +Subproject commit ee39f232f2daf997498a4030d104c35ae397f457 From 8417c45cbde1b114a68889c6ec668005ebadad54 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 21 Dec 2017 03:12:00 +0100 Subject: [PATCH 08/21] Update 10 drones Update auto-compile to 1.4.1-1-g694b92e Update borg to v2.0.0-19-g4b908fd Update closql to v0.5.1 Update emacsql to 2.0.2-14-g616dde3 Update epkg to v3.0.0-26-g71ce3ff Update finalize to 2.0.0-2-g8467315 Update magit to 2.11.0-355-g0ee62ee80 Update magit-popup to v2.12.0-4-g3f23e81 Update use-package to 2.3-323-g865e931 Update with-editor to v2.7.0-11-g05338d8 --- lib/auto-compile | 2 +- lib/borg | 2 +- lib/closql | 2 +- lib/emacsql | 2 +- lib/epkg | 2 +- lib/finalize | 2 +- lib/magit | 2 +- lib/magit-popup | 2 +- lib/use-package | 2 +- lib/with-editor | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/auto-compile b/lib/auto-compile index a31819a..694b92e 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit a31819a1b75a2320edb0f7f25d6c6faf528bf41a +Subproject commit 694b92ea58feb30a0104ccf2424fd921235ba517 diff --git a/lib/borg b/lib/borg index ba62a78..4b908fd 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit ba62a78d2b3f9f96306c5aa07492106073201936 +Subproject commit 4b908fd5b43dd9e48b3580b87cc77c4b65939f08 diff --git a/lib/closql b/lib/closql index 49862bf..01cb892 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 49862bfdd1540d443d278fadef16a83388b360cb +Subproject commit 01cb892f6a457fbff857d924cebfdc77f69bd45d diff --git a/lib/emacsql b/lib/emacsql index e3bc9b1..616dde3 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit e3bc9b105f6f2de514dd689c8fa8f74f1d610a04 +Subproject commit 616dde37524f47246bbb161f20d3f5f090f10fbf diff --git a/lib/epkg b/lib/epkg index 6114b78..71ce3ff 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 6114b78b84cd8a96a117b7652d1e5138eee4b896 +Subproject commit 71ce3ffd41bdc90c649a044ddbee0b32b329c612 diff --git a/lib/finalize b/lib/finalize index 0496a7b..8467315 160000 --- a/lib/finalize +++ b/lib/finalize @@ -1 +1 @@ -Subproject commit 0496a7b8f2f8b197010d8602b5fc529f5104704a +Subproject commit 846731531e7d1d80451787992e07bfe7dedbe9ff diff --git a/lib/magit b/lib/magit index aa0f186..0ee62ee 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit aa0f186467711534ec538e5bf9ea5fdbad0cfc1f +Subproject commit 0ee62ee80eca660a5d05dab34bcf4b80a3ee749d diff --git a/lib/magit-popup b/lib/magit-popup index 70e3cdd..3f23e81 160000 --- a/lib/magit-popup +++ b/lib/magit-popup @@ -1 +1 @@ -Subproject commit 70e3cdd6140ebdf477f86b88ac2bd1a8de115e88 +Subproject commit 3f23e81eb0267d6578d8f1733c5e42699b0229a1 diff --git a/lib/use-package b/lib/use-package index 98f9e12..865e931 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 98f9e120aaac902f611807002ed58215b2620bfd +Subproject commit 865e931889f33495f3ce1b9e14b5b3e959887424 diff --git a/lib/with-editor b/lib/with-editor index ee39f23..05338d8 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit ee39f232f2daf997498a4030d104c35ae397f457 +Subproject commit 05338d893f3879391d7283324364b472e3f4f4d1 From f6285fa8058838555692455c2b20b3496f288743 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 21 Dec 2017 03:13:00 +0100 Subject: [PATCH 09/21] Remove finalize This was a dependency of `emacsql', but as of 2.0.2-14-g616dde3 it no longer is required. --- .gitmodules | 3 --- lib/finalize | 1 - 2 files changed, 4 deletions(-) delete mode 160000 lib/finalize diff --git a/.gitmodules b/.gitmodules index 69e95e4..8600183 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,9 +24,6 @@ [submodule "epkg"] path = lib/epkg url = git@github.com:emacscollective/epkg.git -[submodule "finalize"] - path = lib/finalize - url = git@github.com:skeeto/elisp-finalize.git [submodule "git-modes"] path = lib/git-modes url = git@github.com:magit/git-modes.git diff --git a/lib/finalize b/lib/finalize deleted file mode 160000 index 8467315..0000000 --- a/lib/finalize +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 846731531e7d1d80451787992e07bfe7dedbe9ff From a2973a87e19e68d680570ef0b6d1118c34873a53 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 21 Dec 2017 03:14:00 +0100 Subject: [PATCH 10/21] Emacsg: init: Suppress package.el more reliably --- .gitignore | 1 + init.el | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index c09a28e..770d239 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /.cask /.hive-maint /custom.el +/elpa /var diff --git a/init.el b/init.el index b41a8c4..1e77fb6 100644 --- a/init.el +++ b/init.el @@ -10,6 +10,7 @@ (setq user-emacs-directory (file-name-directory user-init-file)) (message "Loading %s..." user-init-file) (setq package-enable-at-startup nil) + ;; (package-initialize) (setq inhibit-startup-buffer-menu t) (setq inhibit-startup-screen t) (setq inhibit-startup-echo-area-message "locutus") From 17f4770a18e8d93d0e6773193d421cb595dae29a Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 21 Dec 2017 03:15:00 +0100 Subject: [PATCH 11/21] Emacsg: init: Silence bogus warnings on newer Emacsen I mean, what am I supposed to do here? 26.1 doesn't want to use `if-let' and 25.3 doesn't have `if-let*'. --- init.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/init.el b/init.el index 1e77fb6..2059bc3 100644 --- a/init.el +++ b/init.el @@ -30,6 +30,11 @@ (require 'use-package) (setq use-package-verbose t)) +(use-package subr-x + :config + (put 'if-let 'byte-obsolete-info nil) + (put 'when-let 'byte-obsolete-info nil)) + (use-package auto-compile :demand t :config From 45b352b5d0842eb9caf2d44bc49d1ed5cb7afad4 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 21 Dec 2017 03:16:00 +0100 Subject: [PATCH 12/21] Emacsg: make: Silence bogus warnings on newer Emacsen I mean, what am I supposed to do here? 26.1 doesn't want to use `if-let' and 25.3 doesn't have `if-let*'. --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index be44cf3..60f5690 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,10 @@ EMACS ?= emacs all: build +SILENCIO = --load subr-x +SILENCIO += --eval "(put 'if-let 'byte-obsolete-info nil)" +SILENCIO += --eval "(put 'when-let 'byte-obsolete-info nil)" + help: $(info ) $(info make [all|build] = rebuild all drones and init files) @@ -21,7 +25,7 @@ help: build: @rm -f init.elc - @$(EMACS) -Q --batch -L lib/borg --load borg \ + @$(EMACS) -Q --batch -L lib/borg --load borg $(SILENCIO) \ --funcall borg-initialize \ --funcall borg-batch-rebuild 2>&1 @@ -33,12 +37,12 @@ build-init: quick: @rm -f init.elc - @$(EMACS) -Q --batch -L lib/borg --load borg \ + @$(EMACS) -Q --batch -L lib/borg --load borg $(SILENCIO) \ --funcall borg-initialize \ --eval '(borg-batch-rebuild t)' 2>&1 lib/%: .FORCE - @$(EMACS) -Q --batch -L lib/borg --load borg \ + @$(EMACS) -Q --batch -L lib/borg --load borg $(SILENCIO) \ --funcall borg-initialize \ --eval '(borg-build "$(@F)")' 2>&1 From 4e2539402138f65b38ba14f6df1975865f71cab0 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 21 Dec 2017 03:17:00 +0100 Subject: [PATCH 13/21] Emacsg: make: Silence bogus warnings on older Emacsen See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26177. --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 60f5690..1ebcf1b 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,11 @@ all: build SILENCIO = --load subr-x SILENCIO += --eval "(put 'if-let 'byte-obsolete-info nil)" SILENCIO += --eval "(put 'when-let 'byte-obsolete-info nil)" +SILENCIO += --eval "(fset 'original-message (symbol-function 'message))" +SILENCIO += --eval "(fset 'message\ +(lambda (format &rest args)\ + (unless (equal format \"pcase-memoize: equal first branch, yet different\")\ + (apply 'original-message format args))))" help: $(info ) From 2efadaadac5bc890a595f59fa8c2fb82974a1e46 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 21 Dec 2017 03:18:00 +0100 Subject: [PATCH 14/21] Emacsg: make: Add clean target --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1ebcf1b..1cc4e36 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ EMACS ?= emacs -.PHONY: all help build build-init quick bootstrap +.PHONY: all help build build-init quick bootstrap clean .FORCE: all: build @@ -26,6 +26,7 @@ help: $(info make lib/DRONE = rebuild DRONE) $(info make build-init = rebuild init files) $(info make bootstrap = bootstrap collective or new drones) + $(info make clean = remove all *.elc and *-autoloads.el) @printf "\n" build: @@ -58,3 +59,8 @@ bootstrap: @bin/borg-bootstrap @printf "\n=== Running 'make build' ===\n\n" @make build + +clean: + @find lib -name '*-autoloads.el' -exec rm '{}' ';' + @find lib -name '*.elc' -exec rm '{}' ';' + @rm -f init.elc From e532228c30c3bc7a3e3e1e40ea5ee1a553d4bb70 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 22 Dec 2017 21:22:30 +0100 Subject: [PATCH 15/21] Assimilate ghub v1.3.0-33-gb5f8152 --- .gitmodules | 3 +++ lib/ghub | 1 + 2 files changed, 4 insertions(+) create mode 160000 lib/ghub diff --git a/.gitmodules b/.gitmodules index 8600183..c8b1ec5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,6 +24,9 @@ [submodule "epkg"] path = lib/epkg url = git@github.com:emacscollective/epkg.git +[submodule "ghub"] + path = lib/ghub + url = git@github.com:tarsius/ghub.git [submodule "git-modes"] path = lib/git-modes url = git@github.com:magit/git-modes.git diff --git a/lib/ghub b/lib/ghub new file mode 160000 index 0000000..b5f8152 --- /dev/null +++ b/lib/ghub @@ -0,0 +1 @@ +Subproject commit b5f81522b0b5b896a62347eb5f238f67b47790b0 From 492ccd5441bbb55f1f62d3cd5a91459e32d1231e Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 11 Jan 2018 11:43:27 +0100 Subject: [PATCH 16/21] Emacs.g: Move Makefile and borg-bootstrap into borg package In the borg repository these files are renamed to "borg.mk" and "borg.sh" and modified slightly. Add a new "Makefile" here. It defines one simple target `borg-bootstrap', which is required to make "borg.mk" and "borg.sh" available during bootstrap and sources "borg.mk" for all the other targets it used to define. The target defined here is fairly simple and hopefully won't have to be updated often, but independent configurations still have integrate a copy of this file, because we cannot bootstrap out of thin air and `git submodule' isn't up to the task yet. Update borg to v2.0.0-20-g8399ec8 --- Makefile | 71 ++++----------------------------------- bin/borg-bootstrap | 82 ---------------------------------------------- lib/borg | 2 +- 3 files changed, 7 insertions(+), 148 deletions(-) delete mode 100755 bin/borg-bootstrap diff --git a/Makefile b/Makefile index 1cc4e36..974ffd8 100644 --- a/Makefile +++ b/Makefile @@ -1,66 +1,7 @@ -# Copyright (C) 2016-2017 Jonas Bernoulli -# -# Author: Jonas Bernoulli -# License: GPL v3 +-include lib/borg/borg.mk -EMACS ?= emacs - -.PHONY: all help build build-init quick bootstrap clean -.FORCE: - -all: build - -SILENCIO = --load subr-x -SILENCIO += --eval "(put 'if-let 'byte-obsolete-info nil)" -SILENCIO += --eval "(put 'when-let 'byte-obsolete-info nil)" -SILENCIO += --eval "(fset 'original-message (symbol-function 'message))" -SILENCIO += --eval "(fset 'message\ -(lambda (format &rest args)\ - (unless (equal format \"pcase-memoize: equal first branch, yet different\")\ - (apply 'original-message format args))))" - -help: - $(info ) - $(info make [all|build] = rebuild all drones and init files) - $(info make quick = rebuild most drones and init files) - $(info make lib/DRONE = rebuild DRONE) - $(info make build-init = rebuild init files) - $(info make bootstrap = bootstrap collective or new drones) - $(info make clean = remove all *.elc and *-autoloads.el) - @printf "\n" - -build: - @rm -f init.elc - @$(EMACS) -Q --batch -L lib/borg --load borg $(SILENCIO) \ - --funcall borg-initialize \ - --funcall borg-batch-rebuild 2>&1 - -build-init: - @rm -f init.elc - @$(EMACS) -Q --batch -L lib/borg --load borg \ - --funcall borg-initialize \ - --funcall borg-batch-rebuild-init 2>&1 - -quick: - @rm -f init.elc - @$(EMACS) -Q --batch -L lib/borg --load borg $(SILENCIO) \ - --funcall borg-initialize \ - --eval '(borg-batch-rebuild t)' 2>&1 - -lib/%: .FORCE - @$(EMACS) -Q --batch -L lib/borg --load borg $(SILENCIO) \ - --funcall borg-initialize \ - --eval '(borg-build "$(@F)")' 2>&1 - -bootstrap: - @printf "\n=== Running 'git submodule init' ===\n\n" - @git submodule init - @printf "\n=== Running 'bin/borg-bootstrap' ===\n" - @bin/borg-bootstrap - @printf "\n=== Running 'make build' ===\n\n" - @make build - -clean: - @find lib -name '*-autoloads.el' -exec rm '{}' ';' - @find lib -name '*.elc' -exec rm '{}' ';' - @rm -f init.elc +bootstrap-borg: + @git submodule--helper clone --name borg --path lib/borg \ + --url git@github.com:emacscollective/borg.git + @cd lib/borg; git symbolic-ref HEAD refs/heads/master + @cd lib/borg; git reset --hard HEAD diff --git a/bin/borg-bootstrap b/bin/borg-bootstrap deleted file mode 100755 index a47033b..0000000 --- a/bin/borg-bootstrap +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh - -# Copyright (C) 2016-2017 Jonas Bernoulli -# -# Author: Jonas Bernoulli -# License: GPL v3 - -hive_remote=$(git config -f .gitmodules borg.collective) -push_remote=$(git config -f .gitmodules borg.pushDefault) - -toplevel=$(git rev-parse --show-toplevel) -test -n "$toplevel" || exit 2 -cd "$toplevel" - -git submodule--helper list | -while read mode sha1 stage path -do - if test -e "$path" && ! test -e "$path"/.git - then - name=$(git submodule--helper name "$path") - - echo "\n--- [$name] ---\n" - - git submodule--helper clone \ - --name "$name" \ - --path "$path" \ - --url $(git config -f .gitmodules submodule."$name".url) - - git config -f .gitmodules --get-all submodule."$name".remote | - while read remote remote_url - do - if ! test -e "$path"/.git - then - git submodule--helper clone \ - --name "$name" \ - --path "$path" \ - --url "$remote_url" && - git remote rename origin "$remote" - else - cd "$path" - git remote add "$remote" "$remote_url" - git fetch "$remote" - cd "$toplevel" - fi - - if test -e "$path"/.git - then - cd "$path" - if test "$remote" = "$hive_remote" - then - if test -e "$toplevel/.hive-maint" - then - git config remote.pushDefault "$remote" - else - branch=$(git rev-parse --abbrev-ref HEAD) - test -n "$branch" && - git config branch.master.remote "$remote" - fi - elif test "$remote" = "$push_remote" - then - git config remote.pushDefault "$remote" - fi - cd "$toplevel" - fi - done - - if test -e "$path"/.git - then - cd "$path" - if ! git reset --hard "$sha1" - then - echo >&2 "futile: Checkout of '$sha1' into submodule path '$path' failed" - git reset --hard HEAD - exit 1 - fi - cd "$toplevel" - else - echo >&2 "futile: Clone of any remote into submodule path '$path' failed" - exit 1 - fi - fi -done diff --git a/lib/borg b/lib/borg index 4b908fd..8399ec8 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 4b908fd5b43dd9e48b3580b87cc77c4b65939f08 +Subproject commit 8399ec8f10204df92d5192823bb9bdeae7a4e3bc From 589754d0581c7d6d266bf436bc8ac9c3ca2b175c Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 11 Jan 2018 12:01:00 +0100 Subject: [PATCH 17/21] Update 4 drones Update dash to 2.13.0-61-g528e5a5 Update ghub to v1.3.0-34-g1395d56 Update magit to 2.11.0-389-g260e4afe3 Update use-package to 2.3-335-g05a4033 --- lib/dash | 2 +- lib/ghub | 2 +- lib/magit | 2 +- lib/use-package | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/dash b/lib/dash index 91d8cb0..528e5a5 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit 91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78 +Subproject commit 528e5a51f1af668e3075f2beccd2b39785ccb2ba diff --git a/lib/ghub b/lib/ghub index b5f8152..1395d56 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit b5f81522b0b5b896a62347eb5f238f67b47790b0 +Subproject commit 1395d56496c1581dda0c70a091500e2b947b8d35 diff --git a/lib/magit b/lib/magit index 0ee62ee..260e4af 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 0ee62ee80eca660a5d05dab34bcf4b80a3ee749d +Subproject commit 260e4afe32da63c32188b6a0b8262d3e3a011a2a diff --git a/lib/use-package b/lib/use-package index 865e931..05a4033 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 865e931889f33495f3ce1b9e14b5b3e959887424 +Subproject commit 05a4033b830bf52c596ceedea10b2cbd91f85fdb From 05231107649676d7ee94e0288c3364870047c4a0 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 11 Jan 2018 12:05:03 +0100 Subject: [PATCH 18/21] ghub: Update upstream url --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index c8b1ec5..4f1ffe5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,7 +26,7 @@ url = git@github.com:emacscollective/epkg.git [submodule "ghub"] path = lib/ghub - url = git@github.com:tarsius/ghub.git + url = git@github.com:magit/ghub.git [submodule "git-modes"] path = lib/git-modes url = git@github.com:magit/git-modes.git From 095eb3b8a4221f5faa96d3c429e29de17887f37f Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 15 Jan 2018 11:03:28 +0100 Subject: [PATCH 19/21] Emacsg: docs: Remove obsolete links --- README.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3e14f85..bd885e5 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ update the drones you have assimilated yourself. If you do base your own configuration on this collective and make it publically available as source of inspiration for others, then please do so by forking the upstream repository, which is available from -[Github][gh-this], [Gitlab][gl-this], and [Bitbucket][bb-this]. +[Github][gh-this]. You might also want to adjust this description. @@ -43,7 +43,7 @@ It is also possible to create collectives that can be shared between and worked on by many Emacs users, i.e. borg-based starter-kits. Check out alternative collectives by browsing the repositories owned by the `emacscollective` organisation/group/team, which is available -on [Github][gh-all], [Gitlab][gl-all], and [Bitbucket][bb-all]. +on [Github][gh-all]. Another alternative is the `bootstrap` collective. It assimilates a single drone, `borg` itself, and is intended for users for whom even @@ -54,8 +54,4 @@ the `emacs.g` collective is to opinionated. [manual]: https://emacsmirror.net/manual/borg [gh-this]: https://github.com/emacscollective/emacs.g -[gl-this]: https://gitlab.com/emacscollective/emacs.g -[bb-this]: https://bitbucket.com/emacscollective/emacs.g [gh-all]: https://github.com/emacscollective -[gl-all]: https://gitlab.com/emacscollective -[bb-all]: https://bitbucket.com/emacscollective From 2659f6c88915fb1bb444c3e56e50d817c34bcb2c Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 15 Jan 2018 12:16:15 +0100 Subject: [PATCH 20/21] Emacsg: docs: remove obsolete information --- README.md | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index bd885e5..dcde751 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Assimilate Emacs packages as Git submodules About `borg.el` --------------- -[Borg][repo] is a bare-bones package manager for Emacs packages. It +[Borg] is a bare-bones package manager for Emacs packages. It provides only a few essential features and should be combined with other tools such as Magit, `epkg`, `use-package`, and `auto-compile`. @@ -32,26 +32,11 @@ update the drones you have assimilated yourself. If you do base your own configuration on this collective and make it publically available as source of inspiration for others, then please do so by forking the upstream repository, which is available from -[Github][gh-this]. +[Github]. You might also want to adjust this description. -Other collectives ------------------ - -It is also possible to create collectives that can be shared between -and worked on by many Emacs users, i.e. borg-based starter-kits. -Check out alternative collectives by browsing the repositories owned -by the `emacscollective` organisation/group/team, which is available -on [Github][gh-all]. - -Another alternative is the `bootstrap` collective. It assimilates a -single drone, `borg` itself, and is intended for users for whom even -the `emacs.g` collective is to opinionated. - [init]: https://emacsair.me/2016/05/17/assimilate-emacs-packages-as-git-submodules -[repo]: https://gitlab.com/tarsius/borg +[Borg]: https://gitlab.com/tarsius/borg [manual]: https://emacsmirror.net/manual/borg - -[gh-this]: https://github.com/emacscollective/emacs.g -[gh-all]: https://github.com/emacscollective +[Github]: https://github.com/emacscollective/emacs.g From b5698f62356e3cd084a1654d24953ac4f1c5051e Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 15 Jan 2018 13:41:40 +0100 Subject: [PATCH 21/21] Update 7 drones Update auto-compile to 1.4.2 Update borg to v2.0.0-34-g362ae8a Update epkg to v3.0.0-28-gc8ab0e5 Update ghub to v1.3.0-37-g2962611 Update magit to 2.11.0-395-g24ce90832 Update magit-popup to v2.12.1 Update with-editor to v2.7.1 --- lib/auto-compile | 2 +- lib/borg | 2 +- lib/epkg | 2 +- lib/ghub | 2 +- lib/magit | 2 +- lib/magit-popup | 2 +- lib/with-editor | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/auto-compile b/lib/auto-compile index 694b92e..8d11786 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit 694b92ea58feb30a0104ccf2424fd921235ba517 +Subproject commit 8d117868a0a091389d528428136e60f951e9c550 diff --git a/lib/borg b/lib/borg index 8399ec8..362ae8a 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 8399ec8f10204df92d5192823bb9bdeae7a4e3bc +Subproject commit 362ae8aebc69aab81e04427d221717dd6bc1a81d diff --git a/lib/epkg b/lib/epkg index 71ce3ff..c8ab0e5 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 71ce3ffd41bdc90c649a044ddbee0b32b329c612 +Subproject commit c8ab0e5e1fda70113633ac6ee01c0aaecd8a1a99 diff --git a/lib/ghub b/lib/ghub index 1395d56..2962611 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit 1395d56496c1581dda0c70a091500e2b947b8d35 +Subproject commit 2962611aad56a0f1586383b3e4ba6a65508a3991 diff --git a/lib/magit b/lib/magit index 260e4af..24ce908 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 260e4afe32da63c32188b6a0b8262d3e3a011a2a +Subproject commit 24ce90832ddff0db86581c1b7e947e83a13fe83e diff --git a/lib/magit-popup b/lib/magit-popup index 3f23e81..5a2a6f2 160000 --- a/lib/magit-popup +++ b/lib/magit-popup @@ -1 +1 @@ -Subproject commit 3f23e81eb0267d6578d8f1733c5e42699b0229a1 +Subproject commit 5a2a6f2907a09c7592c4631d2678dd7ab44fd5a2 diff --git a/lib/with-editor b/lib/with-editor index 05338d8..04d59d6 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 05338d893f3879391d7283324364b472e3f4f4d1 +Subproject commit 04d59d68dab58a7cf3034c84d8ba0553b78ae30c