Commit 31db8c31 authored by Glenn Morris's avatar Glenn Morris
Browse files

* vc/vc-svn.el (vc-svn-command): Move --non-interactive from here...

(vc-svn-global-switches): ... to here.

Fixes: debbugs:13513
parent 55fe8e64
2013-02-11 Glenn Morris <rgm@gnu.org>
* vc/vc-svn.el (vc-svn-command): Move --non-interactive from here...
(vc-svn-global-switches): ... to here. (Bug#13513)
2013-02-10 Christopher Schmidt <christopher@ch.ristopher.com> 2013-02-10 Christopher Schmidt <christopher@ch.ristopher.com>
   
* minibuf-eldef.el (minibuffer-default--in-prompt-regexps): Handle * minibuf-eldef.el (minibuffer-default--in-prompt-regexps): Handle
......
...@@ -50,14 +50,21 @@ ...@@ -50,14 +50,21 @@
:type 'string :type 'string
:group 'vc-svn) :group 'vc-svn)
(defcustom vc-svn-global-switches nil ;; Might be nice if svn defaulted to non-interactive if stdin not tty.
"Global switches to pass to any SVN command." ;; http://svn.haxx.se/dev/archive-2008-05/0762.shtml
;; http://svn.haxx.se/dev/archive-2009-04/0094.shtml
;; Maybe newer ones do?
(defcustom vc-svn-global-switches (unless (eq system-type 'darwin) ; bug#13513
'("--non-interactive"))
"Global switches to pass to any SVN command.
The option \"--non-interactive\" is often needed to prevent SVN
hanging while prompting for authorization."
:type '(choice (const :tag "None" nil) :type '(choice (const :tag "None" nil)
(string :tag "Argument String") (string :tag "Argument String")
(repeat :tag "Argument List" (repeat :tag "Argument List"
:value ("") :value ("")
string)) string))
:version "22.1" :version "24.4"
:group 'vc-svn) :group 'vc-svn)
(defcustom vc-svn-register-switches nil (defcustom vc-svn-register-switches nil
...@@ -600,19 +607,11 @@ NAME is assumed to be a URL." ...@@ -600,19 +607,11 @@ NAME is assumed to be a URL."
(defun vc-svn-command (buffer okstatus file-or-list &rest flags) (defun vc-svn-command (buffer okstatus file-or-list &rest flags)
"A wrapper around `vc-do-command' for use in vc-svn.el. "A wrapper around `vc-do-command' for use in vc-svn.el.
The difference to vc-do-command is that this function always invokes `svn', The difference to vc-do-command is that this function always invokes `svn',
and that it passes \"--non-interactive\" and `vc-svn-global-switches' to and that it passes `vc-svn-global-switches' to it before FLAGS."
it before FLAGS."
;; Might be nice if svn defaulted to non-interactive if stdin not tty.
;; http://svn.haxx.se/dev/archive-2008-05/0762.shtml
;; http://svn.haxx.se/dev/archive-2009-04/0094.shtml
;; Maybe newer ones do?
(or (member "--non-interactive"
(setq flags (if (stringp vc-svn-global-switches)
(cons vc-svn-global-switches flags)
(append vc-svn-global-switches flags))))
(setq flags (cons "--non-interactive" flags)))
(apply 'vc-do-command (or buffer "*vc*") okstatus vc-svn-program file-or-list (apply 'vc-do-command (or buffer "*vc*") okstatus vc-svn-program file-or-list
flags)) (if (stringp vc-svn-global-switches)
(cons vc-svn-global-switches flags)
(append vc-svn-global-switches flags))))
(defun vc-svn-repository-hostname (dirname) (defun vc-svn-repository-hostname (dirname)
(with-temp-buffer (with-temp-buffer
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment