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

[Alexandre Julliard]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Alexandre Julliard <julliard>   08/07/05 18:42:08

Index: vc-git.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-git.el,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- vc-git.el   2 Jul 2008 11:56:11 -0000       1.67
+++ vc-git.el   5 Jul 2008 18:42:07 -0000       1.68
@@ -132,14 +132,18 @@
   (when (vc-git-root file)
     (with-temp-buffer
       (let* ((dir (file-name-directory file))
-            (name (file-relative-name file dir)))
-       (and (ignore-errors
+             (name (file-relative-name file dir))
+             (str (ignore-errors
                (when dir (cd dir))
-               (vc-git--out-ok "ls-files" "-c" "-z" "--" name))
-            (let ((str (buffer-string)))
-              (and (> (length str) (length name))
+                    (vc-git--out-ok "ls-files" "-c" "-z" "--" name)
+                    ;; if result is empty, use ls-tree to check for deleted 
file
+                    (when (eq (point-min) (point-max))
+                      (vc-git--out-ok "ls-tree" "--name-only" "-z" "HEAD" "--" 
name))
+                    (buffer-string))))
+        (and str
+             (> (length str) (length name))
                    (string= (substring str 0 (1+ (length name)))
-                             (concat name "\0")))))))))
+                      (concat name "\0")))))))
 
 (defun vc-git--state-code (code)
   "Convert from a string to a added/deleted/modified state."
@@ -453,33 +457,26 @@
     ;; If the buffer exists from a previous invocation it might be
     ;; read-only.
     (let ((inhibit-read-only t))
-      ;; XXX `log-view-mode' needs to have something to identify where
-      ;; the log for each individual file starts. It seems that by
-      ;; default git does not output this info. So loop here and call
-      ;; "git rev-list" on each file separately to make sure that each
-      ;; file gets a "File:" header before the corresponding
-      ;; log. Maybe there is a way to do this with one command...
-      (dolist (file flist)
        (with-current-buffer
            buffer
-         (insert "File: " (file-name-nondirectory file) "\n"))
-       (vc-git-command buffer 'async (file-relative-name file)
+       (vc-git-command buffer 'async files
                        "rev-list" "--pretty" "HEAD" "--")))))
 
 (defvar log-view-message-re)
 (defvar log-view-file-re)
 (defvar log-view-font-lock-keywords)
+(defvar log-view-per-file-logs)
 
 (define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View"
   (require 'add-log) ;; we need the faces add-log
   ;; Don't have file markers, so use impossible regexp.
-  (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)")
+  (set (make-local-variable 'log-view-file-re) "\\`a\\`")
+  (set (make-local-variable 'log-view-per-file-logs) nil)
   (set (make-local-variable 'log-view-message-re)
        "^commit *\\([0-9a-z]+\\)")
   (set (make-local-variable 'log-view-font-lock-keywords)
        (append
-        `((,log-view-message-re  (1 'change-log-acknowledgement))
-          (,log-view-file-re (1 'change-log-file-face)))
+        `((,log-view-message-re  (1 'change-log-acknowledgement)))
         ;; Handle the case:
         ;; user: address@hidden
         '(("^Author:[ \t]+\\(address@hidden)"
@@ -577,6 +574,7 @@
 
 (defun vc-git-previous-revision (file rev)
   "Git-specific version of `vc-previous-revision'."
+  (if file
   (let ((default-directory (file-name-directory (expand-file-name file)))
        (file (file-name-nondirectory file)))
     (vc-git-symbolic-commit
@@ -589,7 +587,11 @@
        (not (bobp))
        (buffer-substring-no-properties
          (point)
-         (1- (point-max))))))))
+             (1- (point-max)))))))
+    (with-temp-buffer
+      (and
+       (vc-git--out-ok "rev-parse" (concat rev "^"))
+       (buffer-substring-no-properties (point-min) (+ (point-min) 40))))))
 
 (defun vc-git-next-revision (file rev)
   "Git-specific version of `vc-next-revision'."