* lisp/vc/vc-hg.el (vc-hg-unregister): New function (tiny change)
[emacs.git] / lisp / vc / vc-svn.el
blob85976db78bd5849c308d49ed7171889a194f55cd
1 ;;; vc-svn.el --- non-resident support for Subversion version-control -*- lexical-binding:t -*-
3 ;; Copyright (C) 2003-2014 Free Software Foundation, Inc.
5 ;; Author: FSF (see vc.el for full credits)
6 ;; Maintainer: Stefan Monnier <monnier@gnu.org>
7 ;; Package: vc
9 ;; This file is part of GNU Emacs.
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
12 ;; it under the terms of the GNU General Public License as published by
13 ;; the Free Software Foundation, either version 3 of the License, or
14 ;; (at your option) any later version.
16 ;; GNU Emacs is distributed in the hope that it will be useful,
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 ;; GNU General Public License for more details.
21 ;; You should have received a copy of the GNU General Public License
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
24 ;;; Commentary:
26 ;; Sync'd with Subversion's vc-svn.el as of revision 5801. but this version
27 ;; has been extensively modified since to handle filesets.
29 ;;; Code:
31 (eval-when-compile
32 (require 'vc))
34 ;; Clear up the cache to force vc-call to check again and discover
35 ;; new functions when we reload this file.
36 (put 'SVN 'vc-functions nil)
38 ;;;
39 ;;; Customization options
40 ;;;
42 (defgroup vc-svn nil
43 "VC Subversion (svn) backend."
44 :version "24.1"
45 :group 'vc)
47 ;; FIXME there is also svnadmin.
48 (defcustom vc-svn-program "svn"
49 "Name of the SVN executable."
50 :type 'string
51 :group 'vc-svn)
53 ;; Might be nice if svn defaulted to non-interactive if stdin not tty.
54 ;; http://svn.haxx.se/dev/archive-2008-05/0762.shtml
55 ;; http://svn.haxx.se/dev/archive-2009-04/0094.shtml
56 ;; Maybe newer ones do?
57 (defcustom vc-svn-global-switches (unless (eq system-type 'darwin) ; bug#13513
58 '("--non-interactive"))
59 "Global switches to pass to any SVN command.
60 The option \"--non-interactive\" is often needed to prevent SVN
61 hanging while prompting for authorization."
62 :type '(choice (const :tag "None" nil)
63 (string :tag "Argument String")
64 (repeat :tag "Argument List"
65 :value ("")
66 string))
67 :version "24.4"
68 :group 'vc-svn)
70 (defcustom vc-svn-register-switches nil
71 "Switches for registering a file into SVN.
72 A string or list of strings passed to the checkin program by
73 \\[vc-register]. If nil, use the value of `vc-register-switches'.
74 If t, use no switches."
75 :type '(choice (const :tag "Unspecified" nil)
76 (const :tag "None" t)
77 (string :tag "Argument String")
78 (repeat :tag "Argument List" :value ("") string))
79 :version "22.1"
80 :group 'vc-svn)
82 (defcustom vc-svn-diff-switches
83 t ;`svn' doesn't support common args like -c or -b.
84 "String or list of strings specifying extra switches for svn diff under VC.
85 If nil, use the value of `vc-diff-switches' (or `diff-switches'),
86 together with \"-x --diff-cmd=\"`diff-command' (since 'svn diff'
87 does not support the default \"-c\" value of `diff-switches').
88 If you want to force an empty list of arguments, use t."
89 :type '(choice (const :tag "Unspecified" nil)
90 (const :tag "None" t)
91 (string :tag "Argument String")
92 (repeat :tag "Argument List"
93 :value ("")
94 string))
95 :version "22.1"
96 :group 'vc-svn)
98 (defcustom vc-svn-header '("\$Id\$")
99 "Header keywords to be inserted by `vc-insert-headers'."
100 :version "24.1" ; no longer consult the obsolete vc-header-alist
101 :type '(repeat string)
102 :group 'vc-svn)
104 ;; We want to autoload it for use by the autoloaded version of
105 ;; vc-svn-registered, but we want the value to be compiled at startup, not
106 ;; at dump time.
107 ;; ;;;###autoload
108 (defconst vc-svn-admin-directory
109 (cond ((and (memq system-type '(cygwin windows-nt ms-dos))
110 (getenv "SVN_ASP_DOT_NET_HACK"))
111 "_svn")
112 (t ".svn"))
113 "The name of the \".svn\" subdirectory or its equivalent.")
115 ;;; Properties of the backend
117 (defun vc-svn-revision-granularity () 'repository)
118 (defun vc-svn-checkout-model (_files) 'implicit)
121 ;;; State-querying functions
124 ;;; vc-svn-admin-directory is generally not defined when the
125 ;;; autoloaded function is called.
127 ;;;###autoload (defun vc-svn-registered (f)
128 ;;;###autoload (let ((admin-dir (cond ((and (eq system-type 'windows-nt)
129 ;;;###autoload (getenv "SVN_ASP_DOT_NET_HACK"))
130 ;;;###autoload "_svn")
131 ;;;###autoload (t ".svn"))))
132 ;;;###autoload (when (vc-find-root f admin-dir)
133 ;;;###autoload (load "vc-svn" nil t)
134 ;;;###autoload (vc-svn-registered f))))
136 (defun vc-svn-registered (file)
137 "Check if FILE is SVN registered."
138 (when (vc-svn-root file)
139 (with-temp-buffer
140 (cd (file-name-directory file))
141 (let* (process-file-side-effects
142 (status
143 (condition-case nil
144 ;; Ignore all errors.
145 (vc-svn-command t t file "status" "-v")
146 ;; Some problem happened. E.g. We can't find an `svn'
147 ;; executable. We used to only catch `file-error' but when
148 ;; the process is run on a remote host via Tramp, the error
149 ;; is only reported via the exit status which is turned into
150 ;; an `error' by vc-do-command.
151 (error nil))))
152 (when (eq 0 status)
153 (let ((parsed (vc-svn-parse-status file)))
154 (and parsed (not (memq parsed '(ignored unregistered))))))))))
156 (defun vc-svn-state (file &optional localp)
157 "SVN-specific version of `vc-state'."
158 (let (process-file-side-effects)
159 (setq localp (or localp (vc-stay-local-p file 'SVN)))
160 (with-temp-buffer
161 (cd (file-name-directory file))
162 (vc-svn-command t 0 file "status" (if localp "-v" "-u"))
163 (vc-svn-parse-status file))))
165 ;; NB this does not handle svn properties, which can be changed
166 ;; without changing the file timestamp.
167 ;; Note that unlike vc-cvs-state-heuristic, this is not called from
168 ;; vc-svn-state. AFAICS, it is only called from vc-state-refresh via
169 ;; vc-after-save (bug#7850). Therefore the fact that it ignores
170 ;; properties is irrelevant. If you want to make vc-svn-state call
171 ;; this, it should be extended to handle svn properties.
172 (defun vc-svn-state-heuristic (file)
173 "SVN-specific state heuristic."
174 ;; If the file has not changed since checkout, consider it `up-to-date'.
175 ;; Otherwise consider it `edited'. Copied from vc-cvs-state-heuristic.
176 (let ((checkout-time (vc-file-getprop file 'vc-checkout-time))
177 (lastmod (nth 5 (file-attributes file))))
178 (cond
179 ((equal checkout-time lastmod) 'up-to-date)
180 ((string= (vc-working-revision file) "0") 'added)
181 ((null checkout-time) 'unregistered)
182 (t 'edited))))
184 ;; FIXME it would be better not to have the "remote" argument,
185 ;; but to distinguish the two output formats based on content.
186 (defun vc-svn-after-dir-status (callback &optional remote)
187 (let ((state-map '((?A . added)
188 (?C . conflict)
189 (?I . ignored)
190 (?M . edited)
191 (?D . removed)
192 (?R . removed)
193 (?? . unregistered)
194 ;; This is what vc-svn-parse-status does.
195 (?~ . edited)))
196 (re (if remote "^\\(.\\)\\(.\\).....? \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$"
197 ;; Subexp 3 is a dummy in this case, so the numbers match.
198 "^\\(.\\)\\(.\\)...\\(.\\) \\(.*\\)$"))
199 result)
200 (goto-char (point-min))
201 (while (re-search-forward re nil t)
202 (let ((state (cdr (assq (aref (match-string 1) 0) state-map)))
203 (propstat (cdr (assq (aref (match-string 2) 0) state-map)))
204 (filename (if (memq system-type '(windows-nt ms-dos))
205 (replace-regexp-in-string "\\\\" "/" (match-string 4))
206 (match-string 4))))
207 (and (memq propstat '(conflict edited))
208 (not (eq state 'conflict)) ; conflict always wins
209 (setq state propstat))
210 (and remote (string-equal (match-string 3) "*")
211 ;; FIXME are there other possible combinations?
212 (cond ((eq state 'edited) (setq state 'needs-merge))
213 ((not state) (setq state 'needs-update))))
214 (when (and state (not (string= "." filename)))
215 (setq result (cons (list filename state) result)))))
216 (funcall callback result)))
218 ;; -dir-status called from vc-dir, which loads vc, which loads vc-dispatcher.
219 (declare-function vc-exec-after "vc-dispatcher" (code))
221 (defun vc-svn-dir-status (dir callback)
222 "Run 'svn status' for DIR and update BUFFER via CALLBACK.
223 CALLBACK is called as (CALLBACK RESULT BUFFER), where
224 RESULT is a list of conses (FILE . STATE) for directory DIR."
225 ;; FIXME should this rather be all the files in dir?
226 ;; FIXME: the vc-stay-local-p logic below is disabled, it ends up
227 ;; calling synchronously (vc-svn-registered DIR) => calling svn status -v DIR
228 ;; which is VERY SLOW for big trees and it makes emacs
229 ;; completely unresponsive during that time.
230 (let* ((local (and nil (vc-stay-local-p dir 'SVN)))
231 (remote (or t (not local) (eq local 'only-file))))
232 (vc-svn-command (current-buffer) 'async nil "status"
233 (if remote "-u"))
234 (vc-run-delayed
235 (vc-svn-after-dir-status callback remote))))
237 (defun vc-svn-dir-status-files (_dir files _default-state callback)
238 (apply 'vc-svn-command (current-buffer) 'async nil "status" files)
239 (vc-run-delayed
240 (vc-svn-after-dir-status callback)))
242 (defun vc-svn-dir-extra-headers (_dir)
243 "Generate extra status headers for a Subversion working copy."
244 (let (process-file-side-effects)
245 (vc-svn-command "*vc*" 0 nil "info"))
246 (let ((repo
247 (save-excursion
248 (and (progn
249 (set-buffer "*vc*")
250 (goto-char (point-min))
251 (re-search-forward "Repository Root: *\\(.*\\)" nil t))
252 (match-string 1)))))
253 (concat
254 (cond (repo
255 (concat
256 (propertize "Repository : " 'face 'font-lock-type-face)
257 (propertize repo 'face 'font-lock-variable-name-face)))
258 (t "")))))
260 (defun vc-svn-working-revision (file)
261 "SVN-specific version of `vc-working-revision'."
262 ;; There is no need to consult RCS headers under SVN, because we
263 ;; get the workfile version for free when we recognize that a file
264 ;; is registered in SVN.
265 (vc-svn-registered file)
266 (vc-file-getprop file 'vc-working-revision))
268 ;; vc-svn-mode-line-string doesn't exist because the default implementation
269 ;; works just fine.
271 (defun vc-svn-previous-revision (_file rev)
272 (let ((newrev (1- (string-to-number rev))))
273 (when (< 0 newrev)
274 (number-to-string newrev))))
276 (defun vc-svn-next-revision (file rev)
277 (let ((newrev (1+ (string-to-number rev))))
278 ;; The "working revision" is an uneasy conceptual fit under Subversion;
279 ;; we use it as the upper bound until a better idea comes along. If the
280 ;; workfile version W coincides with the tree's latest revision R, then
281 ;; this check prevents a "no such revision: R+1" error. Otherwise, it
282 ;; inhibits showing of W+1 through R, which could be considered anywhere
283 ;; from gracious to impolite.
284 (unless (< (string-to-number (vc-file-getprop file 'vc-working-revision))
285 newrev)
286 (number-to-string newrev))))
290 ;;; State-changing functions
293 (defun vc-svn-create-repo ()
294 "Create a new SVN repository."
295 (vc-do-command "*vc*" 0 "svnadmin" '("create" "SVN"))
296 ;; Expand default-directory because svn gets confused by eg
297 ;; file://~/path/to/file. (Bug#15446).
298 (vc-svn-command "*vc*" 0 "." "checkout"
299 (concat "file://" (expand-file-name default-directory) "SVN")))
301 (autoload 'vc-switches "vc")
303 (defun vc-svn-register (files &optional _rev _comment)
304 "Register FILES into the SVN version-control system.
305 The COMMENT argument is ignored This does an add but not a commit.
306 Passes either `vc-svn-register-switches' or `vc-register-switches'
307 to the SVN command."
308 (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register)))
310 (defun vc-svn-root (file)
311 (vc-find-root file vc-svn-admin-directory))
313 (defalias 'vc-svn-responsible-p 'vc-svn-root)
315 (defalias 'vc-svn-could-register 'vc-svn-root
316 "Return non-nil if FILE could be registered in SVN.
317 This is only possible if SVN is responsible for FILE's directory.")
319 (defun vc-svn-checkin (files rev comment &optional _extra-args-ignored)
320 "SVN-specific version of `vc-backend-checkin'."
321 (if rev (error "Committing to a specific revision is unsupported in SVN"))
322 (let ((status (apply
323 'vc-svn-command nil 1 files "ci"
324 (nconc (list "-m" comment) (vc-switches 'SVN 'checkin)))))
325 (set-buffer "*vc*")
326 (goto-char (point-min))
327 (unless (equal status 0)
328 ;; Check checkin problem.
329 (cond
330 ((search-forward "Transaction is out of date" nil t)
331 (mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge))
332 files)
333 (error (substitute-command-keys
334 (concat "Up-to-date check failed: "
335 "type \\[vc-next-action] to merge in changes"))))
337 (pop-to-buffer (current-buffer))
338 (goto-char (point-min))
339 (shrink-window-if-larger-than-buffer)
340 (error "Check-in failed"))))
341 ;; Update file properties
342 ;; (vc-file-setprop
343 ;; file 'vc-working-revision
344 ;; (vc-parse-buffer "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" 2))
347 (defun vc-svn-find-revision (file rev buffer)
348 "SVN-specific retrieval of a specified version into a buffer."
349 (let (process-file-side-effects)
350 (apply 'vc-svn-command
351 buffer 0 file
352 "cat"
353 (and rev (not (string= rev ""))
354 (concat "-r" rev))
355 (vc-switches 'SVN 'checkout))))
357 (defun vc-svn-ignore (file &optional _directory _remove)
358 "Ignore FILE under Subversion.
359 FILE is a file wildcard, relative to the root directory of DIRECTORY."
360 (vc-svn-command t 0 file "propedit" "svn:ignore"))
362 (defun vc-svn-ignore-completion-table (_file)
363 "Return the list of ignored files."
366 (defun vc-svn-find-admin-dir (file)
367 "Return the administrative directory of FILE."
368 (expand-file-name vc-svn-admin-directory (vc-svn-root file)))
370 (defun vc-svn-checkout (file &optional editable rev)
371 (message "Checking out %s..." file)
372 (with-current-buffer (or (get-file-buffer file) (current-buffer))
373 (vc-svn-update file editable rev (vc-switches 'SVN 'checkout)))
374 (vc-mode-line file 'SVN)
375 (message "Checking out %s...done" file))
377 (defun vc-svn-update (file _editable rev switches)
378 (if (and (file-exists-p file) (not rev))
379 ;; If no revision was specified, there's nothing to do.
381 ;; Check out a particular version (or recreate the file).
382 (vc-file-setprop file 'vc-working-revision nil)
383 (apply 'vc-svn-command nil 0 file
384 "update"
385 (cond
386 ((null rev) "-rBASE")
387 ((or (eq rev t) (equal rev "")) nil)
388 (t (concat "-r" rev)))
389 switches)))
391 (defun vc-svn-delete-file (file)
392 (vc-svn-command nil 0 file "remove"))
394 (defun vc-svn-rename-file (old new)
395 (vc-svn-command nil 0 new "move" (file-relative-name old)))
397 (defun vc-svn-revert (file &optional contents-done)
398 "Revert FILE to the version it was based on."
399 (unless contents-done
400 (vc-svn-command nil 0 file "revert")))
402 (defun vc-svn-merge (file first-version &optional second-version)
403 "Merge changes into current working copy of FILE.
404 The changes are between FIRST-VERSION and SECOND-VERSION."
405 (vc-svn-command nil 0 file
406 "merge"
407 "-r" (if second-version
408 (concat first-version ":" second-version)
409 first-version))
410 (vc-file-setprop file 'vc-state 'edited)
411 (with-current-buffer (get-buffer "*vc*")
412 (goto-char (point-min))
413 (if (looking-at "C ")
414 1 ; signal conflict
415 0))) ; signal success
417 (defun vc-svn-merge-news (file)
418 "Merge in any new changes made to FILE."
419 (message "Merging changes into %s..." file)
420 ;; (vc-file-setprop file 'vc-working-revision nil)
421 (vc-file-setprop file 'vc-checkout-time 0)
422 (vc-svn-command nil 0 file "update")
423 ;; Analyze the merge result reported by SVN, and set
424 ;; file properties accordingly.
425 (with-current-buffer (get-buffer "*vc*")
426 (goto-char (point-min))
427 ;; get new working revision
428 (if (re-search-forward
429 "^\\(Updated to\\|At\\) revision \\([0-9]+\\)" nil t)
430 (vc-file-setprop file 'vc-working-revision (match-string 2))
431 (vc-file-setprop file 'vc-working-revision nil))
432 ;; get file status
433 (goto-char (point-min))
434 (prog1
435 (if (looking-at "At revision")
436 0 ;; there were no news; indicate success
437 (if (re-search-forward
438 ;; Newer SVN clients have 3 columns of chars (one for the
439 ;; file's contents, then second for its properties, and the
440 ;; third for lock-grabbing info), before the 2 spaces.
441 ;; We also used to match the filename in column 0 without any
442 ;; meta-info before it, but I believe this can never happen.
443 (concat "^\\(\\([ACGDU]\\)\\(.[B ]\\)? \\)"
444 (regexp-quote (file-relative-name file)))
445 nil t)
446 (cond
447 ;; Merge successful, we are in sync with repository now
448 ((string= (match-string 2) "U")
449 (vc-file-setprop file 'vc-state 'up-to-date)
450 (vc-file-setprop file 'vc-checkout-time
451 (nth 5 (file-attributes file)))
452 0);; indicate success to the caller
453 ;; Merge successful, but our own changes are still in the file
454 ((string= (match-string 2) "G")
455 (vc-file-setprop file 'vc-state 'edited)
456 0);; indicate success to the caller
457 ;; Conflicts detected!
459 (vc-file-setprop file 'vc-state 'edited)
460 1);; signal the error to the caller
462 (pop-to-buffer "*vc*")
463 (error "Couldn't analyze svn update result")))
464 (message "Merging changes into %s...done" file))))
466 (defun vc-svn-modify-change-comment (_files rev comment)
467 "Modify the change comments for a specified REV.
468 You must have ssh access to the repository host, and the directory Emacs
469 uses locally for temp files must also be writable by you on that host.
470 This is only supported if the repository access method is either file://
471 or svn+ssh://."
472 (let (tempfile host remotefile directory fileurl-p)
473 (with-temp-buffer
474 (vc-svn-command (current-buffer) 0 nil "info")
475 (goto-char (point-min))
476 (unless (re-search-forward "Repository Root: \\(file://\\(/.*\\)\\)\\|\\(svn\\+ssh://\\([^/]+\\)\\(/.*\\)\\)" nil t)
477 (error "Repository information is unavailable"))
478 (if (match-string 1)
479 (progn
480 (setq fileurl-p t)
481 (setq directory (match-string 2)))
482 (setq host (match-string 4))
483 (setq directory (match-string 5))
484 (setq remotefile (concat host ":" tempfile))))
485 (with-temp-file (setq tempfile (make-temp-file user-mail-address))
486 (insert comment))
487 (if fileurl-p
488 ;; Repository Root is a local file.
489 (progn
490 (unless (vc-do-command
491 "*vc*" 0 "svnadmin" nil
492 "setlog" "--bypass-hooks" directory
493 "-r" rev (format "%s" tempfile))
494 (error "Log edit failed"))
495 (delete-file tempfile))
497 ;; Remote repository, using svn+ssh.
498 (unless (vc-do-command "*vc*" 0 "scp" nil "-q" tempfile remotefile)
499 (error "Copy of comment to %s failed" remotefile))
500 (unless (vc-do-command
501 "*vc*" 0 "ssh" nil "-q" host
502 (format "svnadmin setlog --bypass-hooks %s -r %s %s; rm %s"
503 directory rev tempfile tempfile))
504 (error "Log edit failed")))))
507 ;;; History functions
510 (defvar log-view-per-file-logs)
512 (define-derived-mode vc-svn-log-view-mode log-view-mode "SVN-Log-View"
513 (require 'add-log)
514 (set (make-local-variable 'log-view-per-file-logs) nil))
516 (autoload 'vc-setup-buffer "vc-dispatcher")
518 (defun vc-svn-print-log (files buffer &optional _shortlog start-revision limit)
519 "Print commit log associated with FILES into specified BUFFER.
520 SHORTLOG is ignored.
521 If START-REVISION is non-nil, it is the newest revision to show.
522 If LIMIT is non-nil, show no more than this many entries."
523 (save-current-buffer
524 (vc-setup-buffer buffer)
525 (let ((inhibit-read-only t))
526 (goto-char (point-min))
527 (if files
528 (dolist (file files)
529 (insert "Working file: " file "\n")
530 (apply
531 'vc-svn-command
532 buffer
533 'async
534 ;; (if (and (= (length files) 1) (vc-stay-local-p file 'SVN)) 'async 0)
535 (list file)
536 "log"
537 (append
538 (list
539 (if start-revision
540 (format "-r%s:1" start-revision)
541 ;; By default Subversion only shows the log up to the
542 ;; working revision, whereas we also want the log of the
543 ;; subsequent commits. At least that's what the
544 ;; vc-cvs.el code does.
545 "-rHEAD:0"))
546 (when limit (list "--limit" (format "%s" limit))))))
547 ;; Dump log for the entire directory.
548 (apply 'vc-svn-command buffer 0 nil "log"
549 (append
550 (list
551 (if start-revision (format "-r%s" start-revision) "-rHEAD:0"))
552 (when limit (list "--limit" (format "%s" limit)))))))))
554 (defun vc-svn-diff (files &optional oldvers newvers buffer)
555 "Get a difference report using SVN between two revisions of fileset FILES."
556 (and oldvers
557 (not newvers)
558 files
559 (catch 'no
560 (dolist (f files)
561 (or (equal oldvers (vc-working-revision f))
562 (throw 'no nil)))
564 ;; Use nil rather than the current revision because svn handles
565 ;; it better (i.e. locally). Note that if _any_ of the files
566 ;; has a different revision, we fetch the lot, which is
567 ;; obviously sub-optimal.
568 (setq oldvers nil))
569 (let* ((switches
570 (if vc-svn-diff-switches
571 (vc-switches 'SVN 'diff)
572 (list (concat "--diff-cmd=" diff-command) "-x"
573 (mapconcat 'identity (vc-switches nil 'diff) " "))))
574 (async (and (not vc-disable-async-diff)
575 (vc-stay-local-p files 'SVN)
576 (or oldvers newvers)))) ; Svn diffs those locally.
577 (apply 'vc-svn-command buffer
578 (if async 'async 0)
579 files "diff"
580 (append
581 switches
582 (when oldvers
583 (list "-r" (if newvers (concat oldvers ":" newvers)
584 oldvers)))))
585 (if async 1 ; async diff => pessimistic assumption
586 ;; For some reason `svn diff' does not return a useful
587 ;; status w.r.t whether the diff was empty or not.
588 (buffer-size (get-buffer buffer)))))
591 ;;; Tag system
594 (defun vc-svn-create-tag (dir name branchp)
595 "Assign to DIR's current revision a given NAME.
596 If BRANCHP is non-nil, the name is created as a branch (and the current
597 workspace is immediately moved to that new branch).
598 NAME is assumed to be a URL."
599 (vc-svn-command nil 0 dir "copy" name)
600 (when branchp (vc-svn-retrieve-tag dir name nil)))
602 (defun vc-svn-retrieve-tag (dir name _update)
603 "Retrieve a tag at and below DIR.
604 NAME is the name of the tag; if it is empty, do a `svn update'.
605 If UPDATE is non-nil, then update (resynch) any affected buffers.
606 NAME is assumed to be a URL."
607 (vc-svn-command nil 0 dir "switch" name)
608 ;; FIXME: parse the output and obey `update'.
612 ;;; Miscellaneous
615 ;; Subversion makes backups for us, so don't bother.
616 ;; (defun vc-svn-make-version-backups-p (file)
617 ;; "Return non-nil if version backups should be made for FILE."
618 ;; (vc-stay-local-p file 'SVN))
620 (defun vc-svn-check-headers ()
621 "Check if the current file has any headers in it."
622 (save-excursion
623 (goto-char (point-min))
624 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\
625 \\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t)))
629 ;;; Internal functions
632 (defun vc-svn-command (buffer okstatus file-or-list &rest flags)
633 "A wrapper around `vc-do-command' for use in vc-svn.el.
634 The difference to vc-do-command is that this function always invokes `svn',
635 and that it passes `vc-svn-global-switches' to it before FLAGS."
636 (apply 'vc-do-command (or buffer "*vc*") okstatus vc-svn-program file-or-list
637 (if (stringp vc-svn-global-switches)
638 (cons vc-svn-global-switches flags)
639 (append vc-svn-global-switches flags))))
641 (defun vc-svn-repository-hostname (dirname)
642 (with-temp-buffer
643 (let (process-file-side-effects)
644 (vc-svn-command t t dirname "info" "--xml"))
645 (goto-char (point-min))
646 (when (re-search-forward "<url>\\(.*\\)</url>" nil t)
647 ;; This is not a hostname but a URL. This may actually be considered
648 ;; as a feature since it allows vc-svn-stay-local to specify different
649 ;; behavior for different modules on the same server.
650 (match-string 1))))
652 (defun vc-svn-resolve-when-done ()
653 "Call \"svn resolved\" if the conflict markers have been removed."
654 (save-excursion
655 (goto-char (point-min))
656 (unless (re-search-forward "^<<<<<<< " nil t)
657 (vc-svn-command nil 0 buffer-file-name "resolved")
658 ;; Remove the hook so that it is not called multiple times.
659 (remove-hook 'after-save-hook 'vc-svn-resolve-when-done t))))
661 ;; Inspired by vc-arch-find-file-hook.
662 (defun vc-svn-find-file-hook ()
663 (when (eq ?C (vc-file-getprop buffer-file-name 'vc-svn-status))
664 ;; If the file is marked as "conflicted", then we should try and call
665 ;; "svn resolved" when applicable.
666 (if (save-excursion
667 (goto-char (point-min))
668 (re-search-forward "^<<<<<<< " nil t))
669 ;; There are conflict markers.
670 (progn
671 (smerge-start-session)
672 (add-hook 'after-save-hook 'vc-svn-resolve-when-done nil t))
673 ;; There are no conflict markers. This is problematic: maybe it means
674 ;; the conflict has been resolved and we should immediately call "svn
675 ;; resolved", or it means that the file's type does not allow Svn to
676 ;; use conflict markers in which case we don't really know what to do.
677 ;; So let's just punt for now.
678 nil)
679 (message "There are unresolved conflicts in this file")))
681 (defun vc-svn-parse-status (&optional filename)
682 "Parse output of \"svn status\" command in the current buffer.
683 Set file properties accordingly. If FILENAME is non-nil, return its status."
684 (let (multifile file status propstat)
685 (goto-char (point-min))
686 (while (re-search-forward
687 ;; Ignore the files with status X.
688 "^\\(?:\\?\\|[ ACDGIMR!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\)\\) +" nil t)
689 ;; If the username contains spaces, the output format is ambiguous,
690 ;; so don't trust the output's filename unless we have to.
691 (setq file (or (unless multifile filename)
692 (expand-file-name
693 (buffer-substring (point) (line-end-position))))
694 ;; If we are parsing the result of running status on a directory,
695 ;; there could be multiple files in the output.
696 ;; We assume that filename, if supplied, applies to the first
697 ;; listed file (ie, the directory). Bug#15322.
698 multifile t
699 status (char-after (line-beginning-position))
700 ;; Status of the item's properties ([ MC]).
701 propstat (char-after (1+ (line-beginning-position))))
702 (if (eq status ??)
703 (vc-file-setprop file 'vc-state 'unregistered)
704 ;; Use the last-modified revision, so that searching in vc-print-log
705 ;; output works.
706 (vc-file-setprop file 'vc-working-revision (match-string 3))
707 ;; Remember Svn's own status.
708 (vc-file-setprop file 'vc-svn-status status)
709 (vc-file-setprop
710 file 'vc-state
711 (cond
712 ((and (eq status ?\ ) (eq propstat ?\ ))
713 (if (eq (char-after (match-beginning 1)) ?*)
714 'needs-update
715 (vc-file-setprop file 'vc-checkout-time
716 (nth 5 (file-attributes file)))
717 'up-to-date))
718 ((eq status ?A)
719 ;; If the file was actually copied, (match-string 2) is "-".
720 (vc-file-setprop file 'vc-working-revision "0")
721 (vc-file-setprop file 'vc-checkout-time 0)
722 'added)
723 ;; Conflict in contents or properties.
724 ((or (eq status ?C) (eq propstat ?C))
725 (vc-file-setprop file 'vc-state 'conflict))
726 ;; Modified contents or properties.
727 ((or (eq status ?M) (eq propstat ?M))
728 (if (eq (char-after (match-beginning 1)) ?*)
729 'needs-merge
730 'edited))
731 ((eq status ?I)
732 (vc-file-setprop file 'vc-state 'ignored))
733 ((memq status '(?D ?R))
734 (vc-file-setprop file 'vc-state 'removed))
735 (t 'edited)))))
736 (when filename (vc-file-getprop filename 'vc-state))))
738 (defun vc-svn-valid-symbolic-tag-name-p (tag)
739 "Return non-nil if TAG is a valid symbolic tag name."
740 ;; According to the SVN manual, a valid symbolic tag must start with
741 ;; an uppercase or lowercase letter and can contain uppercase and
742 ;; lowercase letters, digits, `-', and `_'.
743 (and (string-match "^[a-zA-Z]" tag)
744 (not (string-match "[^a-z0-9A-Z-_]" tag))))
746 (defun vc-svn-valid-revision-number-p (tag)
747 "Return non-nil if TAG is a valid revision number."
748 (and (string-match "^[0-9]" tag)
749 (not (string-match "[^0-9]" tag))))
751 ;; Support for `svn annotate'
753 (defun vc-svn-annotate-command (file buf &optional rev)
754 (vc-svn-command buf 'async file "annotate" (if rev (concat "-r" rev))))
756 (defun vc-svn-annotate-time-of-rev (rev)
757 ;; Arbitrarily assume 10 commits per day.
758 (/ (string-to-number rev) 10.0))
760 (defvar vc-annotate-parent-rev)
762 (defun vc-svn-annotate-current-time ()
763 (vc-svn-annotate-time-of-rev vc-annotate-parent-rev))
765 (defconst vc-svn-annotate-re "[ \t]*\\([0-9]+\\)[ \t]+[^\t ]+ ")
767 (defun vc-svn-annotate-time ()
768 (when (looking-at vc-svn-annotate-re)
769 (goto-char (match-end 0))
770 (vc-svn-annotate-time-of-rev (match-string 1))))
772 (defun vc-svn-annotate-extract-revision-at-line ()
773 (save-excursion
774 (beginning-of-line)
775 (if (looking-at vc-svn-annotate-re) (match-string 1))))
777 (defun vc-svn-revision-table (files)
778 (let ((vc-svn-revisions '()))
779 (with-current-buffer "*vc*"
780 (vc-svn-command nil 0 files "log" "-q")
781 (goto-char (point-min))
782 (forward-line)
783 (let ((start (point-min))
784 (loglines (buffer-substring-no-properties (point-min)
785 (point-max))))
786 (while (string-match "^r\\([0-9]+\\) " loglines)
787 (push (match-string 1 loglines) vc-svn-revisions)
788 (setq start (+ start (match-end 0)))
789 (setq loglines (buffer-substring-no-properties start (point-max)))))
790 vc-svn-revisions)))
792 (provide 'vc-svn)
794 ;;; vc-svn.el ends here