mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

(vc-status-fileinfo): Add new member directoryp.

Browse Source 
(vc-default-status-printer): Print directories.
(vc-status-update): Sort files before subdirectories.
This commit is contained in:
Dan Nicolaescu 2008-04-15 07:28:31 +00:00
parent 769303ae94
commit e8847be332
2 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,5 +1,9 @@
2008-04-15 Dan Nicolaescu <dann@ics.uci.edu>
* vc.el (vc-status-fileinfo): Add new member directoryp.
(vc-default-status-printer): Print directories.
(vc-status-update): Sort files before subdirectories.
* vc-cvs.el (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
alternative implementation based on "cvs update".

57
lisp/vc.el
View File

@ -2714,7 +2714,9 @@ With prefix arg READ-SWITCHES, specify a value to override
extra
marked
;; To keep track of not updated files during a global refresh
needs-update)
needs-update
;; To distinguish files and directories.
directoryp)
(defvar vc-status nil)
@ -2738,24 +2740,26 @@ specific headers."
(defun vc-default-status-printer (backend fileentry)
"Pretty print FILEENTRY."
;; If you change the layout here, change vc-status-move-to-goal-column.
(let ((state (vc-status-fileinfo->state fileentry)))
(insert
(propertize
(format "%c" (if (vc-status-fileinfo->marked fileentry) ?* ? ))
'face 'font-lock-type-face)
" "
(propertize
(format "%-20s" state)
'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face)
((memq state '(missing conflict)) 'font-lock-warning-face)
(t 'font-lock-variable-name-face))
'mouse-face 'highlight)
" "
(propertize
(format "%s" (vc-status-fileinfo->name fileentry))
'face 'font-lock-function-name-face
'mouse-face 'highlight))))
(if (vc-status-fileinfo->directoryp fileentry)
(insert " Directory: %s" (vc-status-fileinfo->name fileentry))
;; If you change the layout here, change vc-status-move-to-goal-column.
(let ((state (vc-status-fileinfo->state fileentry)))
(insert
(propertize
(format "%c" (if (vc-status-fileinfo->marked fileentry) ?* ? ))
'face 'font-lock-type-face)
" "
(propertize
(format "%-20s" state)
'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face)
((memq state '(missing conflict)) 'font-lock-warning-face)
(t 'font-lock-variable-name-face))
'mouse-face 'highlight)
" "
(propertize
(format "%s" (vc-status-fileinfo->name fileentry))
'face 'font-lock-function-name-face
'mouse-face 'highlight)))))
(defun vc-status-printer (fileentry)
(let ((backend (vc-responsible-backend default-directory)))
@ -3019,9 +3023,18 @@ If NOINSERT, ignore elements on ENTRIES which are not in the ewoc."
;; Insert the entries sorted by name into the ewoc.
;; We assume the ewoc is sorted too, which should be the
;; case if we always add entries with vc-status-update.
(setq entries (sort entries
(lambda (entry1 entry2)
(string-lessp (car entry1) (car entry2)))))
(setq entries
;; Sort: first files and then subdirectories.
;; XXX: this is VERY inefficient, it computes the directory
;; names too many times
(sort entries
(lambda (entry1 entry2)
(let ((dir1 (file-name-directory (expand-file-name (car entry1))))
(dir2 (file-name-directory (expand-file-name (car entry2)))))
(cond
((string< dir1 dir2) t)
((not (string= dir1 dir2)) nil)
((string< (car entry1) (car entry2))))))))
(let ((entry (car entries))
(node (ewoc-nth vc-status 0)))
(while (and entry node)