summaryrefslogtreecommitdiff
path: root/lisp/vc-svn.el
diff options
context:
space:
mode:
authorEric S. Raymond <esr@snark.thyrsus.com>2008-05-10 13:27:16 +0000
committerEric S. Raymond <esr@snark.thyrsus.com>2008-05-10 13:27:16 +0000
commit2888a97eb5437535f484f725d3d9606f1cbdbd8f (patch)
treeefe43d9517aabfc09b5c70a8896175333eb13ab7 /lisp/vc-svn.el
parentb3fccc2715c53adc5f80eb003abcd27f215f4564 (diff)
downloademacs-2888a97eb5437535f484f725d3d9606f1cbdbd8f.tar.gz
Remove assumption about what nil means as a first arument to vc-do-command.
Diffstat (limited to 'lisp/vc-svn.el')
-rw-r--r--lisp/vc-svn.el16
1 files changed, 6 insertions, 10 deletions
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 7b12717dd81..44f7e8eb44d 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -208,8 +208,8 @@ RESULT is a list of conses (FILE . STATE) for directory DIR."
(defun vc-svn-create-repo ()
"Create a new SVN repository."
- (vc-do-command nil 0 "svnadmin" '("create" "SVN"))
- (vc-do-command nil 0 "svn" '(".")
+ (vc-do-command "*vc*" 0 "svnadmin" '("create" "SVN"))
+ (vc-do-command "*vc*" 0 "svn" '(".")
"checkout" (concat "file://" default-directory "SVN")))
(defun vc-svn-register (files &optional rev comment)
@@ -389,17 +389,17 @@ or svn+ssh://."
;; Repository Root is a local file.
(progn
(unless (vc-do-command
- nil 0 "svnadmin" nil
+ "*vc*" 0 "svnadmin" nil
"setlog" "--bypass-hooks" directory
"-r" rev (format "%s" tempfile))
(error "Log edit failed"))
(delete-file tempfile))
;; Remote repository, using svn+ssh.
- (unless (vc-do-command nil 0 "scp" nil "-q" tempfile remotefile)
+ (unless (vc-do-command "*vc*" 0 "scp" nil "-q" tempfile remotefile)
(error "Copy of comment to %s failed" remotefile))
(unless (vc-do-command
- nil 0 "ssh" nil "-q" host
+ "*vc*" 0 "ssh" nil "-q" host
(format "svnadmin setlog --bypass-hooks %s -r %s %s; rm %s"
directory rev tempfile tempfile))
(error "Log edit failed")))))
@@ -517,7 +517,7 @@ NAME is assumed to be a URL."
"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 `vc-svn-global-switches' to it before FLAGS."
- (apply 'vc-do-command buffer okstatus vc-svn-program file-or-list
+ (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
@@ -625,10 +625,6 @@ information about FILENAME and return its status."
(t 'edited)))))
(if filename (vc-file-getprop filename 'vc-state))))
-(defun vc-svn-dir-state-heuristic (dir)
- "Find the SVN state of all files in DIR, using only local information."
- (vc-svn-dir-state dir 'local))
-
(defun vc-svn-valid-symbolic-tag-name-p (tag)
"Return non-nil if TAG is a valid symbolic tag name."
;; According to the SVN manual, a valid symbolic tag must start with