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

Show unpushed/pulled commits from a git-svn remote in magit-status

Browse source
This commit is contained in:
Steve Purcell 2009-02-20 23:16:40 +01:00 • committed by Marius Vollmer
parent 24a0985910
commit 99d518bba7
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
magit.el
View file

@ -1024,6 +1024,7 @@ Many Magit faces inherit from this one by default."
(magit-define-section-jumper unstaged "Unstaged changes") (magit-define-section-jumper unstaged "Unstaged changes")
(magit-define-section-jumper staged "Staged changes") (magit-define-section-jumper staged "Staged changes")
(magit-define-section-jumper unpushed "Unpushed commits") (magit-define-section-jumper unpushed "Unpushed commits")
(magit-define-section-jumper svn-unpushed "Unpushed commits (SVN)")
(magit-define-level-shower 1) (magit-define-level-shower 1)
(magit-define-level-shower 2) (magit-define-level-shower 2)
@ -1739,6 +1740,18 @@ in log buffer."
"log" "--pretty=format:* %H %s" "log" "--pretty=format:* %H %s"
(format "%s/%s..HEAD" remote branch))) (format "%s/%s..HEAD" remote branch)))
(defun magit-insert-unpulled-svn-commits ()
(magit-git-section 'svn-unpulled
"Unpulled commits (SVN):" 'magit-wash-log
"log" "--pretty=format:* %H %s"
(format "HEAD..remotes/git-svn")))
(defun magit-insert-unpushed-svn-commits ()
(magit-git-section 'svn-unpushed
"Unpushed commits (SVN):" 'magit-wash-log
"log" "--pretty=format:* %H %s"
(format "remotes/git-svn..HEAD")))
;;; Status ;;; Status
(defun magit-refresh-status () (defun magit-refresh-status ()
@ -1746,6 +1759,7 @@ in log buffer."
(magit-with-section 'status nil (magit-with-section 'status nil
(let* ((branch (magit-get-current-branch)) (let* ((branch (magit-get-current-branch))
(remote (and branch (magit-get "branch" branch "remote"))) (remote (and branch (magit-get "branch" branch "remote")))
(svn-enabled (magit-svn-enabled))
(head (magit-git-string (head (magit-git-string
"log --max-count=1 --abbrev-commit --pretty=oneline")) "log --max-count=1 --abbrev-commit --pretty=oneline"))
(no-commit (string-match "fatal: bad default revision" head))) (no-commit (string-match "fatal: bad default revision" head)))
@ -1774,13 +1788,17 @@ in log buffer."
(magit-insert-pending-commits) (magit-insert-pending-commits)
(when remote (when remote
(magit-insert-unpulled-commits remote branch)) (magit-insert-unpulled-commits remote branch))
(when svn-enabled
(magit-insert-unpulled-svn-commits))
(let ((staged (or no-commit (magit-anything-staged-p)))) (let ((staged (or no-commit (magit-anything-staged-p))))
(magit-insert-unstaged-changes (magit-insert-unstaged-changes
(if staged "Unstaged changes:" "Changes:")) (if staged "Unstaged changes:" "Changes:"))
(if staged (if staged
(magit-insert-staged-changes no-commit))) (magit-insert-staged-changes no-commit)))
(when remote (when remote
(magit-insert-unpushed-commits remote branch)))))) (magit-insert-unpushed-commits remote branch))
(when svn-enabled
(magit-insert-unpushed-svn-commits))))))
(defun magit-init (dir) (defun magit-init (dir)
"Initialize git repository in specified directory" "Initialize git repository in specified directory"