refactor!(magit): remove magit-gitflow

BREAKING CHANGE: This commit removes the magit-gitflow package because:

- It is not considered a "universal" default. I.e. The majority of git
  users do not know of or use it, much less need it.
- The elisp configuration for it is trivial. It doesn't warrant
  Doom-specific support for it and is trivial enough for end-users to
  deploy themselves with minimal difficulty.

Close: #7015
This commit is contained in:
Henrik Lissner 2023-02-18 14:12:51 -05:00
parent 2c652259a5
commit 7a2a5afb97
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
3 changed files with 1 additions and 13 deletions

View file

@ -21,7 +21,6 @@ This module provides Magit, an interface to the Git version control system.
- [[doom-package:forge]] if [[doom-module:+forge]] - [[doom-package:forge]] if [[doom-module:+forge]]
- [[doom-package:code-review]] if [[doom-module:+forge]] - [[doom-package:code-review]] if [[doom-module:+forge]]
- [[doom-package:magit]] - [[doom-package:magit]]
- [[doom-package:magit-gitflow]]
- [[doom-package:magit-todos]] - [[doom-package:magit-todos]]
** Hacks ** Hacks

View file

@ -222,10 +222,6 @@ ensure it is built when we actually use Forge."
(define-key magit-todos-section-map "j" nil)) (define-key magit-todos-section-map "j" nil))
(use-package! magit-gitflow
:hook (magit-mode . turn-on-magit-gitflow))
(use-package! evil-collection-magit (use-package! evil-collection-magit
:when (modulep! :editor evil +everywhere) :when (modulep! :editor evil +everywhere)
:defer t :defer t
@ -280,13 +276,7 @@ ensure it is built when we actually use Forge."
(setcar desc (cdr key)))) (setcar desc (cdr key))))
(evil-define-key* evil-collection-magit-state git-rebase-mode-map (evil-define-key* evil-collection-magit-state git-rebase-mode-map
"gj" #'git-rebase-move-line-down "gj" #'git-rebase-move-line-down
"gk" #'git-rebase-move-line-up)) "gk" #'git-rebase-move-line-up)))
(after! magit-gitflow
(evil-define-key* '(normal visual) magit-mode-map
"%" #'magit-gitflow-popup)
(transient-append-suffix 'magit-dispatch 'magit-worktree
'("%" "Gitflow" magit-gitflow-popup))))
(use-package! evil-collection-magit-section (use-package! evil-collection-magit-section

View file

@ -8,5 +8,4 @@
(package! code-review (package! code-review
:recipe (:files ("graphql" "code-review*.el")) :recipe (:files ("graphql" "code-review*.el"))
:pin "95b36ec8e7935f96b2f3c6c9086d49cf4a72cbff")) :pin "95b36ec8e7935f96b2f3c6c9086d49cf4a72cbff"))
(package! magit-gitflow :pin "cc41b561ec6eea947fe9a176349fb4f771ed865b")
(package! magit-todos :pin "c5030cc27c7c1a48db52b0134bf2648a59a43176")) (package! magit-todos :pin "c5030cc27c7c1a48db52b0134bf2648a59a43176"))