[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp vc-svn.el
From: |
Nick Roberts |
Subject: |
[Emacs-diffs] emacs/lisp vc-svn.el |
Date: |
Fri, 30 Jan 2009 08:16:27 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Nick Roberts <nickrob> 09/01/30 08:16:27
Modified files:
lisp : vc-svn.el
Log message:
(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.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-svn.el?cvsroot=emacs&r1=1.108&r2=1.109
Patches:
Index: vc-svn.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-svn.el,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- vc-svn.el 29 Jan 2009 08:53:40 -0000 1.108
+++ vc-svn.el 30 Jan 2009 08:16:26 -0000 1.109
@@ -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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp vc-svn.el,
Nick Roberts <=