git-rebase.el depends on Magit now

The cost of keeping `git-rebase.el' usable without Magit is getting to
high with some upcoming changes.  So give up on doing that.  I suspect
there are only very few people using `git-rebase.el' but not Magit
anyway.

4 files changed, 12 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 3ac777e..0f792b0 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,6 @@ help:
 
 ELS  = with-editor.el
 ELS += git-commit.el
-ELS += git-rebase.el
 ELS += magit-popup.el
 ELS += magit-utils.el
 ELS += magit-section.el
@@ -115,11 +114,11 @@ ELS += magit-ediff.el
 ELS += magit-wip.el
 ELS += magit-backup.el
 ELS += magit-extras.el
+ELS += git-rebase.el
 ELCS = $(ELS:.el=.elc)
 
 with-editor.elc:
 git-commit.elc:		with-editor.elc
-git-rebase.elc:		with-editor.elc
 magit-utils.elc:
 magit-section.elc:	magit-utils.elc
 magit-git.elc:		magit-utils.elc magit-section.elc
@@ -132,7 +131,7 @@ magit-core.elc:		magit-utils.elc magit-section.elc magit-git.elc \
 magit-diff.elc:		git-commit.elc magit-core.elc
 magit-apply.elc:	magit-core.elc magit-diff.elc
 magit-log.elc:		magit-core.elc magit-diff.elc
-magit.elc:		with-editor.elc git-commit.elc git-rebase.elc \
+magit.elc:		with-editor.elc git-commit.elc \
 			magit-core.elc magit-diff.elc magit-apply.elc magit-log.elc
 magit-sequence.elc:	magit.elc
 magit-commit.elc:	magit.elc magit-sequence.elc
@@ -144,6 +143,7 @@ magit-ediff.elc:	magit.elc
 magit-wip.elc:		magit-core.elc
 magit-backup.elc:	magit.elc magit-stash.elc
 magit-extras.elc:	magit.elc magit-backup.elc
+git-rebase.elc:		magit.elc with-editor.elc
 
 lisp: $(ELCS) magit-version.el magit-autoloads.el
 
diff --git a/git-rebase.el b/git-rebase.el
index fa77d70..705b63c 100644
--- a/git-rebase.el
+++ b/git-rebase.el
@@ -71,6 +71,7 @@
 (require 'easymenu)
 (require 'server)
 (require 'with-editor)
+(require 'magit)
 
 (eval-when-compile (require 'recentf))
 
@@ -244,14 +245,9 @@ Because you have seen them before and can still remember."
 
 (defun git-rebase-insert (rev)
   "Read an arbitrary commit and insert it below current line."
-  (interactive
-   (list (if (fboundp 'magit-read-branch-or-commit)
-             (magit-read-branch-or-commit "Insert revision")
-           (read-string "Insert revision: "))))
+  (interactive (list (magit-read-branch-or-commit "Insert revision")))
   (forward-line)
-  (--if-let (if (fboundp 'magit-rev-format)
-                (magit-rev-format "%h %s" rev)
-              (process-lines "git" "show" "-s" "--format=%h %s" rev))
+  (--if-let (magit-rev-format "%h %s" rev)
       (let ((inhibit-read-only t))
         (insert "pick " it ?\n))
     (user-error "Unknown revision")))
@@ -299,9 +295,7 @@ Like `undo' but works in read-only buffers."
     (goto-char (line-beginning-position))
     (--if-let (and (looking-at git-rebase-line)
                    (match-string 2))
-        (if (fboundp 'magit-show-commit)
-            (magit-show-commit it)
-          (shell-command (concat "git show " it)))
+        (magit-show-commit it)
       (ding))))
 
 (defun git-rebase-backward-line (&optional n)
@@ -381,6 +375,9 @@ By default, this is the same except for the \"pick\" command."
 ;;;###autoload
 (add-to-list 'auto-mode-alist
              (cons git-rebase-filename-regexp 'git-rebase-mode))
+;;;###autoload
+(add-to-list 'with-editor-server-window-alist
+             (cons git-rebase-filename-regexp 'switch-to-buffer))
 
 (eval-after-load 'recentf
   '(add-to-list 'recentf-exclude git-rebase-filename-regexp))
diff --git a/magit-sequence.el b/magit-sequence.el
index ca445d8..2529f86 100644
--- a/magit-sequence.el
+++ b/magit-sequence.el
@@ -312,9 +312,6 @@ This discards all changes made since the sequence started."
 
 ;;; Rebase
 
-(add-to-list 'with-editor-server-window-alist
-             (cons git-rebase-filename-regexp 'switch-to-buffer))
-
 ;;;###autoload (autoload 'magit-rebase-popup "magit-sequence" nil t)
 (magit-define-popup magit-rebase-popup
   "Key menu for rebasing."
diff --git a/magit.el b/magit.el
index 7d97db9..e378ccc 100644
--- a/magit.el
+++ b/magit.el
@@ -52,7 +52,6 @@
 
 (require 'with-editor)
 (require 'git-commit)
-(require 'git-rebase)
 (require 'magit-core)
 (require 'magit-diff)
 (require 'magit-apply)
@@ -2015,7 +2014,8 @@ https://github.com/magit/magit/wiki/Emacsclient")))
     (require 'magit-ediff)
     (require 'magit-wip)
     (require 'magit-backup)
-    (require 'magit-extras)))
+    (require 'magit-extras)
+    (require 'git-rebase)))
 
 ;; Local Variables:
 ;; coding: utf-8