[Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v

[Eric S. Raymond]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Eric S. Raymond <esr>   08/05/09 18:47:36

Index: vc-dispatcher.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-dispatcher.el,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- vc-dispatcher.el    9 May 2008 16:01:27 -0000       1.30
+++ vc-dispatcher.el    9 May 2008 18:47:36 -0000       1.31
@@ -117,9 +117,6 @@
 ;;
 ;; - the *VC-log* buffer needs font-locking.
 ;;
-;; - Set `vc-dir-insert-directories' to t and check what operations
-;;   and backends do not support directory arguments and fix them.
-;;
 ;; - vc-dir needs mouse bindings.
 ;;
 ;; - vc-dir needs more key bindings for VC actions.
@@ -816,11 +813,6 @@
                                   map vc-dir-mode-map)
     map))
 
-;; t if directories should be shown in vc-dir.
-;; WORK IN PROGRESS!  This variable will likely disappear when the
-;; work is done.
-(defvar vc-dir-insert-directories t)
-
 (defun vc-dir-update (entries buffer &optional noinsert)
   "Update BUFFER's ewoc from the list of ENTRIES.
 If NOINSERT, ignore elements on ENTRIES which are not in the ewoc."
@@ -841,32 +833,6 @@
                     ((string< dir1 dir2) t)
                     ((not (string= dir1 dir2)) nil)
                     ((string< (car entry1) (car entry2))))))))
-    (if (not vc-dir-insert-directories)
-       (let ((entry (car entries))
-             (node (ewoc-nth vc-ewoc 0)))
-         (while (and entry node)
-           (let ((entryfile (car entry))
-                 (nodefile (vc-dir-fileinfo->name (ewoc-data node))))
-             (cond
-              ((string-lessp nodefile entryfile)
-               (setq node (ewoc-next vc-ewoc node)))
-              ((string-lessp entryfile nodefile)
-               (unless noinsert
-                 (ewoc-enter-before vc-ewoc node
-                                    (apply 'vc-dir-create-fileinfo entry)))
-               (setq entries (cdr entries) entry (car entries)))
-              (t
-               (setf (vc-dir-fileinfo->state (ewoc-data node)) (nth 1 entry))
-               (setf (vc-dir-fileinfo->extra (ewoc-data node)) (nth 2 entry))
-               (setf (vc-dir-fileinfo->needs-update (ewoc-data node)) nil)
-               (ewoc-invalidate vc-ewoc node)
-               (setq entries (cdr entries) entry (car entries))
-               (setq node (ewoc-next vc-ewoc node))))))
-         (unless (or node noinsert)
-           ;; We're past the last node, all remaining entries go to the end.
-           (while entries
-             (ewoc-enter-last vc-ewoc
-                              (apply 'vc-dir-create-fileinfo (pop entries))))))
   ;; Insert directory entries in the right places.
   (let ((entry (car entries))
        (node (ewoc-nth vc-ewoc 0)))
@@ -934,7 +900,7 @@
                 vc-ewoc (vc-dir-create-fileinfo rd nil nil nil entrydir))))
            ;; Now insert the node itself.
            (ewoc-enter-last vc-ewoc
-                            (apply 'vc-dir-create-fileinfo entry))))))))))
+                              (apply 'vc-dir-create-fileinfo entry)))))))))
 
 (defun vc-dir-busy ()
   (and (buffer-live-p vc-dir-process-buffer)
@@ -983,7 +949,6 @@
     (funcall mark-unmark-function)))
 
 (defun vc-dir-parent-marked-p (arg)
-  (when vc-dir-insert-directories
     ;; Return nil if none of the parent directories of arg is marked.
     (let* ((argdata (ewoc-data arg))
           (argdir
@@ -1012,11 +977,10 @@
            (error "Cannot mark `%s', parent directory `%s' marked"
                   (vc-dir-fileinfo->name argdata)
                   (vc-dir-fileinfo->name data)))))
-      nil)))
+    nil))
 
 (defun vc-dir-children-marked-p (arg)
   ;; Return nil if none of the children of arg is marked.
-  (when vc-dir-insert-directories
     (let* ((argdata (ewoc-data arg))
           (argdir (vc-dir-fileinfo->directory argdata))
           (arglen (length argdir))
@@ -1038,7 +1002,7 @@
                     (vc-dir-fileinfo->name data)))
          ;; We are done, we got to an entry that is not a child of `arg'.
          (setq is-child nil)))
-      nil)))
+    nil))
 
 (defun vc-dir-mark-file (&optional arg)
   ;; Mark ARG or the current file and move to the next line.