[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99872: Fix finding revisions in for renamed files in vc-annotate.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 99872
committer: Dan Nicolaescu <address@hidden>
branch nick: emacs-23
timestamp: Mon 2010-06-21 18:26:30 -0700
message:
  Fix finding revisions in for renamed files in vc-annotate.
  * lisp/vc.el (vc-find-revision): Add an optional argument for
  the VC backend.  Use it when non-nil.
  * lisp/vc-annotate.el (vc-annotate-find-revision-at-line): Pass the VC
  backend to vc-find-revision.  (Bug#6487)
modified:
  lisp/ChangeLog
  lisp/vc-annotate.el
  lisp/vc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-21 20:03:30 +0000
+++ b/lisp/ChangeLog    2010-06-22 01:26:30 +0000
@@ -1,5 +1,13 @@
 2010-06-21  Dan Nicolaescu  <address@hidden>
 
+       Fix finding revisions in for renamed files in vc-annotate.
+       * vc.el (vc-find-revision): Add an optional argument for
+       the VC backend.  Use it when non-nil.
+       * vc-annotate.el (vc-annotate-find-revision-at-line): Pass the VC
+       backend to vc-find-revision.  (Bug#6487)
+
+2010-06-21  Dan Nicolaescu  <address@hidden>
+
        Fix reading file names in Git annotate buffers.
        * vc-git.el (vc-git-annotate-extract-revision-at-line): Remove
        trailing whitespace.  Suggested by Eric Hanchrow.  (Bug#6481)

=== modified file 'lisp/vc-annotate.el'
--- a/lisp/vc-annotate.el       2010-06-15 04:51:42 +0000
+++ b/lisp/vc-annotate.el       2010-06-22 01:26:30 +0000
@@ -461,7 +461,7 @@
       (if (not rev-at-line)
          (message "Cannot extract revision number from the current line")
        (switch-to-buffer-other-window
-        (vc-find-revision (cdr rev-at-line) (car rev-at-line)))))))
+        (vc-find-revision (cdr rev-at-line) (car rev-at-line) 
vc-annotate-backend))))))
 
 (defun vc-annotate-revision-previous-to-line ()
   "Visit the annotation of the revision before the revision at line."

=== modified file 'lisp/vc.el'
--- a/lisp/vc.el        2010-03-25 23:41:22 +0000
+++ b/lisp/vc.el        2010-06-22 01:26:30 +0000
@@ -1655,8 +1655,9 @@
                    rev)))
     (switch-to-buffer-other-window (vc-find-revision file revision))))
 
-(defun vc-find-revision (file revision)
-  "Read REVISION of FILE into a buffer and return the buffer."
+(defun vc-find-revision (file revision &optional backend)
+  "Read REVISION of FILE into a buffer and return the buffer.
+Use BACKEND as the VC backend if specified."
   (let ((automatic-backup (vc-version-backup-file-name file revision))
        (filebuf (or (get-file-buffer file) (current-buffer)))
         (filename (vc-version-backup-file-name file revision 'manual)))
@@ -1674,7 +1675,9 @@
                      ;; Change buffer to get local value of
                      ;; vc-checkout-switches.
                      (with-current-buffer filebuf
-                       (vc-call find-revision file revision outbuf))))
+                       (if backend
+                           (vc-call-backend backend 'find-revision file 
revision outbuf)
+                         (vc-call find-revision file revision outbuf)))))
                  (setq failed nil))
              (when (and failed (file-exists-p filename))
                (delete-file filename))))