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

Better handling of running counters in Git output.

Browse source 
* magit.el (magit-process-filter): New, for dealing with ^M in output.
(magit-run-command): Install it.
This commit is contained in:
Marius Vollmer 2008-09-02 23:18:23 +03:00
parent 2f4c2eed23
commit d1f0df38f9
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
magit.el
View file

@ -545,7 +545,33 @@ Many Magit faces inherit from this one by default."
(erase-buffer)
(insert "$ " logline "\n")
(setq magit-process (apply 'start-process "git" buf cmd args))
(set-process-sentinel magit-process 'magit-process-sentinel))))
(set-process-sentinel magit-process 'magit-process-sentinel)
(set-process-filter magit-process 'magit-process-filter))))
(defun magit-process-sentinel (process event)
(with-current-buffer (process-buffer process)
(let ((msg (format "Git %s." (substring event 0 -1))))
(insert msg "\n")
(message msg)))
(setq magit-process nil)
(magit-set-mode-line-process nil)
(magit-revert-files)
(magit-update-status (magit-find-status-buffer)))
(defun magit-process-filter (proc string)
(save-excursion
(set-buffer (process-buffer proc))
(goto-char (process-mark proc))
;; Find last ^M in string. If one was found, ignore everything
;; before it and delete the current line.
(let ((ret-pos (and (string-match ".*\r" string) (match-end 0))))
(cond (ret-pos
(goto-char (line-beginning-position))
(delete-region (point) (line-end-position))
(insert (substring string ret-pos)))
(t
(insert string))))
(set-marker (process-mark proc) (point))))
(defun magit-run (cmd &rest args)
(apply #'magit-run-command
@ -567,16 +593,6 @@ Many Magit faces inherit from this one by default."
(ignore-errors
(revert-buffer t t t))))))))
(defun magit-process-sentinel (process event)
(with-current-buffer (process-buffer process)
(let ((msg (format "Git %s." (substring event 0 -1))))
(insert msg "\n")
(message msg)))
(setq magit-process nil)
(magit-set-mode-line-process nil)
(magit-revert-files)
(magit-update-status (magit-find-status-buffer)))
(defun magit-display-process ()
(interactive)
(display-buffer "*magit-process*"))