From b81fc21c043b4806e4499d480e796d39c353ffbb Mon Sep 17 00:00:00 2001
From: Maxi Wolff <smile13241324@gmail.com>
Date: Thu, 22 Aug 2024 19:17:08 +0200
Subject: [PATCH] [git] Add support for code review back

by using the maintained fork from doom-emacs.

Fixes #16020
---
 layers/+source-control/git/packages.el | 34 ++++++++++++--------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/layers/+source-control/git/packages.el b/layers/+source-control/git/packages.el
index 536a34c67982..703b3b083fec 100644
--- a/layers/+source-control/git/packages.el
+++ b/layers/+source-control/git/packages.el
@@ -23,12 +23,8 @@
 
 (defconst git-packages
   '(
-    ;; Disabled for now until
-    ;; https://github.com/wandersoncferreira/code-review/issues/245
-    ;; is fixed
-    ;; code-review
-    ;; emojify
-
+    (code-review :location (recipe :fetcher github :repo "doomelpa/code-review"))
+    emojify
     evil-collection
     evil-surround
     fill-column-indicator
@@ -89,9 +85,9 @@
   (use-package git-commit
     :defer t))
 
-;; (defun git/init-code-review ()
-;;   (use-package code-review
-;;     :defer t))
+(defun git/init-code-review ()
+  (use-package code-review
+    :defer t))
 
 (defun git/init-git-link ()
   (use-package git-link
@@ -239,7 +235,7 @@
             (concat (kbd mm-key) "k")    'magit-log-select-quit))))
     ;; whitespace
     (define-key magit-status-mode-map (kbd "C-S-w")
-      'spacemacs/magit-toggle-whitespace)
+                'spacemacs/magit-toggle-whitespace)
     ;; Add missing which-key prefixes using the new keymap api
     (when (spacemacs//support-evilified-buffer-p)
       (which-key-add-keymap-based-replacements magit-status-mode-map
@@ -263,11 +259,11 @@
     (evil-define-key 'normal magit-section-mode-map (kbd "M-8") 'spacemacs/winum-select-window-8)
     (evil-define-key 'normal magit-section-mode-map (kbd "M-9") 'spacemacs/winum-select-window-9)))
 
-;; (defun git/post-init-emojify ()
-;;   (spacemacs|use-package-add-hook code-review
-;;     :post-config
-;;     (use-package emojify
-;;       :hook (code-review-mode-hook . emojify-mode))))
+(defun git/post-init-emojify ()
+  (spacemacs|use-package-add-hook code-review
+    :post-config
+    (use-package emojify
+      :hook (code-review-mode-hook . emojify-mode))))
 
 (defun git/init-magit-delta ()
   (use-package magit-delta
@@ -277,7 +273,7 @@
   (use-package magit-gitflow
     :hook (magit-mode . magit-gitflow-mode)
     :init (setq magit-gitflow-popup-key "%")
-    :config 
+    :config
     (spacemacs|diminish magit-gitflow-mode "Flow")
     (define-key magit-mode-map "%" 'magit-gitflow-popup)))
 
@@ -288,7 +284,7 @@
 (defun git/init-magit-svn ()
   (use-package magit-svn
     :hook (magit-mode . magit-svn-mode)
-    :config 
+    :config
     (spacemacs|diminish magit-svn-mode "SVN")
     (define-key magit-mode-map "~" 'magit-svn)))
 
@@ -340,9 +336,9 @@
 
 (defun git/pre-init-transient ()
   (setq-default transient-history-file (expand-file-name "transient/history.el"
-                                                 spacemacs-cache-directory))
+                                                         spacemacs-cache-directory))
   (setq-default transient-levels-file (expand-file-name "transient/levels.el"
-                                                spacemacs-cache-directory))
+                                                        spacemacs-cache-directory))
   ;; Values are the users saved preferences so they should persist.
   (setq-default transient-values-file (expand-file-name "transient/values.el"
                                                         dotspacemacs-directory)))