[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111728: * vc/vc-svn.el (vc-svn-comma
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111728: * vc/vc-svn.el (vc-svn-command): Move --non-interactive from here... |
Date: |
Sun, 10 Feb 2013 17:07:05 -0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111728
fixes bug: http://debbugs.gnu.org/13513
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2013-02-10 17:07:05 -0800
message:
* vc/vc-svn.el (vc-svn-command): Move --non-interactive from here...
(vc-svn-global-switches): ... to here.
modified:
lisp/ChangeLog
lisp/vc/vc-svn.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-02-10 14:18:48 +0000
+++ b/lisp/ChangeLog 2013-02-11 01:07:05 +0000
@@ -1,3 +1,8 @@
+2013-02-11 Glenn Morris <address@hidden>
+
+ * 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 <address@hidden>
* minibuf-eldef.el (minibuffer-default--in-prompt-regexps): Handle
=== modified file 'lisp/vc/vc-svn.el'
--- a/lisp/vc/vc-svn.el 2013-02-01 17:19:24 +0000
+++ b/lisp/vc/vc-svn.el 2013-02-11 01:07:05 +0000
@@ -50,14 +50,21 @@
:type 'string
:group 'vc-svn)
-(defcustom vc-svn-global-switches nil
- "Global switches to pass to any SVN command."
+;; 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?
+(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)
(string :tag "Argument String")
(repeat :tag "Argument List"
:value ("")
string))
- :version "22.1"
+ :version "24.4"
:group 'vc-svn)
(defcustom vc-svn-register-switches nil
@@ -600,19 +607,11 @@
(defun vc-svn-command (buffer okstatus file-or-list &rest flags)
"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',
-and that it passes \"--non-interactive\" and `vc-svn-global-switches' to
-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)
+and that it passes `vc-svn-global-switches' to it before FLAGS."
+ (apply 'vc-do-command (or buffer "*vc*") okstatus vc-svn-program file-or-list
+ (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
- flags))
+ (append vc-svn-global-switches flags))))
(defun vc-svn-repository-hostname (dirname)
(with-temp-buffer
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111728: * vc/vc-svn.el (vc-svn-command): Move --non-interactive from here...,
Glenn Morris <=