diff options
author | Nick Roberts <nickrob@snap.net.nz> | 2009-01-30 08:16:26 +0000 |
---|---|---|
committer | Nick Roberts <nickrob@snap.net.nz> | 2009-01-30 08:16:26 +0000 |
commit | cf4b480f77c1d4b3878254f6c2f19746713a0349 (patch) | |
tree | 2e978e08c1389b5fb4b21c70a1888c3f9a2aedd7 /lisp | |
parent | 338efeada8d1993de908721108ef60b0c623b078 (diff) | |
download | emacs-cf4b480f77c1d4b3878254f6c2f19746713a0349.tar.gz |
(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.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/vc-svn.el | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 884ab4d2879..cfbc8496433 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -186,7 +186,7 @@ CALLBACK is called as (CALLBACK RESULT BUFFER), where 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 @@ or svn+ssh://." (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) |