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

More features for magit-run-command.

Browse source 
* magit.el (magit-run-command): Added erase and cont parameters.
Construct logline from cmd and args when nil.
(magit-process-sentinel): Call magit-process-continuation when set.
This commit is contained in:
Marius Vollmer 2008-09-10 23:58:15 +03:00
parent 6089e3b9db
commit a91d10c74b
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
magit.el
View file

@ -653,7 +653,9 @@ Many Magit faces inherit from this one by default."
(defvar magit-process nil) (defvar magit-process nil)
(defun magit-run-command (logline cmd &rest args) (defvar magit-process-continuation nil)
(defun magit-run-command (logline erase cont cmd &rest args)
(or (not magit-process) (or (not magit-process)
(error "Git is already running.")) (error "Git is already running."))
(let ((dir default-directory) (let ((dir default-directory)
@ -663,11 +665,16 @@ Many Magit faces inherit from this one by default."
(save-excursion (save-excursion
(set-buffer buf) (set-buffer buf)
(setq default-directory dir) (setq default-directory dir)
(if erase
(erase-buffer) (erase-buffer)
(insert "$ " logline "\n") (goto-char (point-max)))
(insert "$ " (or logline
(magit-concat-with-delim " " (cons cmd args)))
"\n")
(setq magit-process (apply 'start-process "git" buf cmd args)) (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)))) (set-process-filter magit-process 'magit-process-filter)
(setq magit-process-continuation cont))))
(defun magit-process-sentinel (process event) (defun magit-process-sentinel (process event)
(with-current-buffer (process-buffer process) (with-current-buffer (process-buffer process)
@ -677,7 +684,11 @@ Many Magit faces inherit from this one by default."
(setq magit-process nil) (setq magit-process nil)
(magit-set-mode-line-process nil) (magit-set-mode-line-process nil)
(magit-revert-files) (magit-revert-files)
(magit-update-status (magit-find-status-buffer))) (magit-update-status (magit-find-status-buffer))
(when magit-process-continuation
(let ((cont magit-process-continuation))
(setq magit-process-continuation nil)
(funcall cont event))))
(defun magit-process-filter (proc string) (defun magit-process-filter (proc string)
(save-excursion (save-excursion
@ -695,13 +706,11 @@ Many Magit faces inherit from this one by default."
(set-marker (process-mark proc) (point)))) (set-marker (process-mark proc) (point))))
(defun magit-run (cmd &rest args) (defun magit-run (cmd &rest args)
(apply #'magit-run-command (apply #'magit-run-command nil t nil cmd args))
(magit-concat-with-delim " " (cons cmd args))
cmd args))
(defun magit-run-shell (fmt &rest args) (defun magit-run-shell (fmt &rest args)
(let ((cmd (apply #'format fmt args))) (let ((cmd (apply #'format fmt args)))
(magit-run-command cmd shell-file-name shell-command-switch cmd))) (magit-run-command cmd t nil shell-file-name shell-command-switch cmd)))
(defun magit-revert-files () (defun magit-revert-files ()
(let ((files (magit-shell-lines "git ls-files"))) (let ((files (magit-shell-lines "git ls-files")))