From 2d3a68df496f300ac219db124f44ff1bde90e464 Mon Sep 17 00:00:00 2001
From: Ellis Kenyo <me@elken.dev>
Date: Wed, 15 Dec 2021 07:05:57 +0000
Subject: [PATCH 1/2] feat(magit): replace github-review for code-review

---
 modules/tools/magit/autoload.el |  6 +++---
 modules/tools/magit/config.el   | 15 ++++++++++++---
 modules/tools/magit/packages.el |  3 ++-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/modules/tools/magit/autoload.el b/modules/tools/magit/autoload.el
index 95e0b42dd..e18c265f6 100644
--- a/modules/tools/magit/autoload.el
+++ b/modules/tools/magit/autoload.el
@@ -153,9 +153,9 @@ kill all magit buffers for this repo."
             (kill-buffer buf)))))))
 
 ;;;###autoload
-(defun +magit/start-github-review (arg)
+(defun +magit/start-code-review (arg)
   (interactive "P")
   (call-interactively
     (if (or arg (not (featurep 'forge)))
-        #'github-review-start
-      #'github-review-forge-pr-at-point)))
+        #'code-review-start
+      #'code-review-forge-pr-at-point)))
diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el
index e6dc88f6f..441041440 100644
--- a/modules/tools/magit/config.el
+++ b/modules/tools/magit/config.el
@@ -188,14 +188,23 @@ ensure it is built when we actually use Forge."
             (add-hook hook #'forge-bug-reference-setup)))))))
 
 
-(use-package! github-review
+(use-package! code-review
   :after magit
+  :init
+  ;; TODO This needs to either a) be cleaned up or better b) better map things
+  ;; to fit
+  (after! evil-collection-magit
+    (dolist (binding evil-collection-magit-mode-map-bindings)
+      (pcase-let* ((`(,states _ ,evil-binding ,fn) binding))
+        (dolist (state states)
+          (evil-collection-define-key state 'code-review-mode-map evil-binding fn))))
+    (evil-set-initial-state 'code-review-mode evil-default-state))
   :config
   (transient-append-suffix 'magit-merge "i"
-    '("y" "Review pull request" +magit/start-github-review))
+    '("y" "Review pull request" +magit/start-code-review))
   (after! forge
     (transient-append-suffix 'forge-dispatch "c u"
-      '("c r" "Review pull request" +magit/start-github-review))))
+      '("c r" "Review pull request" +magit/start-code-review))))
 
 
 (use-package! magit-todos
diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el
index 31c55bd21..d46726454 100644
--- a/modules/tools/magit/packages.el
+++ b/modules/tools/magit/packages.el
@@ -6,4 +6,5 @@
     (package! forge :pin "41efa674cff0b447efbc103494fd61ec9b9156ae"))
   (package! magit-gitflow :pin "cc41b561ec6eea947fe9a176349fb4f771ed865b")
   (package! magit-todos :pin "60152d5c4e4b73e72e15f23ca16e8cc7734906bc")
-  (package! github-review :pin "725fbc7b385228f53a7ddc46a92c1276bab4aea8"))
+  (package! code-review :pin "f1a79c20ae51d23f76067a1e5a2f5c1c4db42ec9"
+    :recipe (:files ("graphql" "code-review*.el"))))

From 8169b6a87ec3d35eeed1fa7c05594378368873da Mon Sep 17 00:00:00 2001
From: Ellis Kenyo <me@elken.dev>
Date: Wed, 15 Dec 2021 06:57:40 +0000
Subject: [PATCH 2/2] bump: :tools magit

magit/forge@41efa674cff0 -> magit/forge@402773ef7e83
magit/magit@877c389ca016 -> magit/magit@65c4485e19bf
wandersoncferreira/code-review@f1a79c20ae51 -> wandersoncferreira/code-review@b0bedbdb30e0
---
 modules/tools/magit/packages.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el
index d46726454..350c11732 100644
--- a/modules/tools/magit/packages.el
+++ b/modules/tools/magit/packages.el
@@ -1,10 +1,10 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/magit/packages.el
 
-(when (package! magit :pin "877c389ca0161959081fa2c77045ce1ae9463be4")
+(when (package! magit :pin "65c4485e19bf570ebcb81fbaa6352c4e94bb05da")
   (when (featurep! +forge)
-    (package! forge :pin "41efa674cff0b447efbc103494fd61ec9b9156ae"))
+    (package! forge :pin "402773ef7e83ddfab64bfee23daea2776d50dbc1"))
   (package! magit-gitflow :pin "cc41b561ec6eea947fe9a176349fb4f771ed865b")
   (package! magit-todos :pin "60152d5c4e4b73e72e15f23ca16e8cc7734906bc")
-  (package! code-review :pin "f1a79c20ae51d23f76067a1e5a2f5c1c4db42ec9"
+  (package! code-review :pin "b0bedbdb30e019ed8c40fedf1087c3ad28e72c59"
     :recipe (:files ("graphql" "code-review*.el"))))