(Glossary): Treat Transient Mark mode as the default.
[bpt/emacs.git] / lisp / vc-svn.el
CommitLineData
1fd3454a
SM
1;;; vc-svn.el --- non-resident support for Subversion version-control
2
409cc4a3 3;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1fd3454a
SM
4
5;; Author: FSF (see vc.el for full credits)
6;; Maintainer: Stefan Monnier <monnier@gnu.org>
7
8;; This file is part of GNU Emacs.
9
10;; GNU Emacs is free software; you can redistribute it and/or modify
11;; it under the terms of the GNU General Public License as published by
b4aa6026 12;; the Free Software Foundation; either version 3, or (at your option)
1fd3454a
SM
13;; any later version.
14
15;; GNU Emacs is distributed in the hope that it will be useful,
16;; but WITHOUT ANY WARRANTY; without even the implied warranty of
17;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18;; GNU General Public License for more details.
19
20;; You should have received a copy of the GNU General Public License
21;; along with GNU Emacs; see the file COPYING. If not, write to the
086add15
LK
22;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
23;; Boston, MA 02110-1301, USA.
1fd3454a
SM
24
25;;; Commentary:
26
f9914e54
ER
27;; Sync'd with Subversion's vc-svn.el as of revision 5801. but this version
28;; has been extensively modified since to handle filesets.
1fd3454a 29
1fd3454a
SM
30;;; Code:
31
32(eval-when-compile
33 (require 'vc))
34
35;;;
36;;; Customization options
37;;;
38
39(defcustom vc-svn-global-switches nil
40 "*Global switches to pass to any SVN command."
41 :type '(choice (const :tag "None" nil)
42 (string :tag "Argument String")
43 (repeat :tag "Argument List"
44 :value ("")
45 string))
bf247b6e 46 :version "22.1"
1fd3454a
SM
47 :group 'vc)
48
49(defcustom vc-svn-register-switches nil
50 "*Extra switches for registering a file into SVN.
51A string or list of strings passed to the checkin program by
52\\[vc-register]."
53 :type '(choice (const :tag "None" nil)
54 (string :tag "Argument String")
55 (repeat :tag "Argument List"
56 :value ("")
57 string))
bf247b6e 58 :version "22.1"
1fd3454a
SM
59 :group 'vc)
60
8462aca5
SM
61(defcustom vc-svn-diff-switches
62 t ;`svn' doesn't support common args like -c or -b.
63 "String or list of strings specifying extra switches for svn diff under VC.
64If nil, use the value of `vc-diff-switches'.
65If you want to force an empty list of arguments, use t."
66 :type '(choice (const :tag "Unspecified" nil)
67 (const :tag "None" t)
1fd3454a
SM
68 (string :tag "Argument String")
69 (repeat :tag "Argument List"
70 :value ("")
71 string))
bf247b6e 72 :version "22.1"
1fd3454a
SM
73 :group 'vc)
74
75(defcustom vc-svn-header (or (cdr (assoc 'SVN vc-header-alist)) '("\$Id\$"))
76 "*Header keywords to be inserted by `vc-insert-headers'."
bf247b6e 77 :version "22.1"
1fd3454a
SM
78 :type '(repeat string)
79 :group 'vc)
80
fc2fb30c
SM
81;; We want to autoload it for use by the autoloaded version of
82;; vc-svn-registered, but we want the value to be compiled at startup, not
83;; at dump time.
84;; ;;;###autoload
85(defconst vc-svn-admin-directory
86 (cond ((and (memq system-type '(cygwin windows-nt ms-dos))
ace2fad9
CY
87 (getenv "SVN_ASP_DOT_NET_HACK"))
88 "_svn")
89 (t ".svn"))
90 "The name of the \".svn\" subdirectory or its equivalent.")
91
8cdd17b4
ER
92;;; Properties of the backend
93
94(defun vc-svn-revision-granularity ()
95 'repository)
1fd3454a
SM
96;;;
97;;; State-querying functions
98;;;
99
ace2fad9
CY
100;;; vc-svn-admin-directory is generally not defined when the
101;;; autoloaded function is called.
102
1fd3454a 103;;;###autoload (defun vc-svn-registered (f)
ace2fad9 104;;;###autoload (let ((admin-dir (cond ((and (eq system-type 'windows-nt)
fc2fb30c
SM
105;;;###autoload (getenv "SVN_ASP_DOT_NET_HACK"))
106;;;###autoload "_svn")
107;;;###autoload (t ".svn"))))
ace2fad9 108;;;###autoload (when (file-readable-p (expand-file-name
fc2fb30c
SM
109;;;###autoload (concat admin-dir "/entries")
110;;;###autoload (file-name-directory f)))
1fd3454a 111;;;###autoload (load "vc-svn")
ace2fad9 112;;;###autoload (vc-svn-registered f))))
1fd3454a 113
3bdc13e4
SM
114;;;###autoload
115(add-to-list 'completion-ignored-extensions ".svn/")
116
1fd3454a
SM
117(defun vc-svn-registered (file)
118 "Check if FILE is SVN registered."
ace2fad9
CY
119 (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory
120 "/entries")
1fd3454a
SM
121 (file-name-directory file)))
122 (with-temp-buffer
123 (cd (file-name-directory file))
aaef169d 124 (let ((status
df4da7f4
SM
125 (condition-case nil
126 ;; Ignore all errors.
127 (vc-svn-command t t file "status" "-v")
128 ;; Some problem happened. E.g. We can't find an `svn'
129 ;; executable. We used to only catch `file-error' but when
130 ;; the process is run on a remote host via Tramp, the error
131 ;; is only reported via the exit status which is turned into
132 ;; an `error' by vc-do-command.
133 (error nil))))
134 (when (eq 0 status)
b5e791bd
DN
135 (let ((parsed (vc-svn-parse-status file)))
136 (and parsed (not (memq parsed '(ignored unregistered))))))))))
1fd3454a
SM
137
138(defun vc-svn-state (file &optional localp)
139 "SVN-specific version of `vc-state'."
7ffc77d3 140 (setq localp (or localp (vc-stay-local-p file)))
1fd3454a
SM
141 (with-temp-buffer
142 (cd (file-name-directory file))
143 (vc-svn-command t 0 file "status" (if localp "-v" "-u"))
bc8c1bb4 144 (vc-svn-parse-status file)))
1fd3454a
SM
145
146(defun vc-svn-state-heuristic (file)
147 "SVN-specific state heuristic."
148 (vc-svn-state file 'local))
149
150(defun vc-svn-dir-state (dir &optional localp)
cdce374a 151 "Find the SVN state of all files in DIR and its subdirectories."
7ffc77d3 152 (setq localp (or localp (vc-stay-local-p dir)))
1fd3454a
SM
153 (let ((default-directory dir))
154 ;; Don't specify DIR in this command, the default-directory is
155 ;; enough. Otherwise it might fail with remote repositories.
156 (with-temp-buffer
18e1f249 157 (buffer-disable-undo) ;; Because these buffers can get huge
1fd3454a 158 (vc-svn-command t 0 nil "status" (if localp "-v" "-u"))
bc8c1bb4 159 (vc-svn-parse-status))))
1fd3454a 160
c222c25f
DN
161(defun vc-svn-after-dir-status (callback buffer)
162 (let ((state-map '((?A . added)
163 (?C . edited)
164 (?D . removed)
165 (?I . ignored)
166 (?M . edited)
167 (?R . removed)
168 (?? . unregistered)
169 ;; This is what vc-svn-parse-status does.
170 (?~ . edited)))
171 result)
172 (goto-char (point-min))
173 (while (re-search-forward "^\\(.\\)..... \\(.*\\)$" nil t)
174 (let ((state (cdr (assq (aref (match-string 1) 0) state-map)))
175 (filename (match-string 2)))
176 (when state
177 (setq result (cons (cons filename state) result)))))
9b7b3814 178 (kill-buffer (current-buffer))
c222c25f
DN
179 (funcall callback result buffer)))
180
181(defun vc-svn-dir-status (dir callback buffer)
182 "Run 'svn status' for DIR and update BUFFER via CALLBACK.
183CALLBACK is called as (CALLBACK RESULT BUFFER), where
184RESULT is a list of conses (FILE . STATE) for directory DIR."
185 (with-current-buffer (get-buffer-create
186 (generate-new-buffer-name " *vc svn status*"))
187 (vc-svn-command (current-buffer) 'async nil "status")
188 (vc-exec-after
751c9f00
DN
189 `(vc-svn-after-dir-status (quote ,callback) ,buffer))
190 (current-buffer)))
f8e89f19 191
ac3f4c6f
ER
192(defun vc-svn-working-revision (file)
193 "SVN-specific version of `vc-working-revision'."
1fd3454a
SM
194 ;; There is no need to consult RCS headers under SVN, because we
195 ;; get the workfile version for free when we recognize that a file
196 ;; is registered in SVN.
197 (vc-svn-registered file)
ac3f4c6f 198 (vc-file-getprop file 'vc-working-revision))
1fd3454a
SM
199
200(defun vc-svn-checkout-model (file)
201 "SVN-specific version of `vc-checkout-model'."
202 ;; It looks like Subversion has no equivalent of CVSREAD.
203 'implicit)
204
5cc7cb96
SM
205;; vc-svn-mode-line-string doesn't exist because the default implementation
206;; works just fine.
207
5b5afd50 208(defun vc-svn-previous-revision (file rev)
cbbd2cd3
TTN
209 (let ((newrev (1- (string-to-number rev))))
210 (when (< 0 newrev)
211 (number-to-string newrev))))
212
5b5afd50 213(defun vc-svn-next-revision (file rev)
cbbd2cd3 214 (let ((newrev (1+ (string-to-number rev))))
5b5afd50 215 ;; The "working revision" is an uneasy conceptual fit under Subversion;
cbbd2cd3
TTN
216 ;; we use it as the upper bound until a better idea comes along. If the
217 ;; workfile version W coincides with the tree's latest revision R, then
218 ;; this check prevents a "no such revision: R+1" error. Otherwise, it
219 ;; inhibits showing of W+1 through R, which could be considered anywhere
220 ;; from gracious to impolite.
ac3f4c6f 221 (unless (< (string-to-number (vc-file-getprop file 'vc-working-revision))
cbbd2cd3
TTN
222 newrev)
223 (number-to-string newrev))))
224
1fd3454a
SM
225
226;;;
227;;; State-changing functions
228;;;
229
8cdd17b4
ER
230(defun vc-svn-create-repo ()
231 "Create a new SVN repository."
232 (vc-do-command nil 0 "svnadmin" '("create" "SVN"))
58db72a4 233 (vc-do-command nil 0 "svn" '(".")
8cdd17b4
ER
234 "checkout" (concat "file://" default-directory "SVN")))
235
236(defun vc-svn-register (files &optional rev comment)
237 "Register FILES into the SVN version-control system.
238The COMMENT argument is ignored This does an add but not a commit.
1fd3454a
SM
239
240`vc-register-switches' and `vc-svn-register-switches' are passed to
241the SVN command (in that order)."
8cdd17b4 242 (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register)))
1fd3454a
SM
243
244(defun vc-svn-responsible-p (file)
245 "Return non-nil if SVN thinks it is responsible for FILE."
ace2fad9 246 (file-directory-p (expand-file-name vc-svn-admin-directory
1fd3454a
SM
247 (if (file-directory-p file)
248 file
249 (file-name-directory file)))))
250
251(defalias 'vc-svn-could-register 'vc-svn-responsible-p
252 "Return non-nil if FILE could be registered in SVN.
253This is only possible if SVN is responsible for FILE's directory.")
254
8cdd17b4 255(defun vc-svn-checkin (files rev comment)
1fd3454a 256 "SVN-specific version of `vc-backend-checkin'."
4ced8551 257 (if rev (error "Committing to a specific revision is unsupported in SVN"))
5129f10c 258 (let ((status (apply
8cdd17b4 259 'vc-svn-command nil 1 files "ci"
5129f10c 260 (nconc (list "-m" comment) (vc-switches 'SVN 'checkin)))))
1fd3454a
SM
261 (set-buffer "*vc*")
262 (goto-char (point-min))
263 (unless (equal status 0)
264 ;; Check checkin problem.
265 (cond
fd140743 266 ((search-forward "Transaction is out of date" nil t)
8cdd17b4
ER
267 (mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge))
268 files)
1fd3454a
SM
269 (error (substitute-command-keys
270 (concat "Up-to-date check failed: "
271 "type \\[vc-next-action] to merge in changes"))))
272 (t
273 (pop-to-buffer (current-buffer))
274 (goto-char (point-min))
275 (shrink-window-if-larger-than-buffer)
276 (error "Check-in failed"))))
277 ;; Update file properties
278 ;; (vc-file-setprop
ac3f4c6f 279 ;; file 'vc-working-revision
1fd3454a
SM
280 ;; (vc-parse-buffer "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" 2))
281 ))
282
ac3f4c6f 283(defun vc-svn-find-revision (file rev buffer)
8cdd17b4 284 "SVN-specific retrieval of a specified version into a buffer."
1fd3454a
SM
285 (apply 'vc-svn-command
286 buffer 0 file
287 "cat"
288 (and rev (not (string= rev ""))
289 (concat "-r" rev))
fd140743 290 (vc-switches 'SVN 'checkout)))
1fd3454a
SM
291
292(defun vc-svn-checkout (file &optional editable rev)
293 (message "Checking out %s..." file)
294 (with-current-buffer (or (get-file-buffer file) (current-buffer))
fd140743 295 (vc-call update file editable rev (vc-switches 'SVN 'checkout)))
1fd3454a
SM
296 (vc-mode-line file)
297 (message "Checking out %s...done" file))
298
299(defun vc-svn-update (file editable rev switches)
300 (if (and (file-exists-p file) (not rev))
fc2fb30c
SM
301 ;; If no revision was specified, there's nothing to do.
302 nil
1fd3454a 303 ;; Check out a particular version (or recreate the file).
ac3f4c6f 304 (vc-file-setprop file 'vc-working-revision nil)
1fd3454a 305 (apply 'vc-svn-command nil 0 file
1fd3454a
SM
306 "update"
307 ;; default for verbose checkout: clear the sticky tag so
308 ;; that the actual update will get the head of the trunk
5cc7cb96
SM
309 (cond
310 ((null rev) "-rBASE")
311 ((or (eq rev t) (equal rev "")) nil)
312 (t (concat "-r" rev)))
1fd3454a
SM
313 switches)))
314
3bdc13e4
SM
315(defun vc-svn-delete-file (file)
316 (vc-svn-command nil 0 file "remove"))
317
2766aaaf
SM
318(defun vc-svn-rename-file (old new)
319 (vc-svn-command nil 0 new "move" (file-relative-name old)))
320
1fd3454a
SM
321(defun vc-svn-revert (file &optional contents-done)
322 "Revert FILE to the version it was based on."
323 (unless contents-done
fc2fb30c 324 (vc-svn-command nil 0 file "revert")))
1fd3454a
SM
325
326(defun vc-svn-merge (file first-version &optional second-version)
327 "Merge changes into current working copy of FILE.
328The changes are between FIRST-VERSION and SECOND-VERSION."
329 (vc-svn-command nil 0 file
c217cb04 330 "merge"
02610d0e 331 "-r" (if second-version
c217cb04
SM
332 (concat first-version ":" second-version)
333 first-version))
1fd3454a
SM
334 (vc-file-setprop file 'vc-state 'edited)
335 (with-current-buffer (get-buffer "*vc*")
336 (goto-char (point-min))
c217cb04
SM
337 (if (looking-at "C ")
338 1 ; signal conflict
1fd3454a
SM
339 0))) ; signal success
340
341(defun vc-svn-merge-news (file)
342 "Merge in any new changes made to FILE."
343 (message "Merging changes into %s..." file)
ac3f4c6f 344 ;; (vc-file-setprop file 'vc-working-revision nil)
1fd3454a
SM
345 (vc-file-setprop file 'vc-checkout-time 0)
346 (vc-svn-command nil 0 file "update")
347 ;; Analyze the merge result reported by SVN, and set
348 ;; file properties accordingly.
349 (with-current-buffer (get-buffer "*vc*")
350 (goto-char (point-min))
5b5afd50 351 ;; get new working revision
1fd3454a 352 (if (re-search-forward
1468d754 353 "^\\(Updated to\\|At\\) revision \\([0-9]+\\)" nil t)
ac3f4c6f
ER
354 (vc-file-setprop file 'vc-working-revision (match-string 2))
355 (vc-file-setprop file 'vc-working-revision nil))
1fd3454a 356 ;; get file status
1468d754 357 (goto-char (point-min))
1fd3454a 358 (prog1
1468d754 359 (if (looking-at "At revision")
1fd3454a
SM
360 0 ;; there were no news; indicate success
361 (if (re-search-forward
459b1fe4
SM
362 ;; Newer SVN clients have 3 columns of chars (one for the
363 ;; file's contents, then second for its properties, and the
364 ;; third for lock-grabbing info), before the 2 spaces.
365 ;; We also used to match the filename in column 0 without any
366 ;; meta-info before it, but I believe this can never happen.
367 (concat "^\\(\\([ACGDU]\\)\\(.[B ]\\)? \\)"
1468d754 368 (regexp-quote (file-name-nondirectory file)))
1fd3454a
SM
369 nil t)
370 (cond
371 ;; Merge successful, we are in sync with repository now
459b1fe4 372 ((string= (match-string 2) "U")
1fd3454a
SM
373 (vc-file-setprop file 'vc-state 'up-to-date)
374 (vc-file-setprop file 'vc-checkout-time
375 (nth 5 (file-attributes file)))
376 0);; indicate success to the caller
377 ;; Merge successful, but our own changes are still in the file
459b1fe4 378 ((string= (match-string 2) "G")
1fd3454a
SM
379 (vc-file-setprop file 'vc-state 'edited)
380 0);; indicate success to the caller
381 ;; Conflicts detected!
382 (t
383 (vc-file-setprop file 'vc-state 'edited)
384 1);; signal the error to the caller
385 )
386 (pop-to-buffer "*vc*")
387 (error "Couldn't analyze svn update result")))
388 (message "Merging changes into %s...done" file))))
389
42a0a135
ER
390(defun vc-svn-modify-change-comment (files rev comment)
391 "Modify the change comments for a specified REV.
392You must have ssh access to the repository host, and the directory Emacs
393uses locally for temp files must also be writeable by you on that host."
394 (vc-do-command nil 0 "svn" nil "info")
395 (set-buffer "*vc*")
396 (goto-char (point-min))
397 (unless (re-search-forward "Repository Root: svn\\+ssh://\\([^/]+\\)\\(/.*\\)" nil t)
398 (error "Repository information is unavailable."))
58db72a4 399 (let* ((tempfile (make-temp-file user-mail-address))
42a0a135
ER
400 (host (match-string 1))
401 (directory (match-string 2))
402 (remotefile (concat host ":" tempfile)))
403 (with-temp-buffer
404 (insert comment)
405 (write-region (point-min) (point-max) tempfile))
406 (unless (vc-do-command nil 0 "scp" nil "-q" tempfile remotefile)
407 (error "Copy of comment to %s failed" remotefile))
58db72a4
TTN
408 (unless (vc-do-command nil 0 "ssh" nil
409 "-q" host
410 (format "svnadmin setlog --bypass-hooks %s -r %s %s; rm %s"
42a0a135
ER
411 directory rev tempfile tempfile))
412 (error "Log edit failed"))
413 ))
1fd3454a
SM
414
415;;;
416;;; History functions
417;;;
418
8cdd17b4
ER
419(defun vc-svn-print-log (files &optional buffer)
420 "Get change log(s) associated with FILES."
1fd3454a 421 (save-current-buffer
b349012b 422 (vc-setup-buffer buffer)
1fd3454a
SM
423 (let ((inhibit-read-only t))
424 (goto-char (point-min))
13b56025
ER
425 (if files
426 (dolist (file files)
427 (insert "Working file: " file "\n")
428 (vc-svn-command
429 buffer
430 'async
431 ;; (if (and (= (length files) 1) (vc-stay-local-p file)) 'async 0)
432 (list file)
433 "log"
434 ;; By default Subversion only shows the log up to the
435 ;; working revision, whereas we also want the log of the
436 ;; subsequent commits. At least that's what the
437 ;; vc-cvs.el code does.
438 "-rHEAD:0"))
439 ;; Dump log for the entire directory.
440 (vc-svn-command buffer 0 nil "log" "-rHEAD:0")))))
8cdd17b4
ER
441
442(defun vc-svn-wash-log ()
443 "Remove all non-comment information from log output."
444 ;; FIXME: not implemented for SVN
445 nil)
446
447(defun vc-svn-diff (files &optional oldvers newvers buffer)
5b5afd50 448 "Get a difference report using SVN between two revisions of fileset FILES."
c62a495a
GM
449 (and oldvers
450 (catch 'no
451 (dolist (f files)
ac3f4c6f 452 (or (equal oldvers (vc-working-revision f))
c62a495a
GM
453 (throw 'no nil)))
454 t)
455 ;; Use nil rather than the current revision because svn handles
456 ;; it better (i.e. locally). Note that if _any_ of the files
457 ;; has a different revision, we fetch the lot, which is
458 ;; obviously sub-optimal.
459 (setq oldvers nil))
8cdd17b4 460 (let* ((switches
f9d1f3be
SM
461 (if vc-svn-diff-switches
462 (vc-switches 'SVN 'diff)
463 (list "-x" (mapconcat 'identity (vc-switches nil 'diff) " "))))
2d4e93b9 464 (async (and (not vc-disable-async-diff)
8cdd17b4 465 (vc-stay-local-p files)
fe1919ab 466 (or oldvers newvers)))) ; Svn diffs those locally.
b349012b 467 (apply 'vc-svn-command buffer
2766aaaf 468 (if async 'async 0)
8cdd17b4 469 files "diff"
2766aaaf 470 (append
f9d1f3be 471 switches
2766aaaf
SM
472 (when oldvers
473 (list "-r" (if newvers (concat oldvers ":" newvers)
474 oldvers)))))
fd140743
SM
475 (if async 1 ; async diff => pessimistic assumption
476 ;; For some reason `svn diff' does not return a useful
477 ;; status w.r.t whether the diff was empty or not.
8cdd17b4 478 (buffer-size (get-buffer buffer)))))
1fd3454a 479
1fd3454a
SM
480;;;
481;;; Snapshot system
482;;;
483
484(defun vc-svn-create-snapshot (dir name branchp)
5b5afd50 485 "Assign to DIR's current revision a given NAME.
1fd3454a 486If BRANCHP is non-nil, the name is created as a branch (and the current
5cc7cb96
SM
487workspace is immediately moved to that new branch).
488NAME is assumed to be a URL."
489 (vc-svn-command nil 0 dir "copy" name)
490 (when branchp (vc-svn-retrieve-snapshot dir name nil)))
1fd3454a
SM
491
492(defun vc-svn-retrieve-snapshot (dir name update)
493 "Retrieve a snapshot at and below DIR.
494NAME is the name of the snapshot; if it is empty, do a `svn update'.
5cc7cb96
SM
495If UPDATE is non-nil, then update (resynch) any affected buffers.
496NAME is assumed to be a URL."
497 (vc-svn-command nil 0 dir "switch" name)
498 ;; FIXME: parse the output and obey `update'.
499 )
1fd3454a
SM
500
501;;;
502;;; Miscellaneous
503;;;
504
505;; Subversion makes backups for us, so don't bother.
7ffc77d3 506;; (defalias 'vc-svn-make-version-backups-p 'vc-stay-local-p
1fd3454a
SM
507;; "Return non-nil if version backups should be made for FILE.")
508
509(defun vc-svn-check-headers ()
510 "Check if the current file has any headers in it."
511 (save-excursion
512 (goto-char (point-min))
513 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\
514\\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t)))
515
516
517;;;
518;;; Internal functions
519;;;
520
e4cc3f57 521(defcustom vc-svn-program "svn"
4ced8551 522 "Name of the SVN executable."
e4cc3f57
SM
523 :type 'string
524 :group 'vc)
525
b038f9fb
TTN
526(defun vc-svn-root (dir)
527 (vc-find-root dir vc-svn-admin-directory t))
528
8cdd17b4 529(defun vc-svn-command (buffer okstatus file-or-list &rest flags)
1fd3454a
SM
530 "A wrapper around `vc-do-command' for use in vc-svn.el.
531The difference to vc-do-command is that this function always invokes `svn',
532and that it passes `vc-svn-global-switches' to it before FLAGS."
8cdd17b4 533 (apply 'vc-do-command buffer okstatus vc-svn-program file-or-list
1fd3454a
SM
534 (if (stringp vc-svn-global-switches)
535 (cons vc-svn-global-switches flags)
536 (append vc-svn-global-switches
537 flags))))
538
7ffc77d3
SM
539(defun vc-svn-repository-hostname (dirname)
540 (with-temp-buffer
541 (let ((coding-system-for-read
542 (or file-name-coding-system
543 default-file-name-coding-system)))
ace2fad9
CY
544 (vc-insert-file (expand-file-name (concat vc-svn-admin-directory
545 "/entries")
546 dirname)))
7ffc77d3
SM
547 (goto-char (point-min))
548 (when (re-search-forward
c45b3be3 549 ;; Old `svn' used name="svn:this_dir", newer use just name="".
17a5a301
SM
550 (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*"
551 "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
0b0dad41
SM
552 "url=\"\\(?1:[^\"]+\\)\""
553 ;; Yet newer ones don't use XML any more.
554 "\\|^\ndir\n[0-9]+\n\\(?1:.*\\)") nil t)
17a5a301
SM
555 ;; This is not a hostname but a URL. This may actually be considered
556 ;; as a feature since it allows vc-svn-stay-local to specify different
557 ;; behavior for different modules on the same server.
558 (match-string 1))))
1fd3454a 559
1c67a814
SM
560(defun vc-svn-resolve-when-done ()
561 "Call \"svn resolved\" if the conflict markers have been removed."
562 (save-excursion
563 (goto-char (point-min))
54648b5c
DN
564 (unless (re-search-forward "^<<<<<<< " nil t)
565 (vc-svn-command nil 0 buffer-file-name "resolved")
566 ;; Remove the hook so that it is not called multiple times.
567 (remove-hook 'after-save-hook 'vc-svn-resolve-when-done t))))
1c67a814
SM
568
569;; Inspired by vc-arch-find-file-hook.
570(defun vc-svn-find-file-hook ()
571 (when (eq ?C (vc-file-getprop buffer-file-name 'vc-svn-status))
572 ;; If the file is marked as "conflicted", then we should try and call
573 ;; "svn resolved" when applicable.
574 (if (save-excursion
575 (goto-char (point-min))
576 (re-search-forward "^<<<<<<< " nil t))
577 ;; There are conflict markers.
578 (progn
28e4e2b4 579 (smerge-start-session)
1c67a814
SM
580 (add-hook 'after-save-hook 'vc-svn-resolve-when-done nil t))
581 ;; There are no conflict markers. This is problematic: maybe it means
582 ;; the conflict has been resolved and we should immediately call "svn
583 ;; resolved", or it means that the file's type does not allow Svn to
584 ;; use conflict markers in which case we don't really know what to do.
585 ;; So let's just punt for now.
586 nil)
587 (message "There are unresolved conflicts in this file")))
588
bc8c1bb4 589(defun vc-svn-parse-status (&optional filename)
1fd3454a 590 "Parse output of \"svn status\" command in the current buffer.
bc8c1bb4
SM
591Set file properties accordingly. Unless FILENAME is non-nil, parse only
592information about FILENAME and return its status."
1fd3454a
SM
593 (let (file status)
594 (goto-char (point-min))
595 (while (re-search-forward
484c1b1f 596 ;; Ignore the files with status X.
abc61762 597 "^\\(\\?\\|[ ACDGIMR!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\)\\) +" nil t)
c45b3be3
SM
598 ;; If the username contains spaces, the output format is ambiguous,
599 ;; so don't trust the output's filename unless we have to.
600 (setq file (or filename
601 (expand-file-name
602 (buffer-substring (point) (line-end-position)))))
1fd3454a 603 (setq status (char-after (line-beginning-position)))
484c1b1f 604 (if (eq status ??)
4f07b9f2 605 (vc-file-setprop file 'vc-state 'unregistered)
bc8c1bb4
SM
606 ;; `vc-BACKEND-registered' must not set vc-backend,
607 ;; which is instead set in vc-registered.
4f07b9f2 608 (unless filename (vc-file-setprop file 'vc-backend 'SVN))
fd140743
SM
609 ;; Use the last-modified revision, so that searching in vc-print-log
610 ;; output works.
4f07b9f2 611 (vc-file-setprop file 'vc-working-revision (match-string 3))
1c67a814 612 ;; Remember Svn's own status.
4f07b9f2
ER
613 (vc-file-setprop file 'vc-svn-status status)
614 (vc-file-setprop
1fd3454a
SM
615 file 'vc-state
616 (cond
617 ((eq status ?\ )
618 (if (eq (char-after (match-beginning 1)) ?*)
619 'needs-patch
4f07b9f2 620 (vc-file-setprop file 'vc-checkout-time
1fd3454a
SM
621 (nth 5 (file-attributes file)))
622 'up-to-date))
623 ((eq status ?A)
fd140743 624 ;; If the file was actually copied, (match-string 2) is "-".
4f07b9f2
ER
625 (vc-file-setprop file 'vc-working-revision "0")
626 (vc-file-setprop file 'vc-checkout-time 0)
484c1b1f 627 'added)
1fd3454a
SM
628 ((memq status '(?M ?C))
629 (if (eq (char-after (match-beginning 1)) ?*)
630 'needs-merge
631 'edited))
722f037f 632 ((eq status ?I)
4f07b9f2 633 (vc-file-setprop file 'vc-state 'ignored))
484c1b1f 634 ((eq status ?R)
4f07b9f2 635 (vc-file-setprop file 'vc-state 'removed))
bc8c1bb4
SM
636 (t 'edited)))))
637 (if filename (vc-file-getprop filename 'vc-state))))
1fd3454a
SM
638
639(defun vc-svn-dir-state-heuristic (dir)
640 "Find the SVN state of all files in DIR, using only local information."
641 (vc-svn-dir-state dir 'local))
642
643(defun vc-svn-valid-symbolic-tag-name-p (tag)
644 "Return non-nil if TAG is a valid symbolic tag name."
645 ;; According to the SVN manual, a valid symbolic tag must start with
646 ;; an uppercase or lowercase letter and can contain uppercase and
647 ;; lowercase letters, digits, `-', and `_'.
648 (and (string-match "^[a-zA-Z]" tag)
649 (not (string-match "[^a-z0-9A-Z-_]" tag))))
650
5b5afd50
ER
651(defun vc-svn-valid-revision-number-p (tag)
652 "Return non-nil if TAG is a valid revision number."
1fd3454a
SM
653 (and (string-match "^[0-9]" tag)
654 (not (string-match "[^0-9]" tag))))
655
17a5a301
SM
656;; Support for `svn annotate'
657
658(defun vc-svn-annotate-command (file buf &optional rev)
659 (vc-svn-command buf 0 file "annotate" (if rev (concat "-r" rev))))
660
661(defun vc-svn-annotate-time-of-rev (rev)
662 ;; Arbitrarily assume 10 commmits per day.
663 (/ (string-to-number rev) 10.0))
664
665(defun vc-svn-annotate-current-time ()
666 (vc-svn-annotate-time-of-rev vc-annotate-parent-rev))
667
668(defconst vc-svn-annotate-re "[ \t]*\\([0-9]+\\)[ \t]+[^\t ]+ ")
669
670(defun vc-svn-annotate-time ()
671 (when (looking-at vc-svn-annotate-re)
672 (goto-char (match-end 0))
673 (vc-svn-annotate-time-of-rev (match-string 1))))
674
675(defun vc-svn-annotate-extract-revision-at-line ()
676 (save-excursion
677 (beginning-of-line)
678 (if (looking-at vc-svn-annotate-re) (match-string 1))))
679
1fd3454a
SM
680(provide 'vc-svn)
681
f9d1f3be 682;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
1fd3454a 683;;; vc-svn.el ends here