From 87eee36e5f1f2ea80b1275da950f62b78c27913c Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 27 Dec 2018 17:33:56 +0200 Subject: [PATCH 1/8] [tools/magit] Add magit-forge --- modules/tools/magit/packages.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el index 38bcc3d37..5eac2f2a5 100644 --- a/modules/tools/magit/packages.el +++ b/modules/tools/magit/packages.el @@ -3,7 +3,9 @@ (when (package! magit) (package! magit-gitflow) - (package! magithub) + (if (featurep! +forge) + (package! forge) + (package! magithub)) (package! magit-todos) (when (featurep! :feature evil +everywhere) (package! evil-magit))) From 76c31dc623a86c7db9f0b01b2956d1744ab2b558 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 27 Dec 2018 17:33:56 +0200 Subject: [PATCH 2/8] [tools/magit] Add magit-forge --- modules/tools/magit/packages.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el index 38bcc3d37..5eac2f2a5 100644 --- a/modules/tools/magit/packages.el +++ b/modules/tools/magit/packages.el @@ -3,7 +3,9 @@ (when (package! magit) (package! magit-gitflow) - (package! magithub) + (if (featurep! +forge) + (package! forge) + (package! magithub)) (package! magit-todos) (when (featurep! :feature evil +everywhere) (package! evil-magit))) From 7c368d4f9aea4d582e4ff1a9fee539508cc20e52 Mon Sep 17 00:00:00 2001 From: "Adrian Parvin D. Ouano" Date: Fri, 4 Jan 2019 09:39:19 +0800 Subject: [PATCH 3/8] Add configuration for magit forge --- modules/tools/magit/config.el | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 97af76ff2..5250cbe6b 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -58,6 +58,7 @@ what features are available.") (def-package! magithub :after magit + :when (not (featurep! :tools magit +forge)) :preface ;; Magithub is not well-behaved, so this needs to be set early (setq magithub-dir (concat doom-etc-dir "magithub/")) @@ -100,3 +101,9 @@ what features are available.") (evil-define-key* evil-magit-state git-rebase-mode-map "gj" #'git-rebase-move-line-down "gk" #'git-rebase-move-line-up))) + +(def-package! forge + :when (featurep! :tools magit +forge) + :config + (map! :leader + :desc "Forge ""gF" #'forge-dispatch)) From 0d3c8e3d9a4cba438f674c5a71cd2e4e1bf18d23 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 10 Jan 2019 13:09:14 +0200 Subject: [PATCH 4/8] Fix def-package for magit/forge - add :after magit - fix space position after "Forge" --- modules/tools/magit/config.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 5250cbe6b..ae010b33e 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -104,6 +104,7 @@ what features are available.") (def-package! forge :when (featurep! :tools magit +forge) + :after magit :config (map! :leader - :desc "Forge ""gF" #'forge-dispatch)) + :desc "Forge" "gF" #'forge-dispatch)) From b796ad76cc22e8173aca3f410eb5e593f53e9d60 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 10 Jan 2019 13:15:54 +0200 Subject: [PATCH 5/8] Move Forge leader binding to magit/+evil-bindings --- modules/tools/magit/+evil-bindings.el | 4 ++++ modules/tools/magit/config.el | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 modules/tools/magit/+evil-bindings.el diff --git a/modules/tools/magit/+evil-bindings.el b/modules/tools/magit/+evil-bindings.el new file mode 100644 index 000000000..bc5763023 --- /dev/null +++ b/modules/tools/magit/+evil-bindings.el @@ -0,0 +1,4 @@ +;;; tools/magit/+evil-bindings.el -*- lexical-binding: t; -*- + +(map! :leader + :desc "Forge" "gF" #'forge-dispatch) diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index ae010b33e..a5a7b068d 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -104,7 +104,7 @@ what features are available.") (def-package! forge :when (featurep! :tools magit +forge) - :after magit - :config - (map! :leader - :desc "Forge" "gF" #'forge-dispatch)) + :after magit) + +(when (featurep! :feature evil) + (load! "+evil-bindings")) From 5287c480928077ce2ed760e7c59aa2494e2528b9 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Fri, 11 Jan 2019 15:00:24 +0200 Subject: [PATCH 6/8] Move Forge binding to config/default/+evil-bindings --- modules/config/default/+evil-bindings.el | 4 +++- modules/tools/magit/+evil-bindings.el | 4 ---- modules/tools/magit/config.el | 3 --- 3 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 modules/tools/magit/+evil-bindings.el diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index be17cf668..714960e82 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -624,7 +624,9 @@ :desc "Git stage file" "S" #'magit-stage-file :desc "Git unstage file" "U" #'magit-unstage-file :desc "Magit push popup" "p" #'magit-push-popup - :desc "Magit pull popup" "P" #'magit-pull-popup) + :desc "Magit pull popup" "P" #'magit-pull-popup + (:when (featurep! :tools magit +forge) + :desc "Forge dispatch" "F" #'forge-dispatch)) (:when (featurep! :tools gist) :desc "List gists" "G" #'+gist:list)) diff --git a/modules/tools/magit/+evil-bindings.el b/modules/tools/magit/+evil-bindings.el deleted file mode 100644 index bc5763023..000000000 --- a/modules/tools/magit/+evil-bindings.el +++ /dev/null @@ -1,4 +0,0 @@ -;;; tools/magit/+evil-bindings.el -*- lexical-binding: t; -*- - -(map! :leader - :desc "Forge" "gF" #'forge-dispatch) diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index a5a7b068d..02eade6f3 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -105,6 +105,3 @@ what features are available.") (def-package! forge :when (featurep! :tools magit +forge) :after magit) - -(when (featurep! :feature evil) - (load! "+evil-bindings")) From bd8f33df525206e5edddca0b07919d0ed5b3ba04 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 21 Jan 2019 22:27:03 -0500 Subject: [PATCH 7/8] tools/magit: :when+not => :unless Minor refactor --- modules/tools/magit/config.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 02eade6f3..fb88b1014 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -58,7 +58,7 @@ what features are available.") (def-package! magithub :after magit - :when (not (featurep! :tools magit +forge)) + :unless (featurep! :tools magit +forge) :preface ;; Magithub is not well-behaved, so this needs to be set early (setq magithub-dir (concat doom-etc-dir "magithub/")) From 5b44d3fa6122ad7bae3b1977f5f42d45daf9d401 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sat, 26 Jan 2019 12:16:56 +0200 Subject: [PATCH 8/8] Set forge-database-file in doom-etc-dir Suggested by @luigy --- modules/tools/magit/config.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index fb88b1014..7e06e350f 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -104,4 +104,6 @@ what features are available.") (def-package! forge :when (featurep! :tools magit +forge) - :after magit) + :after magit + :init + (setq forge-database-file (concat doom-etc-dir "forge/forge-database.sqlite")))