diff options
| author | Glenn Morris | 2007-08-27 07:04:45 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-08-27 07:04:45 +0000 |
| commit | c62a495a84df7fc23d7302657605a73eecc7f5e1 (patch) | |
| tree | e2b57f1149dd669757b1759e7718424383473aa5 | |
| parent | 0ddda8cd6ef917a9df612591db41334c75e8932b (diff) | |
| download | emacs-c62a495a84df7fc23d7302657605a73eecc7f5e1.tar.gz emacs-c62a495a84df7fc23d7302657605a73eecc7f5e1.zip | |
(vc-svn-diff): If the repository version of all the files is the same
as the specified OLDVERS, do a local diff.
| -rw-r--r-- | lisp/vc-svn.el | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index ddecb89d77c..0b34c30f630 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el | |||
| @@ -399,6 +399,17 @@ The changes are between FIRST-VERSION and SECOND-VERSION." | |||
| 399 | 399 | ||
| 400 | (defun vc-svn-diff (files &optional oldvers newvers buffer) | 400 | (defun vc-svn-diff (files &optional oldvers newvers buffer) |
| 401 | "Get a difference report using SVN between two versions of fileset FILES." | 401 | "Get a difference report using SVN between two versions of fileset FILES." |
| 402 | (and oldvers | ||
| 403 | (catch 'no | ||
| 404 | (dolist (f files) | ||
| 405 | (or (equal oldvers (vc-workfile-version f)) | ||
| 406 | (throw 'no nil))) | ||
| 407 | t) | ||
| 408 | ;; Use nil rather than the current revision because svn handles | ||
| 409 | ;; it better (i.e. locally). Note that if _any_ of the files | ||
| 410 | ;; has a different revision, we fetch the lot, which is | ||
| 411 | ;; obviously sub-optimal. | ||
| 412 | (setq oldvers nil)) | ||
| 402 | (let* ((switches | 413 | (let* ((switches |
| 403 | (if vc-svn-diff-switches | 414 | (if vc-svn-diff-switches |
| 404 | (vc-switches 'SVN 'diff) | 415 | (vc-switches 'SVN 'diff) |