1 ;;; vc-svn.el --- non-resident support for Subversion version-control
3 ;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
4 ;; Free Software Foundation, Inc.
6 ;; Author: FSF (see vc.el for full credits)
7 ;; Maintainer: Stefan Monnier <monnier@gnu.org>
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/>.
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.
35 ;;; Customization options
38 ;; FIXME there is also svnadmin.
39 (defcustom vc-svn-program
"svn"
40 "Name of the SVN executable."
44 (defcustom vc-svn-global-switches nil
45 "Global switches to pass to any SVN command."
46 :type
'(choice (const :tag
"None" nil
)
47 (string :tag
"Argument String")
48 (repeat :tag
"Argument List"
54 (defcustom vc-svn-register-switches nil
55 "Switches for registering a file into SVN.
56 A string or list of strings passed to the checkin program by
57 \\[vc-register]. If nil, use the value of `vc-register-switches'.
58 If t, use no switches."
59 :type
'(choice (const :tag
"Unspecified" nil
)
61 (string :tag
"Argument String")
62 (repeat :tag
"Argument List" :value
("") string
))
66 (defcustom vc-svn-diff-switches
67 t
;`svn' doesn't support common args like -c or -b.
68 "String or list of strings specifying extra switches for svn diff under VC.
69 If nil, use the value of `vc-diff-switches' (or `diff-switches'),
70 together with \"-x --diff-cmd=diff\" (since svn diff does not
71 support the default \"-c\" value of `diff-switches'). If you
72 want to force an empty list of arguments, use t."
73 :type
'(choice (const :tag
"Unspecified" nil
)
75 (string :tag
"Argument String")
76 (repeat :tag
"Argument List"
82 (defcustom vc-svn-header
(or (cdr (assoc 'SVN vc-header-alist
)) '("\$Id\$"))
83 "Header keywords to be inserted by `vc-insert-headers'."
85 :type
'(repeat string
)
88 ;; We want to autoload it for use by the autoloaded version of
89 ;; vc-svn-registered, but we want the value to be compiled at startup, not
92 (defconst vc-svn-admin-directory
93 (cond ((and (memq system-type
'(cygwin windows-nt ms-dos
))
94 (getenv "SVN_ASP_DOT_NET_HACK"))
97 "The name of the \".svn\" subdirectory or its equivalent.")
99 ;;; Properties of the backend
101 (defun vc-svn-revision-granularity () 'repository
)
102 (defun vc-svn-checkout-model (files) 'implicit
)
105 ;;; State-querying functions
108 ;;; vc-svn-admin-directory is generally not defined when the
109 ;;; autoloaded function is called.
111 ;;;###autoload (defun vc-svn-registered (f)
112 ;;;###autoload (let ((admin-dir (cond ((and (eq system-type 'windows-nt)
113 ;;;###autoload (getenv "SVN_ASP_DOT_NET_HACK"))
114 ;;;###autoload "_svn")
115 ;;;###autoload (t ".svn"))))
116 ;;;###autoload (when (file-readable-p (expand-file-name
117 ;;;###autoload (concat admin-dir "/entries")
118 ;;;###autoload (file-name-directory f)))
119 ;;;###autoload (load "vc-svn")
120 ;;;###autoload (vc-svn-registered f))))
122 (defun vc-svn-registered (file)
123 "Check if FILE is SVN registered."
124 (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory
126 (file-name-directory file
)))
128 (cd (file-name-directory file
))
129 (let* (process-file-side-effects
132 ;; Ignore all errors.
133 (vc-svn-command t t file
"status" "-v")
134 ;; Some problem happened. E.g. We can't find an `svn'
135 ;; executable. We used to only catch `file-error' but when
136 ;; the process is run on a remote host via Tramp, the error
137 ;; is only reported via the exit status which is turned into
138 ;; an `error' by vc-do-command.
141 (let ((parsed (vc-svn-parse-status file
)))
142 (and parsed
(not (memq parsed
'(ignored unregistered
))))))))))
144 (defun vc-svn-state (file &optional localp
)
145 "SVN-specific version of `vc-state'."
146 (let (process-file-side-effects)
147 (setq localp
(or localp
(vc-stay-local-p file
'SVN
)))
149 (cd (file-name-directory file
))
150 (vc-svn-command t
0 file
"status" (if localp
"-v" "-u"))
151 (vc-svn-parse-status file
))))
153 (defun vc-svn-state-heuristic (file)
154 "SVN-specific state heuristic."
155 (vc-svn-state file
'local
))
157 ;; FIXME it would be better not to have the "remote" argument,
158 ;; but to distinguish the two output formats based on content.
159 (defun vc-svn-after-dir-status (callback &optional remote
)
160 (let ((state-map '((?A . added
)
167 ;; This is what vc-svn-parse-status does.
169 (re (if remote
"^\\(.\\)...... \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$"
170 ;; Subexp 2 is a dummy in this case, so the numbers match.
171 "^\\(.\\)....\\(.\\) \\(.*\\)$"))
173 (goto-char (point-min))
174 (while (re-search-forward re nil t
)
175 (let ((state (cdr (assq (aref (match-string 1) 0) state-map
)))
176 (filename (match-string 3)))
177 (and remote
(string-equal (match-string 2) "*")
178 ;; FIXME are there other possible combinations?
179 (cond ((eq state
'edited
) (setq state
'needs-merge
))
180 ((not state
) (setq state
'needs-update
))))
181 (when (and state
(not (string= "." filename
)))
182 (setq result
(cons (list filename state
) result
)))))
183 (funcall callback result
)))
185 (defun vc-svn-dir-status (dir callback
)
186 "Run 'svn status' for DIR and update BUFFER via CALLBACK.
187 CALLBACK is called as (CALLBACK RESULT BUFFER), where
188 RESULT is a list of conses (FILE . STATE) for directory DIR."
189 ;; FIXME should this rather be all the files in dir?
190 ;; FIXME: the vc-stay-local-p logic below is disabled, it ends up
191 ;; calling synchronously (vc-svn-registered DIR) => calling svn status -v DIR
192 ;; which is VERY SLOW for big trees and it makes emacs
193 ;; completely unresponsive during that time.
194 (let* ((local (and nil
(vc-stay-local-p dir
'SVN
)))
195 (remote (or t
(not local
) (eq local
'only-file
))))
196 (vc-svn-command (current-buffer) 'async nil
"status"
199 `(vc-svn-after-dir-status (quote ,callback
) ,remote
))))
201 (defun vc-svn-dir-status-files (dir files default-state callback
)
202 (apply 'vc-svn-command
(current-buffer) 'async nil
"status" files
)
204 `(vc-svn-after-dir-status (quote ,callback
))))
206 (defun vc-svn-dir-extra-headers (dir)
207 "Generate extra status headers for a Subversion working copy."
208 (let (process-file-side-effects)
209 (vc-svn-command "*vc*" 0 nil
"info"))
214 (goto-char (point-min))
215 (re-search-forward "Repository Root: *\\(.*\\)" nil t
))
220 (propertize "Repository : " 'face
'font-lock-type-face
)
221 (propertize repo
'face
'font-lock-variable-name-face
)))
224 (defun vc-svn-working-revision (file)
225 "SVN-specific version of `vc-working-revision'."
226 ;; There is no need to consult RCS headers under SVN, because we
227 ;; get the workfile version for free when we recognize that a file
228 ;; is registered in SVN.
229 (vc-svn-registered file
)
230 (vc-file-getprop file
'vc-working-revision
))
232 ;; vc-svn-mode-line-string doesn't exist because the default implementation
235 (defun vc-svn-previous-revision (file rev
)
236 (let ((newrev (1- (string-to-number rev
))))
238 (number-to-string newrev
))))
240 (defun vc-svn-next-revision (file rev
)
241 (let ((newrev (1+ (string-to-number rev
))))
242 ;; The "working revision" is an uneasy conceptual fit under Subversion;
243 ;; we use it as the upper bound until a better idea comes along. If the
244 ;; workfile version W coincides with the tree's latest revision R, then
245 ;; this check prevents a "no such revision: R+1" error. Otherwise, it
246 ;; inhibits showing of W+1 through R, which could be considered anywhere
247 ;; from gracious to impolite.
248 (unless (< (string-to-number (vc-file-getprop file
'vc-working-revision
))
250 (number-to-string newrev
))))
254 ;;; State-changing functions
257 (defun vc-svn-create-repo ()
258 "Create a new SVN repository."
259 (vc-do-command "*vc*" 0 "svnadmin" '("create" "SVN"))
260 (vc-do-command "*vc*" 0 vc-svn-program
'(".")
261 "checkout" (concat "file://" default-directory
"SVN")))
263 (defun vc-svn-register (files &optional rev comment
)
264 "Register FILES into the SVN version-control system.
265 The COMMENT argument is ignored This does an add but not a commit.
266 Passes either `vc-svn-register-switches' or `vc-register-switches'
268 (apply 'vc-svn-command nil
0 files
"add" (vc-switches 'SVN
'register
)))
270 (defun vc-svn-responsible-p (file)
271 "Return non-nil if SVN thinks it is responsible for FILE."
272 (file-directory-p (expand-file-name vc-svn-admin-directory
273 (if (file-directory-p file
)
275 (file-name-directory file
)))))
277 (defalias 'vc-svn-could-register
'vc-svn-responsible-p
278 "Return non-nil if FILE could be registered in SVN.
279 This is only possible if SVN is responsible for FILE's directory.")
281 (defun vc-svn-checkin (files rev comment
)
282 "SVN-specific version of `vc-backend-checkin'."
283 (if rev
(error "Committing to a specific revision is unsupported in SVN"))
285 'vc-svn-command nil
1 files
"ci"
286 (nconc (list "-m" comment
) (vc-switches 'SVN
'checkin
)))))
288 (goto-char (point-min))
289 (unless (equal status
0)
290 ;; Check checkin problem.
292 ((search-forward "Transaction is out of date" nil t
)
293 (mapc (lambda (file) (vc-file-setprop file
'vc-state
'needs-merge
))
295 (error (substitute-command-keys
296 (concat "Up-to-date check failed: "
297 "type \\[vc-next-action] to merge in changes"))))
299 (pop-to-buffer (current-buffer))
300 (goto-char (point-min))
301 (shrink-window-if-larger-than-buffer)
302 (error "Check-in failed"))))
303 ;; Update file properties
305 ;; file 'vc-working-revision
306 ;; (vc-parse-buffer "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" 2))
309 (defun vc-svn-find-revision (file rev buffer
)
310 "SVN-specific retrieval of a specified version into a buffer."
311 (let (process-file-side-effects)
312 (apply 'vc-svn-command
315 (and rev
(not (string= rev
""))
317 (vc-switches 'SVN
'checkout
))))
319 (defun vc-svn-checkout (file &optional editable rev
)
320 (message "Checking out %s..." file
)
321 (with-current-buffer (or (get-file-buffer file
) (current-buffer))
322 (vc-svn-update file editable rev
(vc-switches 'SVN
'checkout
)))
323 (vc-mode-line file
'SVN
)
324 (message "Checking out %s...done" file
))
326 (defun vc-svn-update (file editable rev switches
)
327 (if (and (file-exists-p file
) (not rev
))
328 ;; If no revision was specified, there's nothing to do.
330 ;; Check out a particular version (or recreate the file).
331 (vc-file-setprop file
'vc-working-revision nil
)
332 (apply 'vc-svn-command nil
0 file
335 ((null rev
) "-rBASE")
336 ((or (eq rev t
) (equal rev
"")) nil
)
337 (t (concat "-r" rev
)))
340 (defun vc-svn-delete-file (file)
341 (vc-svn-command nil
0 file
"remove"))
343 (defun vc-svn-rename-file (old new
)
344 (vc-svn-command nil
0 new
"move" (file-relative-name old
)))
346 (defun vc-svn-revert (file &optional contents-done
)
347 "Revert FILE to the version it was based on."
348 (unless contents-done
349 (vc-svn-command nil
0 file
"revert")))
351 (defun vc-svn-merge (file first-version
&optional second-version
)
352 "Merge changes into current working copy of FILE.
353 The changes are between FIRST-VERSION and SECOND-VERSION."
354 (vc-svn-command nil
0 file
356 "-r" (if second-version
357 (concat first-version
":" second-version
)
359 (vc-file-setprop file
'vc-state
'edited
)
360 (with-current-buffer (get-buffer "*vc*")
361 (goto-char (point-min))
362 (if (looking-at "C ")
364 0))) ; signal success
366 (defun vc-svn-merge-news (file)
367 "Merge in any new changes made to FILE."
368 (message "Merging changes into %s..." file
)
369 ;; (vc-file-setprop file 'vc-working-revision nil)
370 (vc-file-setprop file
'vc-checkout-time
0)
371 (vc-svn-command nil
0 file
"update")
372 ;; Analyze the merge result reported by SVN, and set
373 ;; file properties accordingly.
374 (with-current-buffer (get-buffer "*vc*")
375 (goto-char (point-min))
376 ;; get new working revision
377 (if (re-search-forward
378 "^\\(Updated to\\|At\\) revision \\([0-9]+\\)" nil t
)
379 (vc-file-setprop file
'vc-working-revision
(match-string 2))
380 (vc-file-setprop file
'vc-working-revision nil
))
382 (goto-char (point-min))
384 (if (looking-at "At revision")
385 0 ;; there were no news; indicate success
386 (if (re-search-forward
387 ;; Newer SVN clients have 3 columns of chars (one for the
388 ;; file's contents, then second for its properties, and the
389 ;; third for lock-grabbing info), before the 2 spaces.
390 ;; We also used to match the filename in column 0 without any
391 ;; meta-info before it, but I believe this can never happen.
392 (concat "^\\(\\([ACGDU]\\)\\(.[B ]\\)? \\)"
393 (regexp-quote (file-name-nondirectory file
)))
396 ;; Merge successful, we are in sync with repository now
397 ((string= (match-string 2) "U")
398 (vc-file-setprop file
'vc-state
'up-to-date
)
399 (vc-file-setprop file
'vc-checkout-time
400 (nth 5 (file-attributes file
)))
401 0);; indicate success to the caller
402 ;; Merge successful, but our own changes are still in the file
403 ((string= (match-string 2) "G")
404 (vc-file-setprop file
'vc-state
'edited
)
405 0);; indicate success to the caller
406 ;; Conflicts detected!
408 (vc-file-setprop file
'vc-state
'edited
)
409 1);; signal the error to the caller
411 (pop-to-buffer "*vc*")
412 (error "Couldn't analyze svn update result")))
413 (message "Merging changes into %s...done" file
))))
415 (defun vc-svn-modify-change-comment (files rev comment
)
416 "Modify the change comments for a specified REV.
417 You must have ssh access to the repository host, and the directory Emacs
418 uses locally for temp files must also be writable by you on that host.
419 This is only supported if the repository access method is either file://
421 (let (tempfile host remotefile directory fileurl-p
)
423 (vc-do-command (current-buffer) 0 vc-svn-program nil
"info")
424 (goto-char (point-min))
425 (unless (re-search-forward "Repository Root: \\(file://\\(/.*\\)\\)\\|\\(svn\\+ssh://\\([^/]+\\)\\(/.*\\)\\)" nil t
)
426 (error "Repository information is unavailable"))
430 (setq directory
(match-string 2)))
431 (setq host
(match-string 4))
432 (setq directory
(match-string 5))
433 (setq remotefile
(concat host
":" tempfile
))))
434 (with-temp-file (setq tempfile
(make-temp-file user-mail-address
))
437 ;; Repository Root is a local file.
439 (unless (vc-do-command
440 "*vc*" 0 "svnadmin" nil
441 "setlog" "--bypass-hooks" directory
442 "-r" rev
(format "%s" tempfile
))
443 (error "Log edit failed"))
444 (delete-file tempfile
))
446 ;; Remote repository, using svn+ssh.
447 (unless (vc-do-command "*vc*" 0 "scp" nil
"-q" tempfile remotefile
)
448 (error "Copy of comment to %s failed" remotefile
))
449 (unless (vc-do-command
450 "*vc*" 0 "ssh" nil
"-q" host
451 (format "svnadmin setlog --bypass-hooks %s -r %s %s; rm %s"
452 directory rev tempfile tempfile
))
453 (error "Log edit failed")))))
456 ;;; History functions
459 (defvar log-view-per-file-logs
)
461 (define-derived-mode vc-svn-log-view-mode log-view-mode
"SVN-Log-View"
463 (set (make-local-variable 'log-view-per-file-logs
) nil
))
465 (defun vc-svn-print-log (files buffer
&optional shortlog start-revision limit
)
466 "Get change log(s) associated with FILES."
468 (vc-setup-buffer buffer
)
469 (let ((inhibit-read-only t
))
470 (goto-char (point-min))
473 (insert "Working file: " file
"\n")
478 ;; (if (and (= (length files) 1) (vc-stay-local-p file 'SVN)) 'async 0)
484 (format "-r%s" start-revision
)
485 ;; By default Subversion only shows the log up to the
486 ;; working revision, whereas we also want the log of the
487 ;; subsequent commits. At least that's what the
488 ;; vc-cvs.el code does.
490 (when limit
(list "-l" (format "%s" limit
))))))
491 ;; Dump log for the entire directory.
492 (apply 'vc-svn-command buffer
0 nil
"log"
495 (if start-revision
(format "-r%s" start-revision
) "-rHEAD:0"))
496 (when limit
(list "-l" (format "%s" limit
)))))))))
498 (defun vc-svn-diff (files &optional oldvers newvers buffer
)
499 "Get a difference report using SVN between two revisions of fileset FILES."
505 (or (equal oldvers
(vc-working-revision f
))
508 ;; Use nil rather than the current revision because svn handles
509 ;; it better (i.e. locally). Note that if _any_ of the files
510 ;; has a different revision, we fetch the lot, which is
511 ;; obviously sub-optimal.
514 (if vc-svn-diff-switches
515 (vc-switches 'SVN
'diff
)
516 (list "--diff-cmd=diff" "-x"
517 (mapconcat 'identity
(vc-switches nil
'diff
) " "))))
518 (async (and (not vc-disable-async-diff
)
519 (vc-stay-local-p files
'SVN
)
520 (or oldvers newvers
)))) ; Svn diffs those locally.
521 (apply 'vc-svn-command buffer
527 (list "-r" (if newvers
(concat oldvers
":" newvers
)
529 (if async
1 ; async diff => pessimistic assumption
530 ;; For some reason `svn diff' does not return a useful
531 ;; status w.r.t whether the diff was empty or not.
532 (buffer-size (get-buffer buffer
)))))
538 (defun vc-svn-create-tag (dir name branchp
)
539 "Assign to DIR's current revision a given NAME.
540 If BRANCHP is non-nil, the name is created as a branch (and the current
541 workspace is immediately moved to that new branch).
542 NAME is assumed to be a URL."
543 (vc-svn-command nil
0 dir
"copy" name
)
544 (when branchp
(vc-svn-retrieve-tag dir name nil
)))
546 (defun vc-svn-retrieve-tag (dir name update
)
547 "Retrieve a tag at and below DIR.
548 NAME is the name of the tag; if it is empty, do a `svn update'.
549 If UPDATE is non-nil, then update (resynch) any affected buffers.
550 NAME is assumed to be a URL."
551 (vc-svn-command nil
0 dir
"switch" name
)
552 ;; FIXME: parse the output and obey `update'.
559 ;; Subversion makes backups for us, so don't bother.
560 ;; (defun vc-svn-make-version-backups-p (file)
561 ;; "Return non-nil if version backups should be made for FILE."
562 ;; (vc-stay-local-p file 'SVN))
564 (defun vc-svn-check-headers ()
565 "Check if the current file has any headers in it."
567 (goto-char (point-min))
568 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\
569 \\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t
)))
573 ;;; Internal functions
576 (defun vc-svn-command (buffer okstatus file-or-list
&rest flags
)
577 "A wrapper around `vc-do-command' for use in vc-svn.el.
578 The difference to vc-do-command is that this function always invokes `svn',
579 and that it passes `vc-svn-global-switches' to it before FLAGS."
580 (apply 'vc-do-command
(or buffer
"*vc*") okstatus vc-svn-program file-or-list
581 (if (stringp vc-svn-global-switches
)
582 (cons vc-svn-global-switches flags
)
583 (append vc-svn-global-switches
586 (defun vc-svn-repository-hostname (dirname)
588 (let ((coding-system-for-read
589 (or file-name-coding-system
590 default-file-name-coding-system
)))
591 (vc-insert-file (expand-file-name (concat vc-svn-admin-directory
594 (goto-char (point-min))
595 (when (re-search-forward
596 ;; Old `svn' used name="svn:this_dir", newer use just name="".
597 (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*"
598 "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
599 "url=\"\\(?1:[^\"]+\\)\""
600 ;; Yet newer ones don't use XML any more.
601 "\\|^\ndir\n[0-9]+\n\\(?1:.*\\)") nil t
)
602 ;; This is not a hostname but a URL. This may actually be considered
603 ;; as a feature since it allows vc-svn-stay-local to specify different
604 ;; behavior for different modules on the same server.
607 (defun vc-svn-resolve-when-done ()
608 "Call \"svn resolved\" if the conflict markers have been removed."
610 (goto-char (point-min))
611 (unless (re-search-forward "^<<<<<<< " nil t
)
612 (vc-svn-command nil
0 buffer-file-name
"resolved")
613 ;; Remove the hook so that it is not called multiple times.
614 (remove-hook 'after-save-hook
'vc-svn-resolve-when-done t
))))
616 ;; Inspired by vc-arch-find-file-hook.
617 (defun vc-svn-find-file-hook ()
618 (when (eq ?C
(vc-file-getprop buffer-file-name
'vc-svn-status
))
619 ;; If the file is marked as "conflicted", then we should try and call
620 ;; "svn resolved" when applicable.
622 (goto-char (point-min))
623 (re-search-forward "^<<<<<<< " nil t
))
624 ;; There are conflict markers.
626 (smerge-start-session)
627 (add-hook 'after-save-hook
'vc-svn-resolve-when-done nil t
))
628 ;; There are no conflict markers. This is problematic: maybe it means
629 ;; the conflict has been resolved and we should immediately call "svn
630 ;; resolved", or it means that the file's type does not allow Svn to
631 ;; use conflict markers in which case we don't really know what to do.
632 ;; So let's just punt for now.
634 (message "There are unresolved conflicts in this file")))
636 (defun vc-svn-parse-status (&optional filename
)
637 "Parse output of \"svn status\" command in the current buffer.
638 Set file properties accordingly. Unless FILENAME is non-nil, parse only
639 information about FILENAME and return its status."
641 (goto-char (point-min))
642 (while (re-search-forward
643 ;; Ignore the files with status X.
644 "^\\(?:\\?\\|[ ACDGIMR!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\)\\) +" nil t
)
645 ;; If the username contains spaces, the output format is ambiguous,
646 ;; so don't trust the output's filename unless we have to.
647 (setq file
(or filename
649 (buffer-substring (point) (line-end-position)))))
650 (setq status
(char-after (line-beginning-position)))
652 (vc-file-setprop file
'vc-state
'unregistered
)
653 ;; Use the last-modified revision, so that searching in vc-print-log
655 (vc-file-setprop file
'vc-working-revision
(match-string 3))
656 ;; Remember Svn's own status.
657 (vc-file-setprop file
'vc-svn-status status
)
662 (if (eq (char-after (match-beginning 1)) ?
*)
664 (vc-file-setprop file
'vc-checkout-time
665 (nth 5 (file-attributes file
)))
668 ;; If the file was actually copied, (match-string 2) is "-".
669 (vc-file-setprop file
'vc-working-revision
"0")
670 (vc-file-setprop file
'vc-checkout-time
0)
673 (vc-file-setprop file
'vc-state
'conflict
))
675 (if (eq (char-after (match-beginning 1)) ?
*)
679 (vc-file-setprop file
'vc-state
'ignored
))
680 ((memq status
'(?D ?R
))
681 (vc-file-setprop file
'vc-state
'removed
))
683 (when filename
(vc-file-getprop filename
'vc-state
))))
685 (defun vc-svn-valid-symbolic-tag-name-p (tag)
686 "Return non-nil if TAG is a valid symbolic tag name."
687 ;; According to the SVN manual, a valid symbolic tag must start with
688 ;; an uppercase or lowercase letter and can contain uppercase and
689 ;; lowercase letters, digits, `-', and `_'.
690 (and (string-match "^[a-zA-Z]" tag
)
691 (not (string-match "[^a-z0-9A-Z-_]" tag
))))
693 (defun vc-svn-valid-revision-number-p (tag)
694 "Return non-nil if TAG is a valid revision number."
695 (and (string-match "^[0-9]" tag
)
696 (not (string-match "[^0-9]" tag
))))
698 ;; Support for `svn annotate'
700 (defun vc-svn-annotate-command (file buf
&optional rev
)
701 (vc-svn-command buf
'async file
"annotate" (if rev
(concat "-r" rev
))))
703 (defun vc-svn-annotate-time-of-rev (rev)
704 ;; Arbitrarily assume 10 commmits per day.
705 (/ (string-to-number rev
) 10.0))
707 (defvar vc-annotate-parent-rev
)
709 (defun vc-svn-annotate-current-time ()
710 (vc-svn-annotate-time-of-rev vc-annotate-parent-rev
))
712 (defconst vc-svn-annotate-re
"[ \t]*\\([0-9]+\\)[ \t]+[^\t ]+ ")
714 (defun vc-svn-annotate-time ()
715 (when (looking-at vc-svn-annotate-re
)
716 (goto-char (match-end 0))
717 (vc-svn-annotate-time-of-rev (match-string 1))))
719 (defun vc-svn-annotate-extract-revision-at-line ()
722 (if (looking-at vc-svn-annotate-re
) (match-string 1))))
726 ;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
727 ;;; vc-svn.el ends here