code-review, a really nice superseding of github-code-review

2 files changed, 36 insertions, 28 deletions

diff --git a/attic/misc.org b/attic/misc.org
index 9ca8e01..66e0012 100644
--- a/attic/misc.org
+++ b/attic/misc.org
@@ -768,3 +768,32 @@
         (when (or yes (y-or-n-p "Connect to libera using ERC? "))
           (erc-select :server "irc.libera.chat")))
       #+end_src
+* git helpers
+  #+begin_src emacs-lisp
+
+    (use-package github-review
+      :ensure t
+      :config
+      (defun jao-gnus-github-review ()
+        (interactive)
+        (gnus-summary-select-article-buffer)
+        (goto-char (point-min))
+        (when (re-search-forward "https://github\.com/.*/pull/.*" nil t)
+          (let ((url (match-string-no-properties 0)))
+            (when (yes-or-no-p (format "Start review for %s" url))
+              (github-review-start url)))))
+      (eval-after-load "gnus-art"
+        '(progn
+           (define-key gnus-summary-mode-map "\C-cG" 'jao-gnus-github-review)
+           (define-key gnus-article-mode-map "\C-cG" 'jao-gnus-github-review)))
+
+      (jao-transient-major-mode github-review
+        ["Review"
+         ("a" "Approve" github-review-approve)
+         ("r" "Reject" github-review-reject)
+         ("c" "Comment" github-review-reject)]
+        ["Quit"
+         ("Q" "Bury buffer" bury-buffer)
+         ("k" "Kill buffer" kill-buffer)]))
+
+  #+end_src
diff --git a/init.org b/init.org
index a9f1196..7802fea 100644
--- a/init.org
+++ b/init.org
@@ -2047,9 +2047,13 @@
               magit-save-repository-buffers 'dontask
               magit-status-buffer-switch-function 'switch-to-buffer
               magit-status-show-hashes-in-headers t)
-        :bind (("<f2>" . magit-status)
-               :map magit-status-mode-map
-                    ("C-c C-r" . github-review-forge-pr-at-point)))
+        :bind (("<f2>" . magit-status)))
+
+      (use-package code-review
+        :ensure t
+        :after forge
+        :bind (:map magit-status-mode-map
+                    ("C-c C-r" . code-review-forge-pr-at-point)))
 
       (use-package forge
         :ensure t
@@ -2113,31 +2117,6 @@
 
       (use-package git-modes :ensure t)
 
-      (use-package github-review
-        :ensure t
-        :config
-        (defun jao-gnus-github-review ()
-          (interactive)
-          (gnus-summary-select-article-buffer)
-          (goto-char (point-min))
-          (when (re-search-forward "https://github\.com/.*/pull/.*" nil t)
-            (let ((url (match-string-no-properties 0)))
-              (when (yes-or-no-p (format "Start review for %s" url))
-                (github-review-start url)))))
-        (eval-after-load "gnus-art"
-          '(progn
-             (define-key gnus-summary-mode-map "\C-cG" 'jao-gnus-github-review)
-             (define-key gnus-article-mode-map "\C-cG" 'jao-gnus-github-review)))
-
-        (jao-transient-major-mode github-review
-          ["Review"
-           ("a" "Approve" github-review-approve)
-           ("r" "Reject" github-review-reject)
-           ("c" "Comment" github-review-reject)]
-          ["Quit"
-           ("Q" "Bury buffer" bury-buffer)
-           ("k" "Kill buffer" kill-buffer)]))
-
     #+end_src
 *** Jenkins
     [[https://github.com/rmuslimov/jenkins.el][GitHub - rmuslimov/jenkins.el: Jenkins plugin for emacs]]