Skip to content

Commit

Permalink
git.el: Make status refresh faster.
Browse files Browse the repository at this point in the history
Don't set the needs-refresh flag when inserting a new file info, since
ewoc refreshes it upon insert already; this makes a full refresh twice
as fast.

Also make git-fileinfo-prettyprint a little faster by not retrieving
permission values twice.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Alexandre Julliard authored and Junio C Hamano committed Jan 9, 2008
1 parent 58152a0 commit ef40b3e
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions contrib/emacs/git.el
Original file line number Diff line number Diff line change
Expand Up @@ -538,10 +538,10 @@ and returns the process output as a string."
('ignored (propertize "Ignored " 'face 'git-ignored-face))
(t "? ")))

(defun git-file-type-as-string (info)
"Return a string describing the file type of INFO."
(let* ((old-type (lsh (or (git-fileinfo->old-perm info) 0) -9))
(new-type (lsh (or (git-fileinfo->new-perm info) 0) -9))
(defun git-file-type-as-string (old-perm new-perm)
"Return a string describing the file type based on its permissions."
(let* ((old-type (lsh (or old-perm 0) -9))
(new-type (lsh (or new-perm 0) -9))
(str (case new-type
(?\100 ;; file
(case old-type
Expand Down Expand Up @@ -590,12 +590,14 @@ and returns the process output as a string."

(defun git-fileinfo-prettyprint (info)
"Pretty-printer for the git-fileinfo structure."
(insert (concat " " (if (git-fileinfo->marked info) (propertize "*" 'face 'git-mark-face) " ")
" " (git-status-code-as-string (git-fileinfo->state info))
" " (git-permissions-as-string (git-fileinfo->old-perm info) (git-fileinfo->new-perm info))
" " (git-escape-file-name (git-fileinfo->name info))
(git-file-type-as-string info)
(git-rename-as-string info))))
(let ((old-perm (git-fileinfo->old-perm info))
(new-perm (git-fileinfo->new-perm info)))
(insert (concat " " (if (git-fileinfo->marked info) (propertize "*" 'face 'git-mark-face) " ")
" " (git-status-code-as-string (git-fileinfo->state info))
" " (git-permissions-as-string old-perm new-perm)
" " (git-escape-file-name (git-fileinfo->name info))
(git-file-type-as-string old-perm new-perm)
(git-rename-as-string info)))))

(defun git-insert-info-list (status infolist)
"Insert a list of file infos in the status buffer, replacing existing ones if any."
Expand All @@ -606,7 +608,6 @@ and returns the process output as a string."
(let ((info (pop infolist))
(node (ewoc-nth status 0)))
(while info
(setf (git-fileinfo->needs-refresh info) t)
(cond ((not node)
(setq node (ewoc-enter-last status info))
(setq info (pop infolist)))
Expand All @@ -617,6 +618,7 @@ and returns the process output as a string."
(git-fileinfo->name info))
;; preserve the marked flag
(setf (git-fileinfo->marked info) (git-fileinfo->marked (ewoc-data node)))
(setf (git-fileinfo->needs-refresh info) t)
(setf (ewoc-data node) info)
(setq info (pop infolist)))
(t
Expand Down

0 comments on commit ef40b3e

Please sign in to comment.