changeset 101669:7f3372c8c319

(vc-svn-dir-status): Correct logic for remote connection. (vc-svn-diff): Use old version number even when it is the working revision. This is needed, e.g, in the vc-print-log buffer.
author Nick Roberts <nickrob@snap.net.nz>
date Fri, 30 Jan 2009 08:16:26 +0000
parents 1862311ef4a1
children a15c11f894f1
files lisp/vc-svn.el
diffstat 1 files changed, 1 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc-svn.el	Fri Jan 30 08:13:07 2009 +0000
+++ b/lisp/vc-svn.el	Fri Jan 30 08:16:26 2009 +0000
@@ -186,7 +186,7 @@
 RESULT is a list of conses (FILE . STATE) for directory DIR."
   ;; FIXME should this rather be all the files in dir?
   (let* ((local (vc-stay-local-p dir))
-	 (remote (and local (not (eq local 'only-file)))))
+	 (remote (or (not local) (eq local 'only-file))))
     (vc-svn-command (current-buffer) 'async nil "status"
 		    (if remote "-u"))
   (vc-exec-after
@@ -479,18 +479,6 @@
 
 (defun vc-svn-diff (files &optional oldvers newvers buffer)
   "Get a difference report using SVN between two revisions of fileset FILES."
-  (and oldvers
-       files
-       (catch 'no
-	 (dolist (f files)
-	   (or (equal oldvers (vc-working-revision f))
-	       (throw 'no nil)))
-	 t)
-       ;; Use nil rather than the current revision because svn handles
-       ;; it better (i.e. locally).  Note that if _any_ of the files
-       ;; has a different revision, we fetch the lot, which is
-       ;; obviously sub-optimal.
-       (setq oldvers nil))
   (let* ((switches
 	    (if vc-svn-diff-switches
 		(vc-switches 'SVN 'diff)