development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 14:03:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

git.el: Do not print a status message on every git command.

Browse source 
Instead print a single message around sequences of commands that can
potentially take some time.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alexandre Julliard 2007-09-29 11:58:39 +02:00 committed by Junio C Hamano
parent b9b7bab4b6
commit 9f5599b982
1 changed files with 41 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
contrib/emacs/git.el
View file

@ -220,22 +220,15 @@ and returns the process output as a string."
(message "Running git %s...done" (car args)) (message "Running git %s...done" (car args))
buffer)) buffer))
(defun git-run-command (buffer env &rest args)
(message "Running git %s..." (car args))
(apply #'git-call-process-env buffer env args)
(message "Running git %s...done" (car args)))
(defun git-run-command-region (buffer start end env &rest args) (defun git-run-command-region (buffer start end env &rest args)
"Run a git command with specified buffer region as input." "Run a git command with specified buffer region as input."
(message "Running git %s..." (car args))
(unless (eq 0 (if env (unless (eq 0 (if env
(git-run-process-region (git-run-process-region
buffer start end "env" buffer start end "env"
(append (git-get-env-strings env) (list "git") args)) (append (git-get-env-strings env) (list "git") args))
(git-run-process-region (git-run-process-region
buffer start end "git" args))) buffer start end "git" args)))
(error "Failed to run \"git %s\":\n%s" (mapconcat (lambda (x) x) args " ") (buffer-string))) (error "Failed to run \"git %s\":\n%s" (mapconcat (lambda (x) x) args " ") (buffer-string))))
(message "Running git %s...done" (car args)))
(defun git-run-hook (hook env &rest args) (defun git-run-hook (hook env &rest args)
"Run a git hook and display its output if any." "Run a git hook and display its output if any."
@ -312,6 +305,13 @@ and returns the process output as a string."
"\"") "\"")
name)) name))
(defun git-success-message (text files)
"Print a success message after having handled FILES."
(let ((n (length files)))
(if (equal n 1)
(message "%s %s" text (car files))
(message "%s %d files" text n))))
(defun git-get-top-dir (dir) (defun git-get-top-dir (dir)
"Retrieve the top-level directory of a git tree." "Retrieve the top-level directory of a git tree."
(let ((cdup (with-output-to-string (let ((cdup (with-output-to-string
@ -338,7 +338,7 @@ and returns the process output as a string."
(sort-lines nil (point-min) (point-max)) (sort-lines nil (point-min) (point-max))
(save-buffer)) (save-buffer))
(when created (when created
(git-run-command nil nil "update-index" "--add" "--" (file-relative-name ignore-name))) (git-call-process-env nil nil "update-index" "--add" "--" (file-relative-name ignore-name)))
(git-update-status-files (list (file-relative-name ignore-name)) 'unknown))) (git-update-status-files (list (file-relative-name ignore-name)) 'unknown)))
; propertize definition for XEmacs, stolen from erc-compat ; propertize definition for XEmacs, stolen from erc-compat
@ -606,7 +606,7 @@ and returns the process output as a string."
Return the list of files that haven't been handled." Return the list of files that haven't been handled."
(let (infolist) (let (infolist)
(with-temp-buffer (with-temp-buffer
(apply #'git-run-command t nil "diff-index" "-z" "-M" "HEAD" "--" files) (apply #'git-call-process-env t nil "diff-index" "-z" "-M" "HEAD" "--" files)
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward (while (re-search-forward
":\\([0-7]\\{6\\}\\) \\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\(\\([ADMU]\\)\0\\([^\0]+\\)\\|\\([CR]\\)[0-9]*\0\\([^\0]+\\)\0\\([^\0]+\\)\\)\0" ":\\([0-7]\\{6\\}\\) \\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\(\\([ADMU]\\)\0\\([^\0]+\\)\\|\\([CR]\\)[0-9]*\0\\([^\0]+\\)\0\\([^\0]+\\)\\)\0"
@ -639,7 +639,7 @@ Return the list of files that haven't been handled."
Return the list of files that haven't been handled." Return the list of files that haven't been handled."
(let (infolist) (let (infolist)
(with-temp-buffer (with-temp-buffer
(apply #'git-run-command t nil "ls-files" "-z" (append options (list "--") files)) (apply #'git-call-process-env t nil "ls-files" "-z" (append options (list "--") files))
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward "\\([^\0]*\\)\0" nil t 1) (while (re-search-forward "\\([^\0]*\\)\0" nil t 1)
(let ((name (match-string 1))) (let ((name (match-string 1)))
@ -651,7 +651,7 @@ Return the list of files that haven't been handled."
(defun git-run-ls-unmerged (status files) (defun git-run-ls-unmerged (status files)
"Run git-ls-files -u on FILES and parse the results into STATUS." "Run git-ls-files -u on FILES and parse the results into STATUS."
(with-temp-buffer (with-temp-buffer
(apply #'git-run-command t nil "ls-files" "-z" "-u" "--" files) (apply #'git-call-process-env t nil "ls-files" "-z" "-u" "--" files)
(goto-char (point-min)) (goto-char (point-min))
(let (unmerged-files) (let (unmerged-files)
(while (re-search-forward "[0-7]\\{6\\} [0-9a-f]\\{40\\} [123]\t\\([^\0]+\\)\0" nil t) (while (re-search-forward "[0-7]\\{6\\} [0-9a-f]\\{40\\} [123]\t\\([^\0]+\\)\0" nil t)
@ -754,11 +754,11 @@ Return the list of files that haven't been handled."
('deleted (push info deleted)) ('deleted (push info deleted))
('modified (push info modified)))) ('modified (push info modified))))
(when added (when added
(apply #'git-run-command nil env "update-index" "--add" "--" (git-get-filenames added))) (apply #'git-call-process-env nil env "update-index" "--add" "--" (git-get-filenames added)))
(when deleted (when deleted
(apply #'git-run-command nil env "update-index" "--remove" "--" (git-get-filenames deleted))) (apply #'git-call-process-env nil env "update-index" "--remove" "--" (git-get-filenames deleted)))
(when modified (when modified
(apply #'git-run-command nil env "update-index" "--" (git-get-filenames modified))))) (apply #'git-call-process-env nil env "update-index" "--" (git-get-filenames modified)))))
(defun git-run-pre-commit-hook () (defun git-run-pre-commit-hook ()
"Run the pre-commit hook if any." "Run the pre-commit hook if any."
@ -790,6 +790,7 @@ Return the list of files that haven't been handled."
head-tree (git-rev-parse "HEAD^{tree}"))) head-tree (git-rev-parse "HEAD^{tree}")))
(if files (if files
(progn (progn
(message "Running git commit...")
(git-read-tree head-tree index-file) (git-read-tree head-tree index-file)
(git-update-index nil files) ;update both the default index (git-update-index nil files) ;update both the default index
(git-update-index index-file files) ;and the temporary one (git-update-index index-file files) ;and the temporary one
@ -801,7 +802,7 @@ Return the list of files that haven't been handled."
(condition-case nil (delete-file ".git/MERGE_MSG") (error nil)) (condition-case nil (delete-file ".git/MERGE_MSG") (error nil))
(with-current-buffer buffer (erase-buffer)) (with-current-buffer buffer (erase-buffer))
(git-set-files-state files 'uptodate) (git-set-files-state files 'uptodate)
(git-run-command nil nil "rerere") (git-call-process-env nil nil "rerere")
(git-refresh-files) (git-refresh-files)
(git-refresh-ewoc-hf git-status) (git-refresh-ewoc-hf git-status)
(message "Committed %s." commit) (message "Committed %s." commit)
@ -912,8 +913,9 @@ Return the list of files that haven't been handled."
(let ((files (git-get-filenames (git-marked-files-state 'unknown 'ignored)))) (let ((files (git-get-filenames (git-marked-files-state 'unknown 'ignored))))
(unless files (unless files
(push (file-relative-name (read-file-name "File to add: " nil nil t)) files)) (push (file-relative-name (read-file-name "File to add: " nil nil t)) files))
(apply #'git-run-command nil nil "update-index" "--add" "--" files) (apply #'git-call-process-env nil nil "update-index" "--add" "--" files)
(git-update-status-files files 'uptodate))) (git-update-status-files files 'uptodate)
(git-success-message "Added" files)))
(defun git-ignore-file () (defun git-ignore-file ()
"Add marked file(s) to the ignore list." "Add marked file(s) to the ignore list."
@ -922,7 +924,8 @@ Return the list of files that haven't been handled."
(unless files (unless files
(push (file-relative-name (read-file-name "File to ignore: " nil nil t)) files)) (push (file-relative-name (read-file-name "File to ignore: " nil nil t)) files))
(dolist (f files) (git-append-to-ignore f)) (dolist (f files) (git-append-to-ignore f))
(git-update-status-files files 'ignored))) (git-update-status-files files 'ignored)
(git-success-message "Ignored" files)))
(defun git-remove-file () (defun git-remove-file ()
"Remove the marked file(s)." "Remove the marked file(s)."
@ -935,8 +938,9 @@ Return the list of files that haven't been handled."
(progn (progn
(dolist (name files) (dolist (name files)
(when (file-exists-p name) (delete-file name))) (when (file-exists-p name) (delete-file name)))
(apply #'git-run-command nil nil "update-index" "--remove" "--" files) (apply #'git-call-process-env nil nil "update-index" "--remove" "--" files)
(git-update-status-files files nil)) (git-update-status-files files nil)
(git-success-message "Removed" files))
(message "Aborting")))) (message "Aborting"))))
(defun git-revert-file () (defun git-revert-file ()
@ -954,18 +958,20 @@ Return the list of files that haven't been handled."
('unmerged (push (git-fileinfo->name info) modified)) ('unmerged (push (git-fileinfo->name info) modified))
('modified (push (git-fileinfo->name info) modified)))) ('modified (push (git-fileinfo->name info) modified))))
(when added (when added
(apply #'git-run-command nil nil "update-index" "--force-remove" "--" added)) (apply #'git-call-process-env nil nil "update-index" "--force-remove" "--" added))
(when modified (when modified
(apply #'git-run-command nil nil "checkout" "HEAD" modified)) (apply #'git-call-process-env nil nil "checkout" "HEAD" modified))
(git-update-status-files (append added modified) 'uptodate)))) (git-update-status-files (append added modified) 'uptodate)
(git-success-message "Reverted" files))))
(defun git-resolve-file () (defun git-resolve-file ()
"Resolve conflicts in marked file(s)." "Resolve conflicts in marked file(s)."
(interactive) (interactive)
(let ((files (git-get-filenames (git-marked-files-state 'unmerged)))) (let ((files (git-get-filenames (git-marked-files-state 'unmerged))))
(when files (when files
(apply #'git-run-command nil nil "update-index" "--" files) (apply #'git-call-process-env nil nil "update-index" "--" files)
(git-update-status-files files 'uptodate)))) (git-update-status-files files 'uptodate)
(git-success-message "Resolved" files))))
(defun git-remove-handled () (defun git-remove-handled ()
"Remove handled files from the status list." "Remove handled files from the status list."
@ -992,9 +998,11 @@ Return the list of files that haven't been handled."
(interactive) (interactive)
(if (setq git-show-ignored (not git-show-ignored)) (if (setq git-show-ignored (not git-show-ignored))
(progn (progn
(message "Inserting ignored files...")
(git-run-ls-files-with-excludes git-status nil 'ignored "-o" "-i") (git-run-ls-files-with-excludes git-status nil 'ignored "-o" "-i")
(git-refresh-files) (git-refresh-files)
(git-refresh-ewoc-hf git-status)) (git-refresh-ewoc-hf git-status)
(message "Inserting ignored files...done"))
(git-remove-handled))) (git-remove-handled)))
(defun git-toggle-show-unknown () (defun git-toggle-show-unknown ()
@ -1002,9 +1010,11 @@ Return the list of files that haven't been handled."
(interactive) (interactive)
(if (setq git-show-unknown (not git-show-unknown)) (if (setq git-show-unknown (not git-show-unknown))
(progn (progn
(message "Inserting unknown files...")
(git-run-ls-files-with-excludes git-status nil 'unknown "-o") (git-run-ls-files-with-excludes git-status nil 'unknown "-o")
(git-refresh-files) (git-refresh-files)
(git-refresh-ewoc-hf git-status)) (git-refresh-ewoc-hf git-status)
(message "Inserting unknown files...done"))
(git-remove-handled))) (git-remove-handled)))
(defun git-setup-diff-buffer (buffer) (defun git-setup-diff-buffer (buffer)
@ -1207,7 +1217,8 @@ Return the list of files that haven't been handled."
(marked-files (git-get-filenames (ewoc-collect status (lambda (info) (git-fileinfo->marked info))))) (marked-files (git-get-filenames (ewoc-collect status (lambda (info) (git-fileinfo->marked info)))))
(cur-name (and pos (git-fileinfo->name (ewoc-data pos))))) (cur-name (and pos (git-fileinfo->name (ewoc-data pos)))))
(unless status (error "Not in git-status buffer.")) (unless status (error "Not in git-status buffer."))
(git-run-command nil nil "update-index" "--refresh") (message "Refreshing git status...")
(git-call-process-env nil nil "update-index" "--refresh")
(git-clear-status status) (git-clear-status status)
(git-update-status-files nil) (git-update-status-files nil)
; restore file marks ; restore file marks
@ -1219,6 +1230,7 @@ Return the list of files that haven't been handled."
marked-files) marked-files)
(git-refresh-files)) (git-refresh-files))
; move point to the current file name if any ; move point to the current file name if any
(message "Refreshing git status...done")
(let ((node (and cur-name (git-find-status-file status cur-name)))) (let ((node (and cur-name (git-find-status-file status cur-name))))
(when node (ewoc-goto-node status node))))) (when node (ewoc-goto-node status node)))))