From f3778d700f109e4bc67a3f7088b9d41cc8f4b2db Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 27 Nov 2017 11:56:33 +0100 Subject: [PATCH 01/52] 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 02/52] 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 03/52] 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 04/52] 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 05/52] 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 06/52] 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 07/52] 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 08/52] 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 09/52] 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 10/52] 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 11/52] 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 12/52] 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 13/52] 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 14/52] 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 15/52] 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 16/52] 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 17/52] 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 From 69886354f6fd0b7bda80263c90067aa5328b3725 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Wed, 17 Jan 2018 16:57:47 +0100 Subject: [PATCH 18/52] Update 4 drones Update borg to v2.0.0-35-g454daf9 Update dash to 2.13.0-63-g138c22a Update ghub to v1.3.0-38-g8959334 Update magit to 2.11.0-411-g73ea37afb --- lib/borg | 2 +- lib/dash | 2 +- lib/ghub | 2 +- lib/magit | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/borg b/lib/borg index 362ae8a..454daf9 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 362ae8aebc69aab81e04427d221717dd6bc1a81d +Subproject commit 454daf91e53e94292a59308c54b251fd83f99464 diff --git a/lib/dash b/lib/dash index 528e5a5..138c22a 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit 528e5a51f1af668e3075f2beccd2b39785ccb2ba +Subproject commit 138c22a96c35337a7ba5860e56dd4d5395685d92 diff --git a/lib/ghub b/lib/ghub index 2962611..8959334 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit 2962611aad56a0f1586383b3e4ba6a65508a3991 +Subproject commit 895933408a8bf20623264ce9b6440999a3669f17 diff --git a/lib/magit b/lib/magit index 24ce908..73ea37a 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 24ce90832ddff0db86581c1b7e947e83a13fe83e +Subproject commit 73ea37afbb6d4eca7a67d0652a5e41e4a8d3b421 From 824851317705f3b6d8755d817e1f03c696b325ef Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Wed, 17 Jan 2018 17:37:47 +0100 Subject: [PATCH 19/52] eldoc: don't enable global-eldoc-mode on Emacs 24 --- init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/init.el b/init.el index 2059bc3..d0ff054 100644 --- a/init.el +++ b/init.el @@ -83,6 +83,7 @@ :config (setq dired-listing-switches "-alh")) (use-package eldoc + :when (version< "25" emacs-version) :config (global-eldoc-mode)) (use-package help From 308b112d18409b71cbd373b56940374b444e4303 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Wed, 17 Jan 2018 17:39:03 +0100 Subject: [PATCH 20/52] save-place: don't enable save-place-mode on Emacs 24 --- init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/init.el b/init.el index d0ff054..ca1ae51 100644 --- a/init.el +++ b/init.el @@ -132,6 +132,7 @@ :config (savehist-mode)) (use-package saveplace + :when (version< "25" emacs-version) :config (save-place-mode)) (use-package simple From 68a7187fc2d988ea9a5a97b43fc7c81926159e05 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 29 Jan 2018 10:55:43 +0100 Subject: [PATCH 21/52] Update 8 drones Update borg to v2.0.0-37-g593314b Update dash to 2.13.0-65-gc1991d4 Update diff-hl to 1.8.4-15-g9ef21e4 Update emacsql to 2.0.2-16-g62d3915 Update ghub to v1.3.0-39-gf1b647f Update magit to 2.11.0-471-g4e637088f Update magit-popup to v2.12.2 Update use-package to 2.3-349-g8ecb0f1 --- lib/borg | 2 +- lib/dash | 2 +- lib/diff-hl | 2 +- lib/emacsql | 2 +- lib/ghub | 2 +- lib/magit | 2 +- lib/magit-popup | 2 +- lib/use-package | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/borg b/lib/borg index 454daf9..593314b 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 454daf91e53e94292a59308c54b251fd83f99464 +Subproject commit 593314b8f1f4542155eb4dae0ff1be375895b83d diff --git a/lib/dash b/lib/dash index 138c22a..c1991d4 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit 138c22a96c35337a7ba5860e56dd4d5395685d92 +Subproject commit c1991d4c22f356be21df6b3badd7233a94df7937 diff --git a/lib/diff-hl b/lib/diff-hl index bec9889..9ef21e4 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit bec9889de7bf48d28826039880cec9bfad24a628 +Subproject commit 9ef21e4ea2389545417741e20a89d92bfd72d6ff diff --git a/lib/emacsql b/lib/emacsql index 616dde3..62d3915 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit 616dde37524f47246bbb161f20d3f5f090f10fbf +Subproject commit 62d39157370219a1680265fa593f90ccd51457da diff --git a/lib/ghub b/lib/ghub index 8959334..f1b647f 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit 895933408a8bf20623264ce9b6440999a3669f17 +Subproject commit f1b647faf5ce5f033728236b9263e7ecee8f536f diff --git a/lib/magit b/lib/magit index 73ea37a..4e63708 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 73ea37afbb6d4eca7a67d0652a5e41e4a8d3b421 +Subproject commit 4e637088f297639ac740fc8aa662610958ad38ce diff --git a/lib/magit-popup b/lib/magit-popup index 5a2a6f2..ab75385 160000 --- a/lib/magit-popup +++ b/lib/magit-popup @@ -1 +1 @@ -Subproject commit 5a2a6f2907a09c7592c4631d2678dd7ab44fd5a2 +Subproject commit ab75385a1fb8c0fba0769d448b13ba8324835261 diff --git a/lib/use-package b/lib/use-package index 05a4033..8ecb0f1 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 05a4033b830bf52c596ceedea10b2cbd91f85fdb +Subproject commit 8ecb0f1c56eaeb04213b476866eaa6939f735a61 From 935483742cd956693fd785a281a551bec432eaa6 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 9 Feb 2018 20:50:00 +0100 Subject: [PATCH 22/52] Update 6 drones Update dash to 2.13.0-67-g48a5015 Update diff-hl to 1.8.4-16-g190622d Update emacsql to 2.0.2-17-g75ac044 Update ghub to v1.3.0-42-gb267bb6 Update magit to 2.11.0-513-g153001052 Update use-package to 2.3-353-g6af4b6c --- lib/dash | 2 +- lib/diff-hl | 2 +- lib/emacsql | 2 +- lib/ghub | 2 +- lib/magit | 2 +- lib/use-package | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/dash b/lib/dash index c1991d4..48a5015 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit c1991d4c22f356be21df6b3badd7233a94df7937 +Subproject commit 48a5015dd1314a8bcad48f2ad8866dd911001b01 diff --git a/lib/diff-hl b/lib/diff-hl index 9ef21e4..190622d 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit 9ef21e4ea2389545417741e20a89d92bfd72d6ff +Subproject commit 190622d3fa2c3237529ec073a8fa00aee06023a1 diff --git a/lib/emacsql b/lib/emacsql index 62d3915..75ac044 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit 62d39157370219a1680265fa593f90ccd51457da +Subproject commit 75ac0448a5965c82c616c862cab180c241110fd2 diff --git a/lib/ghub b/lib/ghub index f1b647f..b267bb6 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit f1b647faf5ce5f033728236b9263e7ecee8f536f +Subproject commit b267bb6c55b0c05aec4d3fe0e9385ab0e1139463 diff --git a/lib/magit b/lib/magit index 4e63708..1530010 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 4e637088f297639ac740fc8aa662610958ad38ce +Subproject commit 153001052f2801ff2eb4650231e9dde31c74bcf3 diff --git a/lib/use-package b/lib/use-package index 8ecb0f1..6af4b6c 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 8ecb0f1c56eaeb04213b476866eaa6939f735a61 +Subproject commit 6af4b6caf67f5fbd63429d27fa54a92933df966a From 5420d5312f151e55786a3ff14c7f268ec4029eed Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 9 Feb 2018 20:51:17 +0100 Subject: [PATCH 23/52] custom: Do not require This prevents `custom.el' from being loaded again when compiling `init.el'. Preventing that is necessary because the use face would otherwise be reloaded, which would undo all changes to faces that were done using `set-face-attribute' or similar. --- init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/init.el b/init.el index ca1ae51..88cde1a 100644 --- a/init.el +++ b/init.el @@ -54,6 +54,7 @@ (expand-file-name "var/epkgs/" user-emacs-directory))) (use-package custom + :no-require t :config (setq custom-file (expand-file-name "custom.el" user-emacs-directory)) (when (file-exists-p custom-file) From 1f27169059f4f08d6c208f1d1787f74a34bce651 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 2 Mar 2018 21:41:05 +0100 Subject: [PATCH 24/52] Update 7 drones Update borg to v2.0.0-43-g01e9720 Update epkg to v3.0.0-30-gbc78f60 Update ghub to v1.3.0-49-ga98da28 Update git-modes to 1.2.6-1-g8ca6595 Update magit to 2.11.0-574-g8d8b351d2 Update magit-popup to v2.12.2-2-g48cf02b Update with-editor to v2.7.1-2-gfcbccec --- lib/borg | 2 +- lib/epkg | 2 +- lib/ghub | 2 +- lib/git-modes | 2 +- lib/magit | 2 +- lib/magit-popup | 2 +- lib/with-editor | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/borg b/lib/borg index 593314b..01e9720 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 593314b8f1f4542155eb4dae0ff1be375895b83d +Subproject commit 01e9720ba31ceef2245c8e45c714ae505ad4b1fe diff --git a/lib/epkg b/lib/epkg index c8ab0e5..bc78f60 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit c8ab0e5e1fda70113633ac6ee01c0aaecd8a1a99 +Subproject commit bc78f600b2c451bc8df1cf73bbb14476c11ece1d diff --git a/lib/ghub b/lib/ghub index b267bb6..a98da28 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit b267bb6c55b0c05aec4d3fe0e9385ab0e1139463 +Subproject commit a98da28d482d48b89ef8e70141f4689657217c62 diff --git a/lib/git-modes b/lib/git-modes index 9f18eca..8ca6595 160000 --- a/lib/git-modes +++ b/lib/git-modes @@ -1 +1 @@ -Subproject commit 9f18eca514d242816a4969e86c4cfd2cf4dfe401 +Subproject commit 8ca6595b1362d5882d5642e79f7bb2f18f1c8bbe diff --git a/lib/magit b/lib/magit index 1530010..8d8b351 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 153001052f2801ff2eb4650231e9dde31c74bcf3 +Subproject commit 8d8b351d24dd0fa73f639f8b12ed27742d927305 diff --git a/lib/magit-popup b/lib/magit-popup index ab75385..48cf02b 160000 --- a/lib/magit-popup +++ b/lib/magit-popup @@ -1 +1 @@ -Subproject commit ab75385a1fb8c0fba0769d448b13ba8324835261 +Subproject commit 48cf02b8e4d7d4a83bc22cacd64cbf4e6a266aa2 diff --git a/lib/with-editor b/lib/with-editor index 04d59d6..fcbccec 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 04d59d68dab58a7cf3034c84d8ba0553b78ae30c +Subproject commit fcbccec6ec0f6639eab769d6ff8e97f25347a48e From 11330a80657bb3cf3c00d79f91e2f4716b93e548 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Tue, 27 Mar 2018 17:50:41 +0200 Subject: [PATCH 25/52] Update 12 drones Update auto-compile to 1.4.3 Update borg to v2.0.0-54-gb03e8d1 Update closql to v0.5.1-2-gbfd5a5e Update dash to 2.13.0-69-g87d5fea Update epkg to v3.0.0-32-g432312b Update ghub to v2.0.0 Update git-modes to 1.2.7 Update magit to 2.11.0-608-g4b9386cd6 Update magit-popup to v2.12.2-7-g907f40a Update packed to 3.0.0 Update use-package to 2.3-372-g592c3fb Update with-editor to v2.7.1-7-gff3e969 --- lib/auto-compile | 2 +- lib/borg | 2 +- lib/closql | 2 +- lib/dash | 2 +- lib/epkg | 2 +- lib/ghub | 2 +- lib/git-modes | 2 +- lib/magit | 2 +- lib/magit-popup | 2 +- lib/packed | 2 +- lib/use-package | 2 +- lib/with-editor | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/auto-compile b/lib/auto-compile index 8d11786..6ce4255 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit 8d117868a0a091389d528428136e60f951e9c550 +Subproject commit 6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f diff --git a/lib/borg b/lib/borg index 01e9720..b03e8d1 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 01e9720ba31ceef2245c8e45c714ae505ad4b1fe +Subproject commit b03e8d19874809e813c9631d29260bac73f51e01 diff --git a/lib/closql b/lib/closql index 01cb892..bfd5a5e 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 01cb892f6a457fbff857d924cebfdc77f69bd45d +Subproject commit bfd5a5e4d32bc00e439c86f42859964d4fa91dc3 diff --git a/lib/dash b/lib/dash index 48a5015..87d5fea 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit 48a5015dd1314a8bcad48f2ad8866dd911001b01 +Subproject commit 87d5feac1a08ea09e55e52442dc5e497817b4f08 diff --git a/lib/epkg b/lib/epkg index bc78f60..432312b 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit bc78f600b2c451bc8df1cf73bbb14476c11ece1d +Subproject commit 432312b9583ed7b88ad9644fd1bf2183765a892e diff --git a/lib/ghub b/lib/ghub index a98da28..ae37bef 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit a98da28d482d48b89ef8e70141f4689657217c62 +Subproject commit ae37bef2eb3afb8232bb0a6f7306a8da2390abf4 diff --git a/lib/git-modes b/lib/git-modes index 8ca6595..b08ac12 160000 --- a/lib/git-modes +++ b/lib/git-modes @@ -1 +1 @@ -Subproject commit 8ca6595b1362d5882d5642e79f7bb2f18f1c8bbe +Subproject commit b08ac12f09a6cfe967ef70dad3f22430da4fbdab diff --git a/lib/magit b/lib/magit index 8d8b351..4b9386c 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 8d8b351d24dd0fa73f639f8b12ed27742d927305 +Subproject commit 4b9386cd6f250a09574e69e10a74ffb6a71cbf19 diff --git a/lib/magit-popup b/lib/magit-popup index 48cf02b..907f40a 160000 --- a/lib/magit-popup +++ b/lib/magit-popup @@ -1 +1 @@ -Subproject commit 48cf02b8e4d7d4a83bc22cacd64cbf4e6a266aa2 +Subproject commit 907f40a8e51447a08acc8579b87baacea609b60a diff --git a/lib/packed b/lib/packed index 94ea12b..c41c3df 160000 --- a/lib/packed +++ b/lib/packed @@ -1 +1 @@ -Subproject commit 94ea12b9d44bfa42c28d0548199f2fcd19e4aa6a +Subproject commit c41c3dfda86ae33832ffc146923e2a4675cbacfa diff --git a/lib/use-package b/lib/use-package index 6af4b6c..592c3fb 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 6af4b6caf67f5fbd63429d27fa54a92933df966a +Subproject commit 592c3fb71a6a653d833e54c5e271628c4775b6da diff --git a/lib/with-editor b/lib/with-editor index fcbccec..ff3e969 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit fcbccec6ec0f6639eab769d6ff8e97f25347a48e +Subproject commit ff3e96929d4532e33422a5980a6e3ca9f2fcf032 From 63b05ddb6faef4ecdacb05bae3185dc09956533b Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 21 May 2018 20:24:05 +0200 Subject: [PATCH 26/52] Update 10 drones Update borg to v2.0.0-58-gd386e9e Update closql to v0.5.1-3-g1e8a710 Update dash to 2.14.1 Update diff-hl to 1.8.4-18-g154c64a Update emacsql to 2.0.2-18-ga96b258 Update ghub to v2.0.1 Update magit to 2.12.1-131-g66d9558f Update magit-popup to v2.12.3-3-g60ff82a Update use-package to 2.3-383-gd3ace72 Update with-editor to v2.7.3 --- lib/borg | 2 +- lib/closql | 2 +- lib/dash | 2 +- lib/diff-hl | 2 +- lib/emacsql | 2 +- lib/ghub | 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/borg b/lib/borg index b03e8d1..d386e9e 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit b03e8d19874809e813c9631d29260bac73f51e01 +Subproject commit d386e9e9bdfc04f5721b10677e5ddf64bb4a032a diff --git a/lib/closql b/lib/closql index bfd5a5e..1e8a710 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit bfd5a5e4d32bc00e439c86f42859964d4fa91dc3 +Subproject commit 1e8a710349da31e81018b7f9ebcab5759b923b14 diff --git a/lib/dash b/lib/dash index 87d5fea..a74f4cf 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit 87d5feac1a08ea09e55e52442dc5e497817b4f08 +Subproject commit a74f4cfcdc8d0642a9f602ad494f0354f27dacc9 diff --git a/lib/diff-hl b/lib/diff-hl index 190622d..154c64a 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit 190622d3fa2c3237529ec073a8fa00aee06023a1 +Subproject commit 154c64affe7bdd16da814d198277d29bd1b6bb2a diff --git a/lib/emacsql b/lib/emacsql index 75ac044..a96b258 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit 75ac0448a5965c82c616c862cab180c241110fd2 +Subproject commit a96b2587c46be256c28c735ac9f68af3dfa5a1fe diff --git a/lib/ghub b/lib/ghub index ae37bef..4831933 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit ae37bef2eb3afb8232bb0a6f7306a8da2390abf4 +Subproject commit 4831933da059ee084a16016558b9ccd8c581a8ff diff --git a/lib/magit b/lib/magit index 4b9386c..66d9558 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 4b9386cd6f250a09574e69e10a74ffb6a71cbf19 +Subproject commit 66d9558f4f50332a68213683f7702ca0735f7171 diff --git a/lib/magit-popup b/lib/magit-popup index 907f40a..60ff82a 160000 --- a/lib/magit-popup +++ b/lib/magit-popup @@ -1 +1 @@ -Subproject commit 907f40a8e51447a08acc8579b87baacea609b60a +Subproject commit 60ff82ac7aa8dbc24eb3c34dbed13ad01f20671c diff --git a/lib/use-package b/lib/use-package index 592c3fb..d3ace72 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 592c3fb71a6a653d833e54c5e271628c4775b6da +Subproject commit d3ace722ea890f9e99054af4487eff65c4e36243 diff --git a/lib/with-editor b/lib/with-editor index ff3e969..ad5bb00 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit ff3e96929d4532e33422a5980a6e3ca9f2fcf032 +Subproject commit ad5bb005ed3afec2d8b9b2bc1df19fb9b5e2dd84 From 1eb0b81bccc207031e33eed39af13e57c06a4a73 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 23 Jun 2018 16:28:51 -0500 Subject: [PATCH 27/52] Update 8 drones Update borg to v2.0.0-63-g3debf91 Update closql to v0.5.2-4-gdb22efc Update epkg to v3.0.0-33-g81b1a33 Update ghub to v2.0.1-8-gebab22e Update magit to 2.13.0-82-g39899005 Update magit-popup to v2.12.3-4-ge2060cc Update use-package to 2.3-392-g60c81ca Update with-editor to v2.7.3-1-gfb9fdde --- lib/borg | 2 +- lib/closql | 2 +- lib/epkg | 2 +- lib/ghub | 2 +- lib/magit | 2 +- lib/magit-popup | 2 +- lib/use-package | 2 +- lib/with-editor | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/borg b/lib/borg index d386e9e..3debf91 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit d386e9e9bdfc04f5721b10677e5ddf64bb4a032a +Subproject commit 3debf915fbdd9c6d9a014ab0d3f28dd8c998d6c4 diff --git a/lib/closql b/lib/closql index 1e8a710..db22efc 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 1e8a710349da31e81018b7f9ebcab5759b923b14 +Subproject commit db22efccdd91974a024eb6f7ddd3b78f499dc7e2 diff --git a/lib/epkg b/lib/epkg index 432312b..81b1a33 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 432312b9583ed7b88ad9644fd1bf2183765a892e +Subproject commit 81b1a33b560eeca402745ccff19cdc422e6b22dd diff --git a/lib/ghub b/lib/ghub index 4831933..ebab22e 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit 4831933da059ee084a16016558b9ccd8c581a8ff +Subproject commit ebab22e345f489d92b6a2fc179049405344c4d8f diff --git a/lib/magit b/lib/magit index 66d9558..3989900 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 66d9558f4f50332a68213683f7702ca0735f7171 +Subproject commit 398990054005d4c348ae50da35190652d8e754dc diff --git a/lib/magit-popup b/lib/magit-popup index 60ff82a..e2060cc 160000 --- a/lib/magit-popup +++ b/lib/magit-popup @@ -1 +1 @@ -Subproject commit 60ff82ac7aa8dbc24eb3c34dbed13ad01f20671c +Subproject commit e2060ccb3105555f55992a995587221820341b24 diff --git a/lib/use-package b/lib/use-package index d3ace72..60c81ca 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit d3ace722ea890f9e99054af4487eff65c4e36243 +Subproject commit 60c81caac17e6a7ab5bd66df0c981b0530b51586 diff --git a/lib/with-editor b/lib/with-editor index ad5bb00..fb9fdde 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit ad5bb005ed3afec2d8b9b2bc1df19fb9b5e2dd84 +Subproject commit fb9fdde14eddd5bd180d4baabfedc45e5492e115 From edeb3df1050e17862f965b254a151d1b133be3cb Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 23 Jun 2018 16:31:38 -0500 Subject: [PATCH 28/52] magit: Compile recursively --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 4f1ffe5..ac5f78d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,6 +33,7 @@ [submodule "magit"] path = lib/magit url = git@github.com:magit/magit.git + recursive-byte-compile = true info-path = Documentation [submodule "magit-popup"] path = lib/magit-popup From ba5ffda54267459225d6f2e20942128bbc4fb7d7 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 23 Jun 2018 16:32:05 -0500 Subject: [PATCH 29/52] Revert "Emacsg: init: Silence bogus warnings on newer Emacsen" This reverts commit 17f4770a18e8d93d0e6773193d421cb595dae29a. --- init.el | 5 ----- 1 file changed, 5 deletions(-) diff --git a/init.el b/init.el index 88cde1a..97478ed 100644 --- a/init.el +++ b/init.el @@ -30,11 +30,6 @@ (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 c83f0171edda6310eb94ee15456a3628fedd0a66 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 24 Jun 2018 14:05:08 -0500 Subject: [PATCH 30/52] Rewind magit to 2.13.0-66-gc98ea64a I accidentally updated to the "forge" branch earlier. --- lib/magit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/magit b/lib/magit index 3989900..c98ea64 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 398990054005d4c348ae50da35190652d8e754dc +Subproject commit c98ea64ac1e64e72c55614ef482a1fc4b095fb17 From 61af8a61231f83c58692dbaa3c37954d14c21564 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 15 Dec 2018 15:19:06 +0100 Subject: [PATCH 31/52] Update 12 drones Update borg to v3.0.1 Update closql to v1.0.0 Update dash to 2.14.1-21-g6514359 Update diff-hl to 1.8.5 Update emacsql to 3.0.0-1-gf8c3d9f Update epkg to v3.1.1-1-gc42bc98 Update ghub to v3.0.0-15-g53e2e29 Update git-modes to 1.2.8 Update magit to v2.90.1-67-ga2b3184a4 Update magit-popup to v2.12.5 Update use-package to 2.4 Update with-editor to v2.8.0-3-g9dd9f17 --- lib/borg | 2 +- lib/closql | 2 +- lib/dash | 2 +- lib/diff-hl | 2 +- lib/emacsql | 2 +- lib/epkg | 2 +- lib/ghub | 2 +- lib/git-modes | 2 +- lib/magit | 2 +- lib/magit-popup | 2 +- lib/use-package | 2 +- lib/with-editor | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/borg b/lib/borg index 3debf91..99d1667 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 3debf915fbdd9c6d9a014ab0d3f28dd8c998d6c4 +Subproject commit 99d166796f181741ebd79542b96824b096bcb36c diff --git a/lib/closql b/lib/closql index db22efc..012b94f 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit db22efccdd91974a024eb6f7ddd3b78f499dc7e2 +Subproject commit 012b94f8695e194455111fd54eff0b94dd0dd0db diff --git a/lib/dash b/lib/dash index a74f4cf..6514359 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit a74f4cfcdc8d0642a9f602ad494f0354f27dacc9 +Subproject commit 6514359b8606a6a9a94068ccd601fcd6379d6584 diff --git a/lib/diff-hl b/lib/diff-hl index 154c64a..069a925 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit 154c64affe7bdd16da814d198277d29bd1b6bb2a +Subproject commit 069a92590000269a9a5b0b7aebbae9595675a59c diff --git a/lib/emacsql b/lib/emacsql index a96b258..f8c3d9f 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit a96b2587c46be256c28c735ac9f68af3dfa5a1fe +Subproject commit f8c3d9fce28ab7d5b0c9fcf2c1236151ca7add24 diff --git a/lib/epkg b/lib/epkg index 81b1a33..c42bc98 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 81b1a33b560eeca402745ccff19cdc422e6b22dd +Subproject commit c42bc98a711ffa8d2a7b9096b563ac0edb0b9bf3 diff --git a/lib/ghub b/lib/ghub index ebab22e..53e2e29 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit ebab22e345f489d92b6a2fc179049405344c4d8f +Subproject commit 53e2e29308a70968be4eda0ff640dc7b538205a6 diff --git a/lib/git-modes b/lib/git-modes index b08ac12..5546831 160000 --- a/lib/git-modes +++ b/lib/git-modes @@ -1 +1 @@ -Subproject commit b08ac12f09a6cfe967ef70dad3f22430da4fbdab +Subproject commit 55468314a5f6b77d2c96be62c7005ac94545e217 diff --git a/lib/magit b/lib/magit index c98ea64..a2b3184 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit c98ea64ac1e64e72c55614ef482a1fc4b095fb17 +Subproject commit a2b3184a483c67ca4ad85c63af02c6524588888d diff --git a/lib/magit-popup b/lib/magit-popup index e2060cc..8eaa0be 160000 --- a/lib/magit-popup +++ b/lib/magit-popup @@ -1 +1 @@ -Subproject commit e2060ccb3105555f55992a995587221820341b24 +Subproject commit 8eaa0becc2370484a432a8a19f40ce5e8d0f1642 diff --git a/lib/use-package b/lib/use-package index 60c81ca..39a8b88 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 60c81caac17e6a7ab5bd66df0c981b0530b51586 +Subproject commit 39a8b8812c2c9f6f0b299e6a04e504ef393694ce diff --git a/lib/with-editor b/lib/with-editor index fb9fdde..9dd9f17 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit fb9fdde14eddd5bd180d4baabfedc45e5492e115 +Subproject commit 9dd9f176d96abc60365369de6d08c26c414ef1f3 From 35792d36b9d9d7175693ae50003e911a175b69fb Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 27 Dec 2018 12:28:49 +0100 Subject: [PATCH 32/52] Update 5 drones Update auto-compile to 1.5.0 Update diff-hl to 1.8.5-3-g2cddce4 Update epkg to v3.1.2 Update ghub to v3.2.0 Update magit to v2.90.1-83-g4e5753769 --- lib/auto-compile | 2 +- lib/diff-hl | 2 +- lib/epkg | 2 +- lib/ghub | 2 +- lib/magit | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/auto-compile b/lib/auto-compile index 6ce4255..bed783e 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit 6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f +Subproject commit bed783e7a85d5812cf1cb3f39c40ba718e015be6 diff --git a/lib/diff-hl b/lib/diff-hl index 069a925..2cddce4 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit 069a92590000269a9a5b0b7aebbae9595675a59c +Subproject commit 2cddce48d472111f178da84d44656f92012aa64b diff --git a/lib/epkg b/lib/epkg index c42bc98..d9e1dd2 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit c42bc98a711ffa8d2a7b9096b563ac0edb0b9bf3 +Subproject commit d9e1dd216b4bbe86686b1656dbdccef508301f7d diff --git a/lib/ghub b/lib/ghub index 53e2e29..b04c7d9 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit 53e2e29308a70968be4eda0ff640dc7b538205a6 +Subproject commit b04c7d9a3318316ef67a5d360582d990dc9f6098 diff --git a/lib/magit b/lib/magit index a2b3184..4e57537 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit a2b3184a483c67ca4ad85c63af02c6524588888d +Subproject commit 4e57537694e2758a4287973168e4f0d432ad1ae9 From 1de7198d71a0df67180750d95f4b1ca5ee907c1e Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 27 Dec 2018 12:29:52 +0100 Subject: [PATCH 33/52] auto-compile: No longer inhibit when HEAD is detached --- init.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/init.el b/init.el index 97478ed..7a6380c 100644 --- a/init.el +++ b/init.el @@ -39,9 +39,7 @@ (setq auto-compile-mode-line-counter t) (setq auto-compile-source-recreate-deletes-dest t) (setq auto-compile-toggle-deletes-nonlib-dest t) - (setq auto-compile-update-autoloads t) - (add-hook 'auto-compile-inhibit-compile-hook - 'auto-compile-inhibit-compile-detached-git-head)) + (setq auto-compile-update-autoloads t)) (use-package epkg :defer t From ed61c18c30784fb9666b1d5d753888c31ad64a55 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 27 Dec 2018 12:47:39 +0100 Subject: [PATCH 34/52] Assimilate graphql 0.1.1-4-ge2b3096 Ghub depends on it now. --- .gitmodules | 3 +++ lib/graphql | 1 + 2 files changed, 4 insertions(+) create mode 160000 lib/graphql diff --git a/.gitmodules b/.gitmodules index ac5f78d..baedc10 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,6 +30,9 @@ [submodule "git-modes"] path = lib/git-modes url = git@github.com:magit/git-modes.git +[submodule "graphql"] + path = lib/graphql + url = git@github.com:vermiculus/graphql.el.git [submodule "magit"] path = lib/magit url = git@github.com:magit/magit.git diff --git a/lib/graphql b/lib/graphql new file mode 160000 index 0000000..e2b3096 --- /dev/null +++ b/lib/graphql @@ -0,0 +1 @@ +Subproject commit e2b309689f4faf9225f290080f836e988c5a576d From 234b38c169ac58270a44f0707616f4521cb33216 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 27 Dec 2018 12:48:48 +0100 Subject: [PATCH 35/52] Assimilate treepy 0.1.1 Ghub depends on it now. --- .gitmodules | 3 +++ lib/treepy | 1 + 2 files changed, 4 insertions(+) create mode 160000 lib/treepy diff --git a/.gitmodules b/.gitmodules index baedc10..8b6911c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -44,6 +44,9 @@ [submodule "packed"] path = lib/packed url = git@github.com:emacscollective/packed.git +[submodule "treepy"] + path = lib/treepy + url = git@github.com:volrath/treepy.el.git [submodule "use-package"] path = lib/use-package url = git@github.com:jwiegley/use-package.git diff --git a/lib/treepy b/lib/treepy new file mode 160000 index 0000000..b40e6b0 --- /dev/null +++ b/lib/treepy @@ -0,0 +1 @@ +Subproject commit b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d From 27a6979dc38f56432252fa23217eafe511021714 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 17 Feb 2019 00:31:32 +0100 Subject: [PATCH 36/52] Update 8 drones Update auto-compile to 1.5.1 Update borg to v3.1.0 Update dash to 2.15.0-2-g26f065f Update diff-hl to 1.8.5-4-g76289d2 Update emacsql to 3.0.0-5-g59147c4 Update epkg to v3.2.0 Update ghub to v3.2.0-6-g3566dc6 Update use-package to 2.4-2-g1273166 --- lib/auto-compile | 2 +- lib/borg | 2 +- lib/dash | 2 +- lib/diff-hl | 2 +- lib/emacsql | 2 +- lib/epkg | 2 +- lib/ghub | 2 +- lib/use-package | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/auto-compile b/lib/auto-compile index bed783e..e6bbb13 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit bed783e7a85d5812cf1cb3f39c40ba718e015be6 +Subproject commit e6bbb1371324c8884af3b201e9adbc9296eb2ff4 diff --git a/lib/borg b/lib/borg index 99d1667..4ffec24 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 99d166796f181741ebd79542b96824b096bcb36c +Subproject commit 4ffec24967ba805be2b2f1750e7cfffb85e26a1f diff --git a/lib/dash b/lib/dash index 6514359..26f065f 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit 6514359b8606a6a9a94068ccd601fcd6379d6584 +Subproject commit 26f065fd607cdf1a68e7987b9360accc2d0cbfb6 diff --git a/lib/diff-hl b/lib/diff-hl index 2cddce4..76289d2 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit 2cddce48d472111f178da84d44656f92012aa64b +Subproject commit 76289d24c61fac501d955a8419b5fdf7debddd5f diff --git a/lib/emacsql b/lib/emacsql index f8c3d9f..59147c4 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit f8c3d9fce28ab7d5b0c9fcf2c1236151ca7add24 +Subproject commit 59147c4cdfd18dc2736a6502a3283564ab5c1457 diff --git a/lib/epkg b/lib/epkg index d9e1dd2..4243b36 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit d9e1dd216b4bbe86686b1656dbdccef508301f7d +Subproject commit 4243b363d038b28650479b23949cb7dfd319542b diff --git a/lib/ghub b/lib/ghub index b04c7d9..3566dc6 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit b04c7d9a3318316ef67a5d360582d990dc9f6098 +Subproject commit 3566dc6e18d61455060a96deb70779c91f079c62 diff --git a/lib/use-package b/lib/use-package index 39a8b88..1273166 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 39a8b8812c2c9f6f0b299e6a04e504ef393694ce +Subproject commit 12731665e068a68883bdb280e9844dbfd14e5626 From 03321fb56d2761d1c2dd87eb19bc4297fa747539 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 17 Feb 2019 00:33:08 +0100 Subject: [PATCH 37/52] Assimilate transient and dependency Assimilate hydra 0.14.0-38-g9c4a471 Assimilate transient v0.1.0-9-g0ad64dd Transient requires the `lv' library, which is maintained in Hydra's repository. Do not remove `magit-popup' yet because `magit-annex' still requires it. --- .gitmodules | 6 ++++++ lib/hydra | 1 + lib/transient | 1 + 3 files changed, 8 insertions(+) create mode 160000 lib/hydra create mode 160000 lib/transient diff --git a/.gitmodules b/.gitmodules index 8b6911c..6e03bfa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,6 +33,9 @@ [submodule "graphql"] path = lib/graphql url = git@github.com:vermiculus/graphql.el.git +[submodule "hydra"] + path = lib/hydra + url = git@github.com:abo-abo/hydra.git [submodule "magit"] path = lib/magit url = git@github.com:magit/magit.git @@ -44,6 +47,9 @@ [submodule "packed"] path = lib/packed url = git@github.com:emacscollective/packed.git +[submodule "transient"] + path = lib/transient + url = git@github.com:magit/transient.git [submodule "treepy"] path = lib/treepy url = git@github.com:volrath/treepy.el.git diff --git a/lib/hydra b/lib/hydra new file mode 160000 index 0000000..9c4a471 --- /dev/null +++ b/lib/hydra @@ -0,0 +1 @@ +Subproject commit 9c4a4711bc78364e114acbbcf484a60669d02d78 diff --git a/lib/transient b/lib/transient new file mode 160000 index 0000000..0ad64dd --- /dev/null +++ b/lib/transient @@ -0,0 +1 @@ +Subproject commit 0ad64ddc5db466fb3bcac67b931b30393cdbc0a5 From 923e2935f1733e7555dd653104ed111c4bd79027 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 17 Feb 2019 00:34:58 +0100 Subject: [PATCH 38/52] Update magit to v2.90.1-244-g8b6c39999 --- lib/magit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/magit b/lib/magit index 4e57537..8b6c399 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 4e57537694e2758a4287973168e4f0d432ad1ae9 +Subproject commit 8b6c39999f0654601058bcae79b9fffe44696a09 From c4d933857177bec9925a3cda55135ab76f41242b Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 17 Feb 2019 01:11:09 +0100 Subject: [PATCH 39/52] magit: Adjust key binding for use of Transient --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 7a6380c..518dca1 100644 --- a/init.el +++ b/init.el @@ -98,7 +98,7 @@ (use-package magit :defer t :bind (("C-x g" . magit-status) - ("C-x M-g" . magit-dispatch-popup)) + ("C-x M-g" . magit-dispatch)) :config (magit-add-section-hook 'magit-status-sections-hook 'magit-insert-modules From 56e282c4fa0616067bdb4ccfcef6b0a9e5635ead Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 17 Feb 2019 01:14:32 +0100 Subject: [PATCH 40/52] transient: Set submodule.transient.info-path --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 6e03bfa..230303b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -50,6 +50,7 @@ [submodule "transient"] path = lib/transient url = git@github.com:magit/transient.git + info-path = docs [submodule "treepy"] path = lib/treepy url = git@github.com:volrath/treepy.el.git From 1c1f49b06cf2e65b5d951dac896dd0aa657bc400 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 19 Apr 2019 21:12:07 +0200 Subject: [PATCH 41/52] Update 12 drones Update borg to v3.1.0-3-ga87d9a1 Update dash to 2.15.0-12-g1549860 Update diff-hl to 1.8.6 Update emacsql to 3.0.0-9-g5ebd12b Update epkg to v3.2.0-3-g408d46a Update ghub to v3.2.0-11-gc7ca678 Update hydra to 0.14.0-44-gacb6985 Update magit to v2.90.1-553-g68840e6da Update magit-popup to v2.13.0 Update transient to v0.1.0-58-gf2314ba Update use-package to 2.4-14-g0ee88b5 Update with-editor to v2.8.1-2-g38df9bf --- lib/borg | 2 +- lib/dash | 2 +- lib/diff-hl | 2 +- lib/emacsql | 2 +- lib/epkg | 2 +- lib/ghub | 2 +- lib/hydra | 2 +- lib/magit | 2 +- lib/magit-popup | 2 +- lib/transient | 2 +- lib/use-package | 2 +- lib/with-editor | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/borg b/lib/borg index 4ffec24..a87d9a1 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 4ffec24967ba805be2b2f1750e7cfffb85e26a1f +Subproject commit a87d9a115ad0a1f3c2aa26300691e2a47e0e12b8 diff --git a/lib/dash b/lib/dash index 26f065f..1549860 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit 26f065fd607cdf1a68e7987b9360accc2d0cbfb6 +Subproject commit 15498602f42c19c1b8d7f8768f6b998dfd5b3a22 diff --git a/lib/diff-hl b/lib/diff-hl index 76289d2..84a5fe1 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit 76289d24c61fac501d955a8419b5fdf7debddd5f +Subproject commit 84a5fe1900af2e5cc522f02749804f0d9f094bbf diff --git a/lib/emacsql b/lib/emacsql index 59147c4..5ebd12b 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit 59147c4cdfd18dc2736a6502a3283564ab5c1457 +Subproject commit 5ebd12b6ffaa9fbadefe8518eab07a028bbaf7c1 diff --git a/lib/epkg b/lib/epkg index 4243b36..408d46a 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 4243b363d038b28650479b23949cb7dfd319542b +Subproject commit 408d46a9d041b516e9fda0414058a287dfef37fb diff --git a/lib/ghub b/lib/ghub index 3566dc6..c7ca678 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit 3566dc6e18d61455060a96deb70779c91f079c62 +Subproject commit c7ca6780bcd4d00d22e668e74b25f865ba892a45 diff --git a/lib/hydra b/lib/hydra index 9c4a471..acb6985 160000 --- a/lib/hydra +++ b/lib/hydra @@ -1 +1 @@ -Subproject commit 9c4a4711bc78364e114acbbcf484a60669d02d78 +Subproject commit acb69859f3dde8d6924587f39997320256bdd85d diff --git a/lib/magit b/lib/magit index 8b6c399..68840e6 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 8b6c39999f0654601058bcae79b9fffe44696a09 +Subproject commit 68840e6da97fd35ac41c6f007c1c22dde62a7a6a diff --git a/lib/magit-popup b/lib/magit-popup index 8eaa0be..4250c3a 160000 --- a/lib/magit-popup +++ b/lib/magit-popup @@ -1 +1 @@ -Subproject commit 8eaa0becc2370484a432a8a19f40ce5e8d0f1642 +Subproject commit 4250c3a606011e3ff2477e3b5bbde2b493f3c85c diff --git a/lib/transient b/lib/transient index 0ad64dd..f2314ba 160000 --- a/lib/transient +++ b/lib/transient @@ -1 +1 @@ -Subproject commit 0ad64ddc5db466fb3bcac67b931b30393cdbc0a5 +Subproject commit f2314ba2a4ac3412a8339707a3ca6d810ea66f6f diff --git a/lib/use-package b/lib/use-package index 1273166..0ee88b5 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 12731665e068a68883bdb280e9844dbfd14e5626 +Subproject commit 0ee88b5cac41acf974c4bedb8859931ead8bfc79 diff --git a/lib/with-editor b/lib/with-editor index 9dd9f17..38df9bf 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 9dd9f176d96abc60365369de6d08c26c414ef1f3 +Subproject commit 38df9bfc2227bcb7ac4899c83a03756d5f171450 From c4a63984d459213ea04c91d6f6c1f973a4b97468 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 19 Apr 2019 21:12:45 +0200 Subject: [PATCH 42/52] Remove magit-popup Magit uses transient instead of magit-popup now. --- .gitmodules | 3 --- lib/magit-popup | 1 - 2 files changed, 4 deletions(-) delete mode 160000 lib/magit-popup diff --git a/.gitmodules b/.gitmodules index 230303b..18b1410 100644 --- a/.gitmodules +++ b/.gitmodules @@ -41,9 +41,6 @@ url = git@github.com:magit/magit.git recursive-byte-compile = true 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-popup b/lib/magit-popup deleted file mode 160000 index 4250c3a..0000000 --- a/lib/magit-popup +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4250c3a606011e3ff2477e3b5bbde2b493f3c85c From 36127ed917470c36e96e8a61c90592d6c95958c0 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 19 Apr 2019 21:17:47 +0200 Subject: [PATCH 43/52] Remove hydra Transient no longer depends on the lv library from hydra. --- .gitmodules | 3 --- lib/hydra | 1 - 2 files changed, 4 deletions(-) delete mode 160000 lib/hydra diff --git a/.gitmodules b/.gitmodules index 18b1410..1524823 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,9 +33,6 @@ [submodule "graphql"] path = lib/graphql url = git@github.com:vermiculus/graphql.el.git -[submodule "hydra"] - path = lib/hydra - url = git@github.com:abo-abo/hydra.git [submodule "magit"] path = lib/magit url = git@github.com:magit/magit.git diff --git a/lib/hydra b/lib/hydra deleted file mode 160000 index acb6985..0000000 --- a/lib/hydra +++ /dev/null @@ -1 +0,0 @@ -Subproject commit acb69859f3dde8d6924587f39997320256bdd85d From 3a33910b94298e48b7dae8e83a7204a1f61fa8d5 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 19 Apr 2019 21:19:51 +0200 Subject: [PATCH 44/52] Assimilate libgit e85e02a --- .gitmodules | 4 ++++ lib/libgit | 1 + 2 files changed, 5 insertions(+) create mode 160000 lib/libgit diff --git a/.gitmodules b/.gitmodules index 1524823..c0e93a1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,6 +33,10 @@ [submodule "graphql"] path = lib/graphql url = git@github.com:vermiculus/graphql.el.git +[submodule "libgit"] + path = lib/libgit + url = git@github.com:magit/libegit2.git + build-step = make [submodule "magit"] path = lib/magit url = git@github.com:magit/magit.git diff --git a/lib/libgit b/lib/libgit new file mode 160000 index 0000000..e85e02a --- /dev/null +++ b/lib/libgit @@ -0,0 +1 @@ +Subproject commit e85e02ab3bfb6bf43c361bc4e78dd5b5ff93bccc From f23e8ec309d1b26c51f922adf19162f02af179c6 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Tue, 30 Jul 2019 13:27:03 +0200 Subject: [PATCH 45/52] Add ISC license See https://en.wikipedia.org/wiki/ISC_license. --- LICENSE | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..3f01f9a --- /dev/null +++ b/LICENSE @@ -0,0 +1,15 @@ +Copyright 2016-2019 Jonas Bernoulli + +Permission to use, copy, modify, and/or distribute this software for +any purpose with or without fee is hereby granted, provided that the +above copyright notice and this permission notice appear in all +copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL +WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA +OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. From 211fe04056077c3e51c52e3fca56cecf0522fd65 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 3 Aug 2019 11:00:16 +0200 Subject: [PATCH 46/52] Update 15 drones Update auto-compile to 1.5.1-1-gf043133 Update borg to v3.1.1-6-g62a6aa7 Update closql to v1.0.0-6-g70b98db Update dash to 2.16.0-2-g77f3bf4 Update diff-hl to 1.8.7 Update emacsql to 3.0.0-13-ga118b6c Update epkg to v3.2.1-5-gffea4b5 Update ghub to v3.2.0-35-g9d75d30 Update git-modes to 1.2.8-1-g33c6a11 Update libgit to 72d6b27 Update magit to v2.90.1-743-g774f93201 Update packed to 3.0.0-1-gf350cc4 Update transient to v0.1.0-96-g01a166f Update use-package to 2.4-20-g1d5ffb2 Update with-editor to v2.8.3-5-g45c29f9 --- lib/auto-compile | 2 +- lib/borg | 2 +- lib/closql | 2 +- lib/dash | 2 +- lib/diff-hl | 2 +- lib/emacsql | 2 +- lib/epkg | 2 +- lib/ghub | 2 +- lib/git-modes | 2 +- lib/libgit | 2 +- lib/magit | 2 +- lib/packed | 2 +- lib/transient | 2 +- lib/use-package | 2 +- lib/with-editor | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/auto-compile b/lib/auto-compile index e6bbb13..f043133 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit e6bbb1371324c8884af3b201e9adbc9296eb2ff4 +Subproject commit f043133f37fe6d707fa03a1ec4ba619da24c2f35 diff --git a/lib/borg b/lib/borg index a87d9a1..62a6aa7 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit a87d9a115ad0a1f3c2aa26300691e2a47e0e12b8 +Subproject commit 62a6aa7dd2488b9ae036f14230f89b55567e900e diff --git a/lib/closql b/lib/closql index 012b94f..70b98db 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 012b94f8695e194455111fd54eff0b94dd0dd0db +Subproject commit 70b98dbae53611d10a461d9b4a6f71086910dcef diff --git a/lib/dash b/lib/dash index 1549860..77f3bf4 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit 15498602f42c19c1b8d7f8768f6b998dfd5b3a22 +Subproject commit 77f3bf40c9c85386a50f2dab3dc950513f6f88bd diff --git a/lib/diff-hl b/lib/diff-hl index 84a5fe1..374b1d4 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit 84a5fe1900af2e5cc522f02749804f0d9f094bbf +Subproject commit 374b1d4b34876219218da7a539e7301259b56958 diff --git a/lib/emacsql b/lib/emacsql index 5ebd12b..a118b6c 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit 5ebd12b6ffaa9fbadefe8518eab07a028bbaf7c1 +Subproject commit a118b6c95af1306f0288a383d274b5dd93efbbda diff --git a/lib/epkg b/lib/epkg index 408d46a..ffea4b5 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 408d46a9d041b516e9fda0414058a287dfef37fb +Subproject commit ffea4b59e2c0019251d20df942f21360401ab82b diff --git a/lib/ghub b/lib/ghub index c7ca678..9d75d30 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit c7ca6780bcd4d00d22e668e74b25f865ba892a45 +Subproject commit 9d75d3098b2688f2938cbf94a3dde0b87c966528 diff --git a/lib/git-modes b/lib/git-modes index 5546831..33c6a11 160000 --- a/lib/git-modes +++ b/lib/git-modes @@ -1 +1 @@ -Subproject commit 55468314a5f6b77d2c96be62c7005ac94545e217 +Subproject commit 33c6a116a5b298e20eb39ebb154a51c4dd37c06d diff --git a/lib/libgit b/lib/libgit index e85e02a..72d6b27 160000 --- a/lib/libgit +++ b/lib/libgit @@ -1 +1 @@ -Subproject commit e85e02ab3bfb6bf43c361bc4e78dd5b5ff93bccc +Subproject commit 72d6b273159dd034fa2fb7bffb1ebff5e7ccba11 diff --git a/lib/magit b/lib/magit index 68840e6..774f932 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 68840e6da97fd35ac41c6f007c1c22dde62a7a6a +Subproject commit 774f93201ae02b27879a61e5f53e500cd7d4b844 diff --git a/lib/packed b/lib/packed index c41c3df..f350cc4 160000 --- a/lib/packed +++ b/lib/packed @@ -1 +1 @@ -Subproject commit c41c3dfda86ae33832ffc146923e2a4675cbacfa +Subproject commit f350cc446c65b85bcc213265cd6dcadee1568762 diff --git a/lib/transient b/lib/transient index f2314ba..01a166f 160000 --- a/lib/transient +++ b/lib/transient @@ -1 +1 @@ -Subproject commit f2314ba2a4ac3412a8339707a3ca6d810ea66f6f +Subproject commit 01a166fcb8bbd9918ba741e9b5428a4b524eab33 diff --git a/lib/use-package b/lib/use-package index 0ee88b5..1d5ffb2 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 0ee88b5cac41acf974c4bedb8859931ead8bfc79 +Subproject commit 1d5ffb2e0d1427066ced58febbba68c1328bf001 diff --git a/lib/with-editor b/lib/with-editor index 38df9bf..45c29f9 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 38df9bfc2227bcb7ac4899c83a03756d5f171450 +Subproject commit 45c29f9bfb7f2df93426ce1571e2f4f41ed4e492 From 7164c09158df3372b02c9ff3361c972897d5c8bf Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 19 Oct 2019 23:24:22 +0200 Subject: [PATCH 47/52] Update 10 drones Update auto-compile to 1.5.1-4-g228cb1e Update borg to v3.1.1-8-ge4a53ec Update dash to 2.16.0-13-ga743ae3 Update epkg to v3.2.1-9-g80098a4 Update ghub to v3.2.0-45-ge19cd86 Update libgit to 60e1e7d Update magit to v2.90.1-798-g618c90f43 Update transient to v0.1.0-115-gad7f255 Update use-package to 2.4-22-g4714d73 Update with-editor to v2.8.3-6-g19ebf53 --- lib/auto-compile | 2 +- lib/borg | 2 +- lib/dash | 2 +- lib/epkg | 2 +- lib/ghub | 2 +- lib/libgit | 2 +- lib/magit | 2 +- lib/transient | 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 f043133..228cb1e 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit f043133f37fe6d707fa03a1ec4ba619da24c2f35 +Subproject commit 228cb1e1106f3e62b5e3223baaf0a0765ca68ae3 diff --git a/lib/borg b/lib/borg index 62a6aa7..e4a53ec 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 62a6aa7dd2488b9ae036f14230f89b55567e900e +Subproject commit e4a53ec687a1e2f75276c2f2c2b568266887fe10 diff --git a/lib/dash b/lib/dash index 77f3bf4..a743ae3 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit 77f3bf40c9c85386a50f2dab3dc950513f6f88bd +Subproject commit a743ae3da1d5869434c6f262bbe45ef30d87cb9c diff --git a/lib/epkg b/lib/epkg index ffea4b5..80098a4 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit ffea4b59e2c0019251d20df942f21360401ab82b +Subproject commit 80098a45909d50aa089d344c6e24cbbae1481513 diff --git a/lib/ghub b/lib/ghub index 9d75d30..e19cd86 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit 9d75d3098b2688f2938cbf94a3dde0b87c966528 +Subproject commit e19cd86ca4768a6d89285123933baa3f1460d696 diff --git a/lib/libgit b/lib/libgit index 72d6b27..60e1e7d 160000 --- a/lib/libgit +++ b/lib/libgit @@ -1 +1 @@ -Subproject commit 72d6b273159dd034fa2fb7bffb1ebff5e7ccba11 +Subproject commit 60e1e7d360b376534c4b6258ddf7d5b5f0a68133 diff --git a/lib/magit b/lib/magit index 774f932..618c90f 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 774f93201ae02b27879a61e5f53e500cd7d4b844 +Subproject commit 618c90f43627d4bdc8451a7a08b101c8d7dab022 diff --git a/lib/transient b/lib/transient index 01a166f..ad7f255 160000 --- a/lib/transient +++ b/lib/transient @@ -1 +1 @@ -Subproject commit 01a166fcb8bbd9918ba741e9b5428a4b524eab33 +Subproject commit ad7f2553088faf633d32b51894de796e01a1cacf diff --git a/lib/use-package b/lib/use-package index 1d5ffb2..4714d73 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 1d5ffb2e0d1427066ced58febbba68c1328bf001 +Subproject commit 4714d73b61bdb378f6e9e3f3838cae1abbf65ea0 diff --git a/lib/with-editor b/lib/with-editor index 45c29f9..19ebf53 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 45c29f9bfb7f2df93426ce1571e2f4f41ed4e492 +Subproject commit 19ebf53f44532b5c31aaa5b6870fbc567e6889a4 From 4db065270add6db8d1baf347d5913df2149b729d Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 19 Oct 2019 23:25:00 +0200 Subject: [PATCH 48/52] Remove graphql Ghub no longer depends on this. --- .gitmodules | 3 --- lib/graphql | 1 - 2 files changed, 4 deletions(-) delete mode 160000 lib/graphql diff --git a/.gitmodules b/.gitmodules index c0e93a1..76dd747 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,9 +30,6 @@ [submodule "git-modes"] path = lib/git-modes url = git@github.com:magit/git-modes.git -[submodule "graphql"] - path = lib/graphql - url = git@github.com:vermiculus/graphql.el.git [submodule "libgit"] path = lib/libgit url = git@github.com:magit/libegit2.git diff --git a/lib/graphql b/lib/graphql deleted file mode 160000 index e2b3096..0000000 --- a/lib/graphql +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e2b309689f4faf9225f290080f836e988c5a576d From 7e44c28fcb6296dd7c316fbb68128931c176f2d7 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 8 Dec 2019 00:40:04 +0100 Subject: [PATCH 49/52] Update 15 drones Update auto-compile to 1.5.2 Update borg to v3.1.2 Update closql to v1.0.1 Update dash to 2.16.0-23-ge85ed7a Update diff-hl to 1.8.7-3-gf95d123 Update epkg to v3.2.2 Update ghub to v3.2.0-49-g0c5942c Update git-modes to 1.2.8-2-g1ea4100 Update libgit to d587efc Update magit to v2.90.1-840-g6401ba934 Update packed to 3.0.0-2-g27eba23 Update transient to v0.1.0-131-g6ceb643 Update treepy to 0.1.1-4-g306f703 Update use-package to 2.4-26-g4b58ab7 Update with-editor to v2.8.3-9-g814777c --- lib/auto-compile | 2 +- lib/borg | 2 +- lib/closql | 2 +- lib/dash | 2 +- lib/diff-hl | 2 +- lib/epkg | 2 +- lib/ghub | 2 +- lib/git-modes | 2 +- lib/libgit | 2 +- lib/magit | 2 +- lib/packed | 2 +- lib/transient | 2 +- lib/treepy | 2 +- lib/use-package | 2 +- lib/with-editor | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/auto-compile b/lib/auto-compile index 228cb1e..3e92c5b 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit 228cb1e1106f3e62b5e3223baaf0a0765ca68ae3 +Subproject commit 3e92c5b1a94b0cf43f2d624180a1cb01df92afd8 diff --git a/lib/borg b/lib/borg index e4a53ec..3f9fc22 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit e4a53ec687a1e2f75276c2f2c2b568266887fe10 +Subproject commit 3f9fc2281e9ae873873998782c98c57c5ebb0555 diff --git a/lib/closql b/lib/closql index 70b98db..92f8f2d 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 70b98dbae53611d10a461d9b4a6f71086910dcef +Subproject commit 92f8f2dba684b7c9cc60821aa5668d336544ab99 diff --git a/lib/dash b/lib/dash index a743ae3..e85ed7a 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit a743ae3da1d5869434c6f262bbe45ef30d87cb9c +Subproject commit e85ed7aa93ef0959b630607bca17af90c74b34be diff --git a/lib/diff-hl b/lib/diff-hl index 374b1d4..f95d123 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit 374b1d4b34876219218da7a539e7301259b56958 +Subproject commit f95d12343be67a9378249842911019939863b148 diff --git a/lib/epkg b/lib/epkg index 80098a4..ca211c5 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 80098a45909d50aa089d344c6e24cbbae1481513 +Subproject commit ca211c5225aa550374d77629dd9b87e2b0b0d992 diff --git a/lib/ghub b/lib/ghub index e19cd86..0c5942c 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit e19cd86ca4768a6d89285123933baa3f1460d696 +Subproject commit 0c5942ca9d9e5bd5545712a094d1427b95a780c5 diff --git a/lib/git-modes b/lib/git-modes index 33c6a11..1ea4100 160000 --- a/lib/git-modes +++ b/lib/git-modes @@ -1 +1 @@ -Subproject commit 33c6a116a5b298e20eb39ebb154a51c4dd37c06d +Subproject commit 1ea4100b1c7bdbe661e7637dcc851638cc28b7be diff --git a/lib/libgit b/lib/libgit index 60e1e7d..d587efc 160000 --- a/lib/libgit +++ b/lib/libgit @@ -1 +1 @@ -Subproject commit 60e1e7d360b376534c4b6258ddf7d5b5f0a68133 +Subproject commit d587efce66a961e94187f399aef08cc3b1d21741 diff --git a/lib/magit b/lib/magit index 618c90f..6401ba9 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 618c90f43627d4bdc8451a7a08b101c8d7dab022 +Subproject commit 6401ba9343d4d25c8b77867b0301421bb1ecc980 diff --git a/lib/packed b/lib/packed index f350cc4..27eba23 160000 --- a/lib/packed +++ b/lib/packed @@ -1 +1 @@ -Subproject commit f350cc446c65b85bcc213265cd6dcadee1568762 +Subproject commit 27eba2343816bd0e30e564e79308456b459e96c1 diff --git a/lib/transient b/lib/transient index ad7f255..6ceb643 160000 --- a/lib/transient +++ b/lib/transient @@ -1 +1 @@ -Subproject commit ad7f2553088faf633d32b51894de796e01a1cacf +Subproject commit 6ceb643f0bd7faa5d6ae19c5cd2b57857463a074 diff --git a/lib/treepy b/lib/treepy index b40e6b0..306f703 160000 --- a/lib/treepy +++ b/lib/treepy @@ -1 +1 @@ -Subproject commit b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d +Subproject commit 306f7031d26e4ebfc9ff36614acdc6993f3e23c3 diff --git a/lib/use-package b/lib/use-package index 4714d73..4b58ab7 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 4714d73b61bdb378f6e9e3f3838cae1abbf65ea0 +Subproject commit 4b58ab78177f636f862a66c7a8fdcf9b070e0925 diff --git a/lib/with-editor b/lib/with-editor index 19ebf53..814777c 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 19ebf53f44532b5c31aaa5b6870fbc567e6889a4 +Subproject commit 814777ce8ad42ad115eebc38743c55b99af5d2e7 From 7bd6a87be6d842e9c2eb514fa9e0fd4b2a02cc18 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 8 Dec 2019 00:41:47 +0100 Subject: [PATCH 50/52] Fix typo in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dcde751..ca6df32 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Or you can just update and further configure these drones as you would 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 +publicly available as source of inspiration for others, then please do so by forking the upstream repository, which is available from [Github]. From f996578331d9e355aae8596c4ef3cc3b63ffa80e Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 23 Dec 2019 01:26:33 +0100 Subject: [PATCH 51/52] Update 8 drones Update dash to 2.16.0-25-gea7adeb Update diff-hl to 1.8.7-4-g3418630 Update ghub to v3.2.0-52-g0804a98 Update git-modes to 1.2.8 Update libgit to 65fde63 Update magit to v2.90.1-869-g1e3215fa1 Update packed to 3.0.0 Update with-editor to v2.9.0 --- lib/dash | 2 +- lib/diff-hl | 2 +- lib/ghub | 2 +- lib/git-modes | 2 +- lib/libgit | 2 +- lib/magit | 2 +- lib/packed | 2 +- lib/with-editor | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/dash b/lib/dash index e85ed7a..ea7adeb 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit e85ed7aa93ef0959b630607bca17af90c74b34be +Subproject commit ea7adeb09c13de58336caa16243e192ea6ee88fb diff --git a/lib/diff-hl b/lib/diff-hl index f95d123..3418630 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit f95d12343be67a9378249842911019939863b148 +Subproject commit 3418630c44283c7fcb35c31c73283c39e7d96aee diff --git a/lib/ghub b/lib/ghub index 0c5942c..0804a98 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit 0c5942ca9d9e5bd5545712a094d1427b95a780c5 +Subproject commit 0804a981cea6deba69b4566d21f8f12fc5789b17 diff --git a/lib/git-modes b/lib/git-modes index 1ea4100..5546831 160000 --- a/lib/git-modes +++ b/lib/git-modes @@ -1 +1 @@ -Subproject commit 1ea4100b1c7bdbe661e7637dcc851638cc28b7be +Subproject commit 55468314a5f6b77d2c96be62c7005ac94545e217 diff --git a/lib/libgit b/lib/libgit index d587efc..65fde63 160000 --- a/lib/libgit +++ b/lib/libgit @@ -1 +1 @@ -Subproject commit d587efce66a961e94187f399aef08cc3b1d21741 +Subproject commit 65fde63a0bde9b4cef74204db5d9ac0a740d6b4d diff --git a/lib/magit b/lib/magit index 6401ba9..1e3215f 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 6401ba9343d4d25c8b77867b0301421bb1ecc980 +Subproject commit 1e3215fa1f0bb4047099bc81f20fa1950e064c6f diff --git a/lib/packed b/lib/packed index 27eba23..c41c3df 160000 --- a/lib/packed +++ b/lib/packed @@ -1 +1 @@ -Subproject commit 27eba2343816bd0e30e564e79308456b459e96c1 +Subproject commit c41c3dfda86ae33832ffc146923e2a4675cbacfa diff --git a/lib/with-editor b/lib/with-editor index 814777c..ba4ca8a 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 814777ce8ad42ad115eebc38743c55b99af5d2e7 +Subproject commit ba4ca8ab34c17fbc4c7af5b9b42c6d3836b48e1a From 38ed5d7a1f98c2f745e28b752395b5fe31ee9462 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Wed, 19 Feb 2020 12:48:29 +0100 Subject: [PATCH 52/52] Update 10 drones Update borg to v3.1.2-1-g7efd982 Update closql to v1.0.1-1-g1e78f96 Update dash to 2.17.0 Update diff-hl to 1.8.7-6-gfb9eb1c Update epkg to v3.2.2-3-g075f6af Update ghub to v3.3.0-1-g4ebe60b Update magit to v2.90.1-921-g798e47a1f Update transient to v0.1.0-140-g7977732 Update use-package to 2.4-28-g42db6b3 Update with-editor to v2.9.1-3-g4fe66d4 --- lib/borg | 2 +- lib/closql | 2 +- lib/dash | 2 +- lib/diff-hl | 2 +- lib/epkg | 2 +- lib/ghub | 2 +- lib/magit | 2 +- lib/transient | 2 +- lib/use-package | 2 +- lib/with-editor | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/borg b/lib/borg index 3f9fc22..7efd982 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 3f9fc2281e9ae873873998782c98c57c5ebb0555 +Subproject commit 7efd982e8e84b5761acbed9db98ec21eefca5048 diff --git a/lib/closql b/lib/closql index 92f8f2d..1e78f96 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 92f8f2dba684b7c9cc60821aa5668d336544ab99 +Subproject commit 1e78f96dc976badb59067c986f7766cce89405cc diff --git a/lib/dash b/lib/dash index ea7adeb..721436b 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit ea7adeb09c13de58336caa16243e192ea6ee88fb +Subproject commit 721436b04da4e2795387cb48a98ac6de37ece0fd diff --git a/lib/diff-hl b/lib/diff-hl index 3418630..fb9eb1c 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit 3418630c44283c7fcb35c31c73283c39e7d96aee +Subproject commit fb9eb1cd3c4c6ed24b93de1a7cfb369d2983be74 diff --git a/lib/epkg b/lib/epkg index ca211c5..075f6af 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit ca211c5225aa550374d77629dd9b87e2b0b0d992 +Subproject commit 075f6afa81f7a83a35088b699ed44d6029192198 diff --git a/lib/ghub b/lib/ghub index 0804a98..4ebe60b 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit 0804a981cea6deba69b4566d21f8f12fc5789b17 +Subproject commit 4ebe60b9522355c6ee95005bc7d8ba41df4a3c6b diff --git a/lib/magit b/lib/magit index 1e3215f..798e47a 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 1e3215fa1f0bb4047099bc81f20fa1950e064c6f +Subproject commit 798e47a1f07ac40c5a8c82372814c52be0478a76 diff --git a/lib/transient b/lib/transient index 6ceb643..7977732 160000 --- a/lib/transient +++ b/lib/transient @@ -1 +1 @@ -Subproject commit 6ceb643f0bd7faa5d6ae19c5cd2b57857463a074 +Subproject commit 79777324858df408bd6ba7509d9f0b6987208d98 diff --git a/lib/use-package b/lib/use-package index 4b58ab7..42db6b3 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 4b58ab78177f636f862a66c7a8fdcf9b070e0925 +Subproject commit 42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40 diff --git a/lib/with-editor b/lib/with-editor index ba4ca8a..4fe66d4 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit ba4ca8ab34c17fbc4c7af5b9b42c6d3836b48e1a +Subproject commit 4fe66d4d55c8eacebda53a13cc38e01d32bdaaa2