From 2007a3714ef5cddd5fbf65845a7f97d113472df2 Mon Sep 17 00:00:00 2001 From: Alex Ott Date: Tue, 11 Nov 2008 11:25:30 +0100 Subject: [PATCH] Initial support for git svn. --- magit.el | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/magit.el b/magit.el index b4d06f3d..ae973ed1 100644 --- a/magit.el +++ b/magit.el @@ -934,6 +934,10 @@ Many Magit faces inherit from this one by default." ["Merge" magit-automatic-merge t] ["Merge (no commit)" magit-manual-merge t] ["Rebase" magit-rebase-step t] + ("Git SVN" + ["Rebase" magit-svn-rebase (magit-svn-enabled)] + ["Commit" magit-svn-dcommit (magit-svn-enabled)] + ) ("Rewrite" ["Start" magit-rewrite-start t] ["Stop" magit-rewrite-stop t] @@ -1572,6 +1576,19 @@ Please see the manual for a complete description of Magit. ((?C ?c) (magit-run "git" "rebase" "--continue")))))))) +;; git svn commands + +(defun magit-svn-rebase () + (interactive) + (magit-run "git" "svn" "rebase")) + +(defun magit-svn-dcommit () + (interactive) + (magit-run "git" "svn" "dcommit")) + +(defun magit-svn-enabled () + (not (null (find "git-svn" (magit-list-interesting-revisions) :test 'equal)))) + ;;; Resetting (defun magit-reset-head (rev)