diff options
| author | Nick Roberts | 2009-02-04 10:49:04 +0000 |
|---|---|---|
| committer | Nick Roberts | 2009-02-04 10:49:04 +0000 |
| commit | 22b5692c3d5921910c1d9b3bf4b5fffb155694e7 (patch) | |
| tree | 501fb688d85c4686d5e3e79eb84ad08e15286064 | |
| parent | 77900a45d479ca114e6354331cc107ba459d50ff (diff) | |
| download | emacs-22b5692c3d5921910c1d9b3bf4b5fffb155694e7.tar.gz emacs-22b5692c3d5921910c1d9b3bf4b5fffb155694e7.zip | |
(vc-svn-diff): Revert previous change but add a test
for newvars is nil. (C-u C-x v = with default values).
| -rw-r--r-- | lisp/vc-svn.el | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index c2d0d62ab6c..e79ef9a0fa6 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el | |||
| @@ -483,6 +483,19 @@ or svn+ssh://." | |||
| 483 | 483 | ||
| 484 | (defun vc-svn-diff (files &optional oldvers newvers buffer) | 484 | (defun vc-svn-diff (files &optional oldvers newvers buffer) |
| 485 | "Get a difference report using SVN between two revisions of fileset FILES." | 485 | "Get a difference report using SVN between two revisions of fileset FILES." |
| 486 | (and oldvers | ||
| 487 | (not newvers) | ||
| 488 | files | ||
| 489 | (catch 'no | ||
| 490 | (dolist (f files) | ||
| 491 | (or (equal oldvers (vc-working-revision f)) | ||
| 492 | (throw 'no nil))) | ||
| 493 | t) | ||
| 494 | ;; Use nil rather than the current revision because svn handles | ||
| 495 | ;; it better (i.e. locally). Note that if _any_ of the files | ||
| 496 | ;; has a different revision, we fetch the lot, which is | ||
| 497 | ;; obviously sub-optimal. | ||
| 498 | (setq oldvers nil)) | ||
| 486 | (let* ((switches | 499 | (let* ((switches |
| 487 | (if vc-svn-diff-switches | 500 | (if vc-svn-diff-switches |
| 488 | (vc-switches 'SVN 'diff) | 501 | (vc-switches 'SVN 'diff) |