diff options
| author | Karl Fogel <kfogel@red-bean.com> | 2014-12-03 14:23:26 -0600 |
|---|---|---|
| committer | Karl Fogel <kfogel@red-bean.com> | 2014-12-03 14:23:26 -0600 |
| commit | b3298507f92f8cc17dc35090e4036aac787af682 (patch) | |
| tree | e9f5610b3c649ff2124b8defc98eaaaaef94103e /lisp/vc/vc-svn.el | |
| parent | c263a40a9ac76a87b919ca8d425736797c3c399c (diff) | |
| download | emacs-b3298507f92f8cc17dc35090e4036aac787af682.tar.gz | |
Fix bug whereby saving files hung in VC hook.
Saving a buffer visiting a file under SVN control would hang if the
remote repository were unreachable, because the VC hooks tried to run
"svn status -u" on the file, where the "-u" tells svn to get update
information from the remote repository.
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00174.html
* vc/vc-svn.el (vc-svn-state): Remove optional `localp' argument
and always pass "-v" to "svn status", never "-u".
Diffstat (limited to 'lisp/vc/vc-svn.el')
| -rw-r--r-- | lisp/vc/vc-svn.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index abeeac0be14..e29dae4d47c 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -153,12 +153,12 @@ If you want to force an empty list of arguments, use t." (let ((parsed (vc-svn-parse-status file))) (and parsed (not (memq parsed '(ignored unregistered)))))))))) -(defun vc-svn-state (file &optional localp) +(defun vc-svn-state (file) "SVN-specific version of `vc-state'." (let (process-file-side-effects) (with-temp-buffer (cd (file-name-directory file)) - (vc-svn-command t 0 file "status" (if localp "-v" "-u")) + (vc-svn-command t 0 file "status" "-v") (vc-svn-parse-status file)))) ;; FIXME it would be better not to have the "remote" argument, |