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

Make stash showing behave like showing commits.

Browse source 
* magit.el (magit-show-stash): New.
(magit-visit-item): Use it and pop to the buffer for stashes.
(magit-show-item-or-scroll-up, magit-show-item-or-scroll-down): Handle
stashes.
This commit is contained in:
Marius Vollmer 2009-02-05 22:42:15 +02:00
parent d65806bd35
commit 94b8e5acc7
1 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
magit.el
View file

@ -2145,6 +2145,31 @@ Prefix arg means justify as well."
(interactive "sStash description: ")
(magit-run "git" "stash" "save" description))
(defvar magit-currently-shown-stash nil)
(defun magit-show-stash (stash &optional scroll)
(when (magit-section-p stash)
(setq stash (magit-section-info stash)))
(let ((dir default-directory)
(buf (get-buffer-create "*magit-diff*")))
(cond ((equal magit-currently-shown-stash stash)
(let ((win (get-buffer-window buf)))
(cond ((not win)
(display-buffer buf))
(scroll
(with-selected-window win
(funcall scroll))))))
(t
(setq magit-currently-shown-stash stash)
(display-buffer buf)
(with-current-buffer buf
(set-buffer buf)
(goto-char (point-min))
(let* ((range (cons (concat info "^2^") info))
(args (magit-rev-range-to-git range)))
(magit-mode-init dir 'diff #'magit-refresh-diff-buffer
range args)))))))
;;; Commits
(defun magit-commit-at-point (&optional nil-ok-p)
@ -2435,24 +2460,24 @@ Prefix arg means justify as well."
(magit-show-commit info)
(pop-to-buffer "*magit-commit*"))
((stash)
(let ((buf (get-buffer "*magit-diff*"))
(inhibit-read-only t))
(if buf
(with-current-buffer buf
(erase-buffer))))
(magit-diff (cons (concat info "^2^") info)))))
(magit-show-stash info)
(pop-to-buffer "*magit-diff*"))))
(defun magit-show-item-or-scroll-up ()
(interactive)
(magit-section-action (item info)
((commit)
(magit-show-commit info #'scroll-up))))
(magit-show-commit info #'scroll-up))
((stash)
(magit-show-stash info #'scroll-up))))
(defun magit-show-item-or-scroll-down ()
(interactive)
(magit-section-action (item info)
((commit)
(magit-show-commit info #'scroll-down))))
(magit-show-commit info #'scroll-down))
((stash)
(magit-show-stash info #'scroll-down))))
(defun magit-mark-item (&optional unmark)
(interactive "P")