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

Produce cleaner status buffer for unmerged files.

Browse source 
By ignoring duplicate entries for the unmerged files.
This commit is contained in:
Marius Vollmer 2009-09-06 20:27:18 +03:00
parent 2a8bb03a6f
commit e38987412d
1 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
magit.el
View file

@ -1640,8 +1640,12 @@ Please see the manual for a complete description of Magit.
(magit-wash-diff-section) (magit-wash-diff-section)
(goto-char (point-max)))))) (goto-char (point-max))))))
(defvar magit-last-raw-diff nil)
(defvar magit-ignore-unmerged-raw-diffs nil)
(defun magit-wash-raw-diffs () (defun magit-wash-raw-diffs ()
(magit-wash-sequence #'magit-wash-raw-diff)) (let ((magit-last-raw-diff nil))
(magit-wash-sequence #'magit-wash-raw-diff)))
(defun magit-wash-raw-diff () (defun magit-wash-raw-diff ()
(if (looking-at (if (looking-at
@ -1656,20 +1660,27 @@ Please see the manual for a complete description of Magit.
(?T 'new-type) (?T 'new-type)
(t nil))) (t nil)))
(file (match-string-no-properties 4))) (file (match-string-no-properties 4)))
;; The 'diff' section that is created here will not work with ;; If this is for the same file as the last diff, ignore it.
;; magit-insert-diff-item-patch etc when we leave it empty. ;; Unmerged files seem to get two entries.
;; Luckily, raw diffs are only produced for staged and ;; We also ignore unmerged files when told so.
;; unstaged changes, and we never call (if (or (equal file magit-last-raw-diff)
;; magit-insert-diff-item-patch on them. This is a bit (and magit-ignore-unmerged-raw-diffs (eq status 'unmerged)))
;; brittle, of course.
(let ((magit-section-hidden-default magit-hide-diffs))
(magit-with-section file 'diff
(delete-region (point) (+ (line-end-position) 1)) (delete-region (point) (+ (line-end-position) 1))
(if (not (magit-section-hidden magit-top-section)) (setq magit-last-raw-diff file)
(magit-insert-diff file) ;; The 'diff' section that is created here will not work with
(magit-set-section-info (list status file nil)) ;; magit-insert-diff-item-patch etc when we leave it empty.
(magit-set-section-needs-refresh-on-show t) ;; Luckily, raw diffs are only produced for staged and
(magit-insert-diff-title status file nil)))) ;; unstaged changes, and we never call
;; magit-insert-diff-item-patch on them. This is a bit
;; brittle, of course.
(let ((magit-section-hidden-default magit-hide-diffs))
(magit-with-section file 'diff
(delete-region (point) (+ (line-end-position) 1))
(if (not (magit-section-hidden magit-top-section))
(magit-insert-diff file)
(magit-set-section-info (list status file nil))
(magit-set-section-needs-refresh-on-show t)
(magit-insert-diff-title status file nil)))))
t) t)
nil)) nil))
@ -1786,7 +1797,8 @@ Please see the manual for a complete description of Magit.
(base (if no-commit (base (if no-commit
(magit-git-string "mktree") (magit-git-string "mktree")
"HEAD"))) "HEAD")))
(let ((magit-diff-options '("--cached"))) (let ((magit-diff-options '("--cached"))
(magit-ignore-unmerged-raw-diffs t))
(magit-git-section 'staged "Staged changes:" 'magit-wash-raw-diffs (magit-git-section 'staged "Staged changes:" 'magit-wash-raw-diffs
"diff-index" "--cached" "diff-index" "--cached"
base)))) base))))