Make git svn fetch an explicit command rather than overriding remote-fetch.
This commit is contained in:
parent
6599b6ac57
commit
fd2fd4725c
1 changed files with 4 additions and 5 deletions
|
@ -151,33 +151,32 @@ If USE-CACHE is non nil, use the cached information."
|
||||||
(cdr (assoc 'revision svn-info))))))
|
(cdr (assoc 'revision svn-info))))))
|
||||||
|
|
||||||
(defun magit-svn-remote-update ()
|
(defun magit-svn-remote-update ()
|
||||||
|
(interactive)
|
||||||
(when (magit-svn-enabled)
|
(when (magit-svn-enabled)
|
||||||
(magit-run-git-async "svn" "fetch")))
|
(magit-run-git-async "svn" "fetch")))
|
||||||
|
|
||||||
(defvar magit-svn-extension-keys
|
(defvar magit-svn-extension-keys
|
||||||
`((,(kbd "N r") . magit-svn-rebase)
|
`((,(kbd "N r") . magit-svn-rebase)
|
||||||
(,(kbd "N c") . magit-svn-dcommit)
|
(,(kbd "N c") . magit-svn-dcommit)
|
||||||
(,(kbd "N f") . magit-svn-find-rev)))
|
(,(kbd "N f") . magit-svn-remote-update)
|
||||||
|
(,(kbd "N s") . magit-svn-find-rev)))
|
||||||
|
|
||||||
(easy-menu-define magit-svn-extension-menu
|
(easy-menu-define magit-svn-extension-menu
|
||||||
nil
|
nil
|
||||||
"Git SVN extension menu"
|
"Git SVN extension menu"
|
||||||
'("Git SVN"
|
'("Git SVN"
|
||||||
["Rebase" magit-svn-rebase (magit-svn-enabled)]
|
["Rebase" magit-svn-rebase (magit-svn-enabled)]
|
||||||
|
["Fetch" magit-svn-remote-update (magit-svn-enabled)]
|
||||||
["Commit" magit-svn-dcommit (magit-svn-enabled)]))
|
["Commit" magit-svn-dcommit (magit-svn-enabled)]))
|
||||||
|
|
||||||
(defvar magit-svn-extension-inserters
|
(defvar magit-svn-extension-inserters
|
||||||
'((:after unpulled-commits (lambda () (magit-insert-svn-unpulled t)))
|
'((:after unpulled-commits (lambda () (magit-insert-svn-unpulled t)))
|
||||||
(:after unpushed-commits (lambda () (magit-insert-svn-unpushed t)))))
|
(:after unpushed-commits (lambda () (magit-insert-svn-unpushed t)))))
|
||||||
|
|
||||||
(defvar magit-svn-extension-commands
|
|
||||||
'((remote-update . magit-svn-remote-update)))
|
|
||||||
|
|
||||||
(defvar magit-svn-extension
|
(defvar magit-svn-extension
|
||||||
(make-magit-extension :keys magit-svn-extension-keys
|
(make-magit-extension :keys magit-svn-extension-keys
|
||||||
:menu magit-svn-extension-menu
|
:menu magit-svn-extension-menu
|
||||||
:insert magit-svn-extension-inserters
|
:insert magit-svn-extension-inserters
|
||||||
:commands magit-svn-extension-commands
|
|
||||||
:remote-string 'magit-svn-remote-string))
|
:remote-string 'magit-svn-remote-string))
|
||||||
|
|
||||||
(magit-install-extension magit-svn-extension)
|
(magit-install-extension magit-svn-extension)
|
||||||
|
|
Loading…
Add table
Reference in a new issue