gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix display of unpushed/unpulled git-svn patches

Browse source 
git-svn remotes are listed by "git show-ref" in a pattern that magit-list-interesting-refs did
not support, e.g. "refs/remotes/git-svn".
This commit is contained in:
Steve Purcell 2009-06-07 18:11:16 +02:00 committed by Marius Vollmer
parent b2072a3604
commit 29eafdc993
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
magit.el
View file

@ -389,6 +389,9 @@ Many Magit faces inherit from this one by default."
(match-string 2 ref)
(match-string 1 ref))
ref)
refs))
((string-match "refs/remotes/\\([^/]+\\)" ref)
(push (cons (format "%s (git-svn)" (match-string 1 ref)) ref)
refs))))))
refs))
@ -1849,13 +1852,13 @@ in log buffer."
(magit-git-section 'svn-unpulled
"Unpulled commits (SVN):" 'magit-wash-log
"log" "--pretty=format:* %H %s"
(format "HEAD..remotes/%s" (magit-get-svn-branch-name))))
(format "HEAD..%s" (magit-get-svn-ref))))
(defun magit-insert-unpushed-svn-commits ()
(magit-git-section 'svn-unpushed
"Unpushed commits (SVN):" 'magit-wash-log
"log" "--pretty=format:* %H %s"
(format "remotes/%s..HEAD" (magit-get-svn-branch-name))))
(format "%s..HEAD" (magit-get-svn-ref))))
;;; Status
@ -2094,12 +2097,12 @@ in log buffer."
(magit-run-git-async "svn" "dcommit"))
(defun magit-svn-enabled ()
(not (null (magit-get-svn-branch-name))))
(not (null (magit-get-svn-ref))))
(defun magit-get-svn-branch-name ()
(defun magit-get-svn-ref ()
(let ((interesting-refs (magit-list-interesting-refs)))
(or (cdr (assoc "git-svn" interesting-refs))
(cdr (assoc "trunk" interesting-refs)))))
(or (cdr (assoc "git-svn (git-svn)" interesting-refs))
(cdr (assoc "trunk (git-svn)" interesting-refs)))))
;;; Resetting