diff options
| author | Michael Albinus | 2009-08-25 09:05:07 +0000 |
|---|---|---|
| committer | Michael Albinus | 2009-08-25 09:05:07 +0000 |
| commit | 04473f67564fa927acd5c8e13fa5a298c9e6865f (patch) | |
| tree | 871444342f7076dd506bfba7c0f82d6214ec96f0 | |
| parent | ba2318b74b0e9dfa943d3d8d0778b39cecee3541 (diff) | |
| download | emacs-04473f67564fa927acd5c8e13fa5a298c9e6865f.tar.gz emacs-04473f67564fa927acd5c8e13fa5a298c9e6865f.zip | |
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Let-bind `process-file-side-effects' with nil.
| -rw-r--r-- | lisp/vc-svn.el | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 830e1582978..b07a6642192 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el | |||
| @@ -126,7 +126,8 @@ want to force an empty list of arguments, use t." | |||
| 126 | (file-name-directory file))) | 126 | (file-name-directory file))) |
| 127 | (with-temp-buffer | 127 | (with-temp-buffer |
| 128 | (cd (file-name-directory file)) | 128 | (cd (file-name-directory file)) |
| 129 | (let ((status | 129 | (let* (process-file-side-effects |
| 130 | (status | ||
| 130 | (condition-case nil | 131 | (condition-case nil |
| 131 | ;; Ignore all errors. | 132 | ;; Ignore all errors. |
| 132 | (vc-svn-command t t file "status" "-v") | 133 | (vc-svn-command t t file "status" "-v") |
| @@ -142,11 +143,12 @@ want to force an empty list of arguments, use t." | |||
| 142 | 143 | ||
| 143 | (defun vc-svn-state (file &optional localp) | 144 | (defun vc-svn-state (file &optional localp) |
| 144 | "SVN-specific version of `vc-state'." | 145 | "SVN-specific version of `vc-state'." |
| 145 | (setq localp (or localp (vc-stay-local-p file 'SVN))) | 146 | (let (process-file-side-effects) |
| 146 | (with-temp-buffer | 147 | (setq localp (or localp (vc-stay-local-p file 'SVN))) |
| 147 | (cd (file-name-directory file)) | 148 | (with-temp-buffer |
| 148 | (vc-svn-command t 0 file "status" (if localp "-v" "-u")) | 149 | (cd (file-name-directory file)) |
| 149 | (vc-svn-parse-status file))) | 150 | (vc-svn-command t 0 file "status" (if localp "-v" "-u")) |
| 151 | (vc-svn-parse-status file)))) | ||
| 150 | 152 | ||
| 151 | (defun vc-svn-state-heuristic (file) | 153 | (defun vc-svn-state-heuristic (file) |
| 152 | "SVN-specific state heuristic." | 154 | "SVN-specific state heuristic." |
| @@ -203,7 +205,8 @@ RESULT is a list of conses (FILE . STATE) for directory DIR." | |||
| 203 | 205 | ||
| 204 | (defun vc-svn-dir-extra-headers (dir) | 206 | (defun vc-svn-dir-extra-headers (dir) |
| 205 | "Generate extra status headers for a Subversion working copy." | 207 | "Generate extra status headers for a Subversion working copy." |
| 206 | (vc-svn-command "*vc*" 0 nil "info") | 208 | (let (process-file-side-effects) |
| 209 | (vc-svn-command "*vc*" 0 nil "info")) | ||
| 207 | (let ((repo | 210 | (let ((repo |
| 208 | (save-excursion | 211 | (save-excursion |
| 209 | (and (progn | 212 | (and (progn |
| @@ -305,12 +308,13 @@ This is only possible if SVN is responsible for FILE's directory.") | |||
| 305 | 308 | ||
| 306 | (defun vc-svn-find-revision (file rev buffer) | 309 | (defun vc-svn-find-revision (file rev buffer) |
| 307 | "SVN-specific retrieval of a specified version into a buffer." | 310 | "SVN-specific retrieval of a specified version into a buffer." |
| 308 | (apply 'vc-svn-command | 311 | (let (process-file-side-effects) |
| 309 | buffer 0 file | 312 | (apply 'vc-svn-command |
| 310 | "cat" | 313 | buffer 0 file |
| 311 | (and rev (not (string= rev "")) | 314 | "cat" |
| 312 | (concat "-r" rev)) | 315 | (and rev (not (string= rev "")) |
| 313 | (vc-switches 'SVN 'checkout))) | 316 | (concat "-r" rev)) |
| 317 | (vc-switches 'SVN 'checkout)))) | ||
| 314 | 318 | ||
| 315 | (defun vc-svn-checkout (file &optional editable rev) | 319 | (defun vc-svn-checkout (file &optional editable rev) |
| 316 | (message "Checking out %s..." file) | 320 | (message "Checking out %s..." file) |