vc-svn.el 25.7 KB
Newer Older
Stefan Monnier's avatar
Stefan Monnier committed
1 2
;;; vc-svn.el --- non-resident support for Subversion version-control

3 4
;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
;;   Free Software Foundation, Inc.
Stefan Monnier's avatar
Stefan Monnier committed
5 6 7 8 9 10

;; Author:      FSF (see vc.el for full credits)
;; Maintainer:  Stefan Monnier <monnier@gnu.org>

;; This file is part of GNU Emacs.

11
;; GNU Emacs is free software: you can redistribute it and/or modify
Stefan Monnier's avatar
Stefan Monnier committed
12
;; it under the terms of the GNU General Public License as published by
13 14
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
Stefan Monnier's avatar
Stefan Monnier committed
15 16 17 18 19 20 21

;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;; GNU General Public License for more details.

;; 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/>.
Stefan Monnier's avatar
Stefan Monnier committed
23 24 25

;;; Commentary:

Eric S. Raymond's avatar
Eric S. Raymond committed
26 27
;; Sync'd with Subversion's vc-svn.el as of revision 5801. but this version
;; has been extensively modified since to handle filesets.
Stefan Monnier's avatar
Stefan Monnier committed
28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44

;;; Code:

(eval-when-compile
  (require 'vc))

;;;
;;; Customization options
;;;

(defcustom vc-svn-global-switches nil
  "*Global switches to pass to any SVN command."
  :type '(choice (const :tag "None" nil)
		 (string :tag "Argument String")
		 (repeat :tag "Argument List"
			 :value ("")
			 string))
45
  :version "22.1"
Stefan Monnier's avatar
Stefan Monnier committed
46 47 48 49 50 51 52 53 54 55 56
  :group 'vc)

(defcustom vc-svn-register-switches nil
  "*Extra switches for registering a file into SVN.
A string or list of strings passed to the checkin program by
\\[vc-register]."
  :type '(choice (const :tag "None" nil)
		 (string :tag "Argument String")
		 (repeat :tag "Argument List"
			 :value ("")
			 string))
57
  :version "22.1"
Stefan Monnier's avatar
Stefan Monnier committed
58 59
  :group 'vc)

60 61 62 63 64 65 66
(defcustom vc-svn-diff-switches
  t			   ;`svn' doesn't support common args like -c or -b.
  "String or list of strings specifying extra switches for svn diff under VC.
If nil, use the value of `vc-diff-switches'.
If you want to force an empty list of arguments, use t."
  :type '(choice (const :tag "Unspecified" nil)
		 (const :tag "None" t)
Stefan Monnier's avatar
Stefan Monnier committed
67 68 69 70
		 (string :tag "Argument String")
		 (repeat :tag "Argument List"
			 :value ("")
			 string))
71
  :version "22.1"
Stefan Monnier's avatar
Stefan Monnier committed
72 73 74 75
  :group 'vc)

(defcustom vc-svn-header (or (cdr (assoc 'SVN vc-header-alist)) '("\$Id\$"))
  "*Header keywords to be inserted by `vc-insert-headers'."
76
  :version "22.1"
Stefan Monnier's avatar
Stefan Monnier committed
77 78 79
  :type '(repeat string)
  :group 'vc)

80 81 82 83 84 85
;; We want to autoload it for use by the autoloaded version of
;; vc-svn-registered, but we want the value to be compiled at startup, not
;; at dump time.
;; ;;;###autoload
(defconst vc-svn-admin-directory
  (cond ((and (memq system-type '(cygwin windows-nt ms-dos))
Chong Yidong's avatar
Chong Yidong committed
86 87 88 89 90
	      (getenv "SVN_ASP_DOT_NET_HACK"))
	 "_svn")
	(t ".svn"))
  "The name of the \".svn\" subdirectory or its equivalent.")

91 92
;;; Properties of the backend

93 94 95
(defun vc-svn-revision-granularity () 'repository)
(defun vc-svn-checkout-model (files) 'implicit)

Stefan Monnier's avatar
Stefan Monnier committed
96 97 98 99
;;;
;;; State-querying functions
;;;

Chong Yidong's avatar
Chong Yidong committed
100 101 102
;;; vc-svn-admin-directory is generally not defined when the
;;; autoloaded function is called.

Stefan Monnier's avatar
Stefan Monnier committed
103
;;;###autoload (defun vc-svn-registered (f)
Chong Yidong's avatar
Chong Yidong committed
104
;;;###autoload   (let ((admin-dir (cond ((and (eq system-type 'windows-nt)
105 106 107
;;;###autoload                                (getenv "SVN_ASP_DOT_NET_HACK"))
;;;###autoload                           "_svn")
;;;###autoload                          (t ".svn"))))
Chong Yidong's avatar
Chong Yidong committed
108
;;;###autoload     (when (file-readable-p (expand-file-name
109 110
;;;###autoload                             (concat admin-dir "/entries")
;;;###autoload                             (file-name-directory f)))
Stefan Monnier's avatar
Stefan Monnier committed
111
;;;###autoload       (load "vc-svn")
Chong Yidong's avatar
Chong Yidong committed
112
;;;###autoload       (vc-svn-registered f))))
Stefan Monnier's avatar
Stefan Monnier committed
113

114 115 116
;;;###autoload
(add-to-list 'completion-ignored-extensions ".svn/")

Stefan Monnier's avatar
Stefan Monnier committed
117 118
(defun vc-svn-registered (file)
  "Check if FILE is SVN registered."
Chong Yidong's avatar
Chong Yidong committed
119 120
  (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory
						   "/entries")
Stefan Monnier's avatar
Stefan Monnier committed
121 122 123
					   (file-name-directory file)))
    (with-temp-buffer
      (cd (file-name-directory file))
124
      (let ((status
125 126 127 128 129 130 131 132 133 134
             (condition-case nil
                 ;; Ignore all errors.
                 (vc-svn-command t t file "status" "-v")
               ;; Some problem happened.  E.g. We can't find an `svn'
               ;; executable.  We used to only catch `file-error' but when
               ;; the process is run on a remote host via Tramp, the error
               ;; is only reported via the exit status which is turned into
               ;; an `error' by vc-do-command.
               (error nil))))
        (when (eq 0 status)
135 136
	  (let ((parsed (vc-svn-parse-status file)))
	    (and parsed (not (memq parsed '(ignored unregistered))))))))))
Stefan Monnier's avatar
Stefan Monnier committed
137 138 139

(defun vc-svn-state (file &optional localp)
  "SVN-specific version of `vc-state'."
140
  (setq localp (or localp (vc-stay-local-p file)))
Stefan Monnier's avatar
Stefan Monnier committed
141 142 143
  (with-temp-buffer
    (cd (file-name-directory file))
    (vc-svn-command t 0 file "status" (if localp "-v" "-u"))
144
    (vc-svn-parse-status file)))
Stefan Monnier's avatar
Stefan Monnier committed
145 146 147 148 149

(defun vc-svn-state-heuristic (file)
  "SVN-specific state heuristic."
  (vc-svn-state file 'local))

150 151 152
;; FIXME it would be better not to have the "remote" argument,
;; but to distinguish the two output formats based on content.
(defun vc-svn-after-dir-status (callback &optional remote)
153
  (let ((state-map '((?A . added)
154 155 156 157 158 159 160 161
                     (?C . conflict)
                     (?D . removed)
                     (?I . ignored)
                     (?M . edited)
                     (?R . removed)
                     (?? . unregistered)
                     ;; This is what vc-svn-parse-status does.
                     (?~ . edited)))
162 163 164
	(re (if remote "^\\(.\\)..... \\([ *]\\) +[-0-9]+ +\\(.*\\)$"
	      ;; Subexp 2 is a dummy in this case, so the numbers match.
	      "^\\(.\\)....\\(.\\) \\(.*\\)$"))
165 166
       result)
    (goto-char (point-min))
167
    (while (re-search-forward re nil t)
168
      (let ((state (cdr (assq (aref (match-string 1) 0) state-map)))
169 170 171 172 173
	    (filename (match-string 3)))
	(and remote (string-equal (match-string 2) "*")
	     ;; FIXME are there other possible combinations?
	     (cond ((eq state 'edited) (setq state 'needs-merge))
		   ((not state) (setq state 'needs-update))))
174
       (when state
175
         (setq result (cons (list filename state) result)))))
176
    (funcall callback result)))
177

178
(defun vc-svn-dir-status (dir callback)
179 180 181
  "Run 'svn status' for DIR and update BUFFER via CALLBACK.
CALLBACK is called as (CALLBACK RESULT BUFFER), where
RESULT is a list of conses (FILE . STATE) for directory DIR."
182
  ;; FIXME should this rather be all the files in dir?
183 184
  (let* ((local (vc-stay-local-p dir))
	 (remote (and local (not (eq local 'only-file)))))
185 186
    (vc-svn-command (current-buffer) 'async nil "status"
		    (if remote "-u"))
187
  (vc-exec-after
188
     `(vc-svn-after-dir-status (quote ,callback) ,remote))))
189

190 191 192 193 194
(defun vc-svn-dir-status-files (dir files default-state callback)
  (apply 'vc-svn-command (current-buffer) 'async nil "status" files)
  (vc-exec-after
   `(vc-svn-after-dir-status (quote ,callback))))

195
(defun vc-svn-dir-extra-headers (dir)
196 197 198
  "Generate extra status headers for a Subversion working copy."
  (vc-svn-command "*vc*" 0 nil "info")
  (let ((repo
199
	 (save-excursion
200 201 202 203 204 205 206 207 208 209 210 211
	   (and (progn
		  (set-buffer "*vc*")
		  (goto-char (point-min))
		  (re-search-forward "Repository Root: *\\(.*\\)" nil t))
		(match-string 1)))))
    (concat
     (cond (repo
	    (concat
	     (propertize "Repository : " 'face 'font-lock-type-face)
	     (propertize repo 'face 'font-lock-variable-name-face)))
	   (t "")))))

Eric S. Raymond's avatar
Eric S. Raymond committed
212 213
(defun vc-svn-working-revision (file)
  "SVN-specific version of `vc-working-revision'."
Stefan Monnier's avatar
Stefan Monnier committed
214 215 216 217
  ;; There is no need to consult RCS headers under SVN, because we
  ;; get the workfile version for free when we recognize that a file
  ;; is registered in SVN.
  (vc-svn-registered file)
Eric S. Raymond's avatar
Eric S. Raymond committed
218
  (vc-file-getprop file 'vc-working-revision))
Stefan Monnier's avatar
Stefan Monnier committed
219

220 221 222
;; vc-svn-mode-line-string doesn't exist because the default implementation
;; works just fine.

223
(defun vc-svn-previous-revision (file rev)
224 225 226 227
  (let ((newrev (1- (string-to-number rev))))
    (when (< 0 newrev)
      (number-to-string newrev))))

228
(defun vc-svn-next-revision (file rev)
229
  (let ((newrev (1+ (string-to-number rev))))
230
    ;; The "working revision" is an uneasy conceptual fit under Subversion;
231 232 233 234 235
    ;; we use it as the upper bound until a better idea comes along.  If the
    ;; workfile version W coincides with the tree's latest revision R, then
    ;; this check prevents a "no such revision: R+1" error.  Otherwise, it
    ;; inhibits showing of W+1 through R, which could be considered anywhere
    ;; from gracious to impolite.
Eric S. Raymond's avatar
Eric S. Raymond committed
236
    (unless (< (string-to-number (vc-file-getprop file 'vc-working-revision))
237 238 239
               newrev)
      (number-to-string newrev))))

Stefan Monnier's avatar
Stefan Monnier committed
240 241 242 243 244

;;;
;;; State-changing functions
;;;

245 246
(defun vc-svn-create-repo ()
  "Create a new SVN repository."
247 248
  (vc-do-command "*vc*" 0 "svnadmin" '("create" "SVN"))
  (vc-do-command "*vc*" 0 "svn" '(".")
249 250 251 252 253
		 "checkout" (concat "file://" default-directory "SVN")))

(defun vc-svn-register (files &optional rev comment)
  "Register FILES into the SVN version-control system.
The COMMENT argument is ignored  This does an add but not a commit.
Stefan Monnier's avatar
Stefan Monnier committed
254 255 256

`vc-register-switches' and `vc-svn-register-switches' are passed to
the SVN command (in that order)."
257
  (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register)))
Stefan Monnier's avatar
Stefan Monnier committed
258 259 260

(defun vc-svn-responsible-p (file)
  "Return non-nil if SVN thinks it is responsible for FILE."
Chong Yidong's avatar
Chong Yidong committed
261
  (file-directory-p (expand-file-name vc-svn-admin-directory
Stefan Monnier's avatar
Stefan Monnier committed
262 263 264 265 266 267 268 269
				      (if (file-directory-p file)
					  file
					(file-name-directory file)))))

(defalias 'vc-svn-could-register 'vc-svn-responsible-p
  "Return non-nil if FILE could be registered in SVN.
This is only possible if SVN is responsible for FILE's directory.")

270
(defun vc-svn-checkin (files rev comment)
Stefan Monnier's avatar
Stefan Monnier committed
271
  "SVN-specific version of `vc-backend-checkin'."
272
  (if rev (error "Committing to a specific revision is unsupported in SVN"))
273
  (let ((status (apply
274
                 'vc-svn-command nil 1 files "ci"
275
                 (nconc (list "-m" comment) (vc-switches 'SVN 'checkin)))))
Stefan Monnier's avatar
Stefan Monnier committed
276 277 278 279 280
    (set-buffer "*vc*")
    (goto-char (point-min))
    (unless (equal status 0)
      ;; Check checkin problem.
      (cond
281
       ((search-forward "Transaction is out of date" nil t)
282 283
        (mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge))
	      files)
Stefan Monnier's avatar
Stefan Monnier committed
284 285 286 287 288 289 290 291 292 293
        (error (substitute-command-keys
                (concat "Up-to-date check failed: "
                        "type \\[vc-next-action] to merge in changes"))))
       (t
        (pop-to-buffer (current-buffer))
        (goto-char (point-min))
        (shrink-window-if-larger-than-buffer)
        (error "Check-in failed"))))
    ;; Update file properties
    ;; (vc-file-setprop
Eric S. Raymond's avatar
Eric S. Raymond committed
294
    ;;  file 'vc-working-revision
Stefan Monnier's avatar
Stefan Monnier committed
295 296 297
    ;;  (vc-parse-buffer "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" 2))
    ))

Eric S. Raymond's avatar
Eric S. Raymond committed
298
(defun vc-svn-find-revision (file rev buffer)
299
  "SVN-specific retrieval of a specified version into a buffer."
Stefan Monnier's avatar
Stefan Monnier committed
300 301 302 303 304
  (apply 'vc-svn-command
	 buffer 0 file
	 "cat"
	 (and rev (not (string= rev ""))
	      (concat "-r" rev))
305
	 (vc-switches 'SVN 'checkout)))
Stefan Monnier's avatar
Stefan Monnier committed
306 307 308 309

(defun vc-svn-checkout (file &optional editable rev)
  (message "Checking out %s..." file)
  (with-current-buffer (or (get-file-buffer file) (current-buffer))
310
    (vc-svn-update file editable rev (vc-switches 'SVN 'checkout)))
Stefan Monnier's avatar
Stefan Monnier committed
311 312 313 314 315
  (vc-mode-line file)
  (message "Checking out %s...done" file))

(defun vc-svn-update (file editable rev switches)
  (if (and (file-exists-p file) (not rev))
316 317
      ;; If no revision was specified, there's nothing to do.
      nil
Stefan Monnier's avatar
Stefan Monnier committed
318
    ;; Check out a particular version (or recreate the file).
Eric S. Raymond's avatar
Eric S. Raymond committed
319
    (vc-file-setprop file 'vc-working-revision nil)
Stefan Monnier's avatar
Stefan Monnier committed
320 321
    (apply 'vc-svn-command nil 0 file
	   "update"
322 323 324 325
	   (cond
	    ((null rev) "-rBASE")
	    ((or (eq rev t) (equal rev "")) nil)
	    (t (concat "-r" rev)))
Stefan Monnier's avatar
Stefan Monnier committed
326 327
	   switches)))

328 329 330
(defun vc-svn-delete-file (file)
  (vc-svn-command nil 0 file "remove"))

331 332 333
(defun vc-svn-rename-file (old new)
  (vc-svn-command nil 0 new "move" (file-relative-name old)))

Stefan Monnier's avatar
Stefan Monnier committed
334 335 336
(defun vc-svn-revert (file &optional contents-done)
  "Revert FILE to the version it was based on."
  (unless contents-done
337
    (vc-svn-command nil 0 file "revert")))
Stefan Monnier's avatar
Stefan Monnier committed
338 339 340 341 342

(defun vc-svn-merge (file first-version &optional second-version)
  "Merge changes into current working copy of FILE.
The changes are between FIRST-VERSION and SECOND-VERSION."
  (vc-svn-command nil 0 file
343
                 "merge"
344
		 "-r" (if second-version
345 346
			(concat first-version ":" second-version)
		      first-version))
Stefan Monnier's avatar
Stefan Monnier committed
347 348 349
  (vc-file-setprop file 'vc-state 'edited)
  (with-current-buffer (get-buffer "*vc*")
    (goto-char (point-min))
350 351
    (if (looking-at "C  ")
        1				; signal conflict
Stefan Monnier's avatar
Stefan Monnier committed
352 353 354 355 356
      0)))				; signal success

(defun vc-svn-merge-news (file)
  "Merge in any new changes made to FILE."
  (message "Merging changes into %s..." file)
Eric S. Raymond's avatar
Eric S. Raymond committed
357
  ;; (vc-file-setprop file 'vc-working-revision nil)
Stefan Monnier's avatar
Stefan Monnier committed
358 359 360 361 362 363
  (vc-file-setprop file 'vc-checkout-time 0)
  (vc-svn-command nil 0 file "update")
  ;; Analyze the merge result reported by SVN, and set
  ;; file properties accordingly.
  (with-current-buffer (get-buffer "*vc*")
    (goto-char (point-min))
364
    ;; get new working revision
Stefan Monnier's avatar
Stefan Monnier committed
365
    (if (re-search-forward
366
	 "^\\(Updated to\\|At\\) revision \\([0-9]+\\)" nil t)
Eric S. Raymond's avatar
Eric S. Raymond committed
367 368
	(vc-file-setprop file 'vc-working-revision (match-string 2))
      (vc-file-setprop file 'vc-working-revision nil))
Stefan Monnier's avatar
Stefan Monnier committed
369
    ;; get file status
370
    (goto-char (point-min))
Stefan Monnier's avatar
Stefan Monnier committed
371
    (prog1
372
        (if (looking-at "At revision")
Stefan Monnier's avatar
Stefan Monnier committed
373 374
            0 ;; there were no news; indicate success
          (if (re-search-forward
375 376 377 378 379 380
               ;; Newer SVN clients have 3 columns of chars (one for the
               ;; file's contents, then second for its properties, and the
               ;; third for lock-grabbing info), before the 2 spaces.
               ;; We also used to match the filename in column 0 without any
               ;; meta-info before it, but I believe this can never happen.
               (concat "^\\(\\([ACGDU]\\)\\(.[B ]\\)?  \\)"
381
                       (regexp-quote (file-name-nondirectory file)))
Stefan Monnier's avatar
Stefan Monnier committed
382 383 384
               nil t)
              (cond
               ;; Merge successful, we are in sync with repository now
385
               ((string= (match-string 2) "U")
Stefan Monnier's avatar
Stefan Monnier committed
386 387 388 389 390
                (vc-file-setprop file 'vc-state 'up-to-date)
                (vc-file-setprop file 'vc-checkout-time
                                 (nth 5 (file-attributes file)))
                0);; indicate success to the caller
               ;; Merge successful, but our own changes are still in the file
391
               ((string= (match-string 2) "G")
Stefan Monnier's avatar
Stefan Monnier committed
392 393 394 395 396 397 398 399 400 401 402
                (vc-file-setprop file 'vc-state 'edited)
                0);; indicate success to the caller
               ;; Conflicts detected!
               (t
                (vc-file-setprop file 'vc-state 'edited)
                1);; signal the error to the caller
               )
            (pop-to-buffer "*vc*")
            (error "Couldn't analyze svn update result")))
      (message "Merging changes into %s...done" file))))

403 404 405
(defun vc-svn-modify-change-comment (files rev comment)
  "Modify the change comments for a specified REV.
You must have ssh access to the repository host, and the directory Emacs
406 407 408 409
uses locally for temp files must also be writeable by you on that host.
This is only supported if the repository access method is either file://
or svn+ssh://."
  (let (tempfile host remotefile directory fileurl-p)
410
    (with-temp-buffer
411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427
      (vc-do-command (current-buffer) 0 "svn" nil "info")
      (goto-char (point-min))
      (unless (re-search-forward "Repository Root: \\(file://\\(/.*\\)\\)\\|\\(svn\\+ssh://\\([^/]+\\)\\(/.*\\)\\)" nil t)
	(error "Repository information is unavailable"))
      (if (match-string 1)
	  (progn
	    (setq fileurl-p t)
	    (setq directory (match-string 2)))
	(setq host (match-string 4))
	(setq directory (match-string 5))
	(setq remotefile (concat host ":" tempfile))))
    (with-temp-file (setq tempfile (make-temp-file user-mail-address))
      (insert comment))
    (if fileurl-p
	;; Repository Root is a local file.
	(progn
	  (unless (vc-do-command
428
		   "*vc*" 0 "svnadmin" nil
429
		   "setlog" "--bypass-hooks" directory
430 431 432 433 434
		   "-r" rev (format "%s" tempfile))
	    (error "Log edit failed"))
	  (delete-file tempfile))

      ;; Remote repository, using svn+ssh.
435
      (unless (vc-do-command "*vc*" 0 "scp" nil "-q" tempfile remotefile)
436 437
	(error "Copy of comment to %s failed" remotefile))
      (unless (vc-do-command
438
	       "*vc*" 0 "ssh" nil "-q" host
439 440 441
	       (format "svnadmin setlog --bypass-hooks %s -r %s %s; rm %s"
		       directory rev tempfile tempfile))
	(error "Log edit failed")))))
Stefan Monnier's avatar
Stefan Monnier committed
442 443 444 445 446

;;;
;;; History functions
;;;

447 448
(defvar log-view-per-file-logs)

449 450 451 452
(define-derived-mode vc-svn-log-view-mode log-view-mode "SVN-Log-View"
  (require 'add-log)
  (set (make-local-variable 'log-view-per-file-logs) nil))

453 454
(defun vc-svn-print-log (files &optional buffer)
  "Get change log(s) associated with FILES."
Stefan Monnier's avatar
Stefan Monnier committed
455
  (save-current-buffer
456
    (vc-setup-buffer buffer)
Stefan Monnier's avatar
Stefan Monnier committed
457 458
    (let ((inhibit-read-only t))
      (goto-char (point-min))
Eric S. Raymond's avatar
Eric S. Raymond committed
459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474
      (if files
	  (dolist (file files)
		  (insert "Working file: " file "\n")
		  (vc-svn-command
		   buffer
		   'async
		   ;; (if (and (= (length files) 1) (vc-stay-local-p file)) 'async 0)
		   (list file)
		   "log"
		   ;; By default Subversion only shows the log up to the
		   ;; working revision, whereas we also want the log of the
		   ;; subsequent commits.  At least that's what the
		   ;; vc-cvs.el code does.
		   "-rHEAD:0"))
	;; Dump log for the entire directory.
	(vc-svn-command buffer 0 nil "log" "-rHEAD:0")))))
475 476

(defun vc-svn-diff (files &optional oldvers newvers buffer)
477
  "Get a difference report using SVN between two revisions of fileset FILES."
478
  (and oldvers
479
       files
480 481
       (catch 'no
	 (dolist (f files)
Eric S. Raymond's avatar
Eric S. Raymond committed
482
	   (or (equal oldvers (vc-working-revision f))
483 484 485 486 487 488 489
	       (throw 'no nil)))
	 t)
       ;; Use nil rather than the current revision because svn handles
       ;; it better (i.e. locally).  Note that if _any_ of the files
       ;; has a different revision, we fetch the lot, which is
       ;; obviously sub-optimal.
       (setq oldvers nil))
490
  (let* ((switches
491 492 493
	    (if vc-svn-diff-switches
		(vc-switches 'SVN 'diff)
	      (list "-x" (mapconcat 'identity (vc-switches nil 'diff) " "))))
494
	   (async (and (not vc-disable-async-diff)
495
                       (vc-stay-local-p files)
496
		       (or oldvers newvers)))) ; Svn diffs those locally.
497
      (apply 'vc-svn-command buffer
498
	     (if async 'async 0)
499
	     files "diff"
500
	     (append
501
	      switches
502 503 504
	      (when oldvers
		(list "-r" (if newvers (concat oldvers ":" newvers)
			     oldvers)))))
505 506 507
      (if async 1		      ; async diff => pessimistic assumption
	;; For some reason `svn diff' does not return a useful
	;; status w.r.t whether the diff was empty or not.
508
	(buffer-size (get-buffer buffer)))))
Stefan Monnier's avatar
Stefan Monnier committed
509 510

;;;
511
;;; Tag system
Stefan Monnier's avatar
Stefan Monnier committed
512 513
;;;

514
(defun vc-svn-create-tag (dir name branchp)
515
  "Assign to DIR's current revision a given NAME.
Stefan Monnier's avatar
Stefan Monnier committed
516
If BRANCHP is non-nil, the name is created as a branch (and the current
517 518 519
workspace is immediately moved to that new branch).
NAME is assumed to be a URL."
  (vc-svn-command nil 0 dir "copy" name)
520
  (when branchp (vc-svn-retrieve-tag dir name nil)))
Stefan Monnier's avatar
Stefan Monnier committed
521

522 523 524
(defun vc-svn-retrieve-tag (dir name update)
  "Retrieve a tag at and below DIR.
NAME is the name of the tag; if it is empty, do a `svn update'.
525 526 527 528 529
If UPDATE is non-nil, then update (resynch) any affected buffers.
NAME is assumed to be a URL."
  (vc-svn-command nil 0 dir "switch" name)
  ;; FIXME: parse the output and obey `update'.
  )
Stefan Monnier's avatar
Stefan Monnier committed
530 531 532 533 534 535

;;;
;;; Miscellaneous
;;;

;; Subversion makes backups for us, so don't bother.
536
;; (defalias 'vc-svn-make-version-backups-p 'vc-stay-local-p
Stefan Monnier's avatar
Stefan Monnier committed
537 538 539 540 541 542 543 544 545 546 547 548 549 550
;;   "Return non-nil if version backups should be made for FILE.")

(defun vc-svn-check-headers ()
  "Check if the current file has any headers in it."
  (save-excursion
    (goto-char (point-min))
    (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\
\\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t)))


;;;
;;; Internal functions
;;;

Stefan Monnier's avatar
Stefan Monnier committed
551
(defcustom vc-svn-program "svn"
552
  "Name of the SVN executable."
Stefan Monnier's avatar
Stefan Monnier committed
553 554 555
  :type 'string
  :group 'vc)

556
(defun vc-svn-command (buffer okstatus file-or-list &rest flags)
Stefan Monnier's avatar
Stefan Monnier committed
557 558 559
  "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."
560
  (apply 'vc-do-command (or buffer "*vc*") okstatus vc-svn-program file-or-list
Stefan Monnier's avatar
Stefan Monnier committed
561 562 563 564 565
         (if (stringp vc-svn-global-switches)
             (cons vc-svn-global-switches flags)
           (append vc-svn-global-switches
                   flags))))

566 567 568 569 570
(defun vc-svn-repository-hostname (dirname)
  (with-temp-buffer
    (let ((coding-system-for-read
	   (or file-name-coding-system
	       default-file-name-coding-system)))
Chong Yidong's avatar
Chong Yidong committed
571 572 573
      (vc-insert-file (expand-file-name (concat vc-svn-admin-directory
						"/entries")
					dirname)))
574 575
    (goto-char (point-min))
    (when (re-search-forward
576
	   ;; Old `svn' used name="svn:this_dir", newer use just name="".
577 578
	   (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*"
		   "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
579 580 581
		   "url=\"\\(?1:[^\"]+\\)\""
                   ;; Yet newer ones don't use XML any more.
                   "\\|^\ndir\n[0-9]+\n\\(?1:.*\\)") nil t)
582 583 584 585
      ;; This is not a hostname but a URL.  This may actually be considered
      ;; as a feature since it allows vc-svn-stay-local to specify different
      ;; behavior for different modules on the same server.
      (match-string 1))))
Stefan Monnier's avatar
Stefan Monnier committed
586

587 588 589 590
(defun vc-svn-resolve-when-done ()
  "Call \"svn resolved\" if the conflict markers have been removed."
  (save-excursion
    (goto-char (point-min))
591 592 593 594
    (unless (re-search-forward "^<<<<<<< " nil t)
      (vc-svn-command nil 0 buffer-file-name "resolved")
      ;; Remove the hook so that it is not called multiple times.
      (remove-hook 'after-save-hook 'vc-svn-resolve-when-done t))))
595 596 597 598 599 600 601 602 603 604 605

;; Inspired by vc-arch-find-file-hook.
(defun vc-svn-find-file-hook ()
  (when (eq ?C (vc-file-getprop buffer-file-name 'vc-svn-status))
    ;; If the file is marked as "conflicted", then we should try and call
    ;; "svn resolved" when applicable.
    (if (save-excursion
          (goto-char (point-min))
          (re-search-forward "^<<<<<<< " nil t))
        ;; There are conflict markers.
        (progn
606
          (smerge-start-session)
607 608 609 610 611 612 613 614 615
          (add-hook 'after-save-hook 'vc-svn-resolve-when-done nil t))
      ;; There are no conflict markers.  This is problematic: maybe it means
      ;; the conflict has been resolved and we should immediately call "svn
      ;; resolved", or it means that the file's type does not allow Svn to
      ;; use conflict markers in which case we don't really know what to do.
      ;; So let's just punt for now.
      nil)
    (message "There are unresolved conflicts in this file")))

616
(defun vc-svn-parse-status (&optional filename)
Stefan Monnier's avatar
Stefan Monnier committed
617
  "Parse output of \"svn status\" command in the current buffer.
618 619
Set file properties accordingly.  Unless FILENAME is non-nil, parse only
information about FILENAME and return its status."
Stefan Monnier's avatar
Stefan Monnier committed
620 621 622
  (let (file status)
    (goto-char (point-min))
    (while (re-search-forward
623
            ;; Ignore the files with status X.
624
	    "^\\(?:\\?\\|[ ACDGIMR!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\)\\) +" nil t)
625 626 627 628 629
      ;; If the username contains spaces, the output format is ambiguous,
      ;; so don't trust the output's filename unless we have to.
      (setq file (or filename
                     (expand-file-name
                      (buffer-substring (point) (line-end-position)))))
Stefan Monnier's avatar
Stefan Monnier committed
630
      (setq status (char-after (line-beginning-position)))
631
      (if (eq status ??)
Eric S. Raymond's avatar
Eric S. Raymond committed
632
	  (vc-file-setprop file 'vc-state 'unregistered)
633 634
	;; Use the last-modified revision, so that searching in vc-print-log
	;; output works.
Eric S. Raymond's avatar
Eric S. Raymond committed
635
	(vc-file-setprop file 'vc-working-revision (match-string 3))
636
        ;; Remember Svn's own status.
Eric S. Raymond's avatar
Eric S. Raymond committed
637 638
        (vc-file-setprop file 'vc-svn-status status)
	(vc-file-setprop
Stefan Monnier's avatar
Stefan Monnier committed
639 640 641 642
	 file 'vc-state
	 (cond
	  ((eq status ?\ )
	   (if (eq (char-after (match-beginning 1)) ?*)
643
	       'needs-update
Eric S. Raymond's avatar
Eric S. Raymond committed
644
             (vc-file-setprop file 'vc-checkout-time
Stefan Monnier's avatar
Stefan Monnier committed
645 646 647
                              (nth 5 (file-attributes file)))
	     'up-to-date))
	  ((eq status ?A)
648
	   ;; If the file was actually copied, (match-string 2) is "-".
Eric S. Raymond's avatar
Eric S. Raymond committed
649 650
	   (vc-file-setprop file 'vc-working-revision "0")
	   (vc-file-setprop file 'vc-checkout-time 0)
651
	   'added)
652 653 654
	  ((eq status ?C)
	   (vc-file-setprop file 'vc-state 'conflict))
	  ((eq status '?M)
Stefan Monnier's avatar
Stefan Monnier committed
655 656 657
	   (if (eq (char-after (match-beginning 1)) ?*)
	       'needs-merge
	     'edited))
658
	  ((eq status ?I)
Eric S. Raymond's avatar
Eric S. Raymond committed
659
	   (vc-file-setprop file 'vc-state 'ignored))
660
	  ((eq status ?R)
Eric S. Raymond's avatar
Eric S. Raymond committed
661
	   (vc-file-setprop file 'vc-state 'removed))
662
	  (t 'edited)))))
663
    (when filename (vc-file-getprop filename 'vc-state))))
Stefan Monnier's avatar
Stefan Monnier committed
664 665 666 667 668 669 670 671 672

(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
  ;; an uppercase or lowercase letter and can contain uppercase and
  ;; lowercase letters, digits, `-', and `_'.
  (and (string-match "^[a-zA-Z]" tag)
       (not (string-match "[^a-z0-9A-Z-_]" tag))))

673 674
(defun vc-svn-valid-revision-number-p (tag)
  "Return non-nil if TAG is a valid revision number."
Stefan Monnier's avatar
Stefan Monnier committed
675 676 677
  (and (string-match "^[0-9]" tag)
       (not (string-match "[^0-9]" tag))))

678 679 680 681 682 683 684 685 686
;; Support for `svn annotate'

(defun vc-svn-annotate-command (file buf &optional rev)
  (vc-svn-command buf 0 file "annotate" (if rev (concat "-r" rev))))

(defun vc-svn-annotate-time-of-rev (rev)
  ;; Arbitrarily assume 10 commmits per day.
  (/ (string-to-number rev) 10.0))

687 688
(defvar vc-annotate-parent-rev)

689 690 691 692 693 694 695 696 697 698 699 700 701 702 703
(defun vc-svn-annotate-current-time ()
  (vc-svn-annotate-time-of-rev vc-annotate-parent-rev))

(defconst vc-svn-annotate-re "[ \t]*\\([0-9]+\\)[ \t]+[^\t ]+ ")

(defun vc-svn-annotate-time ()
  (when (looking-at vc-svn-annotate-re)
    (goto-char (match-end 0))
    (vc-svn-annotate-time-of-rev (match-string 1))))

(defun vc-svn-annotate-extract-revision-at-line ()
  (save-excursion
    (beginning-of-line)
    (if (looking-at vc-svn-annotate-re) (match-string 1))))

Stefan Monnier's avatar
Stefan Monnier committed
704 705
(provide 'vc-svn)

706
;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
Stefan Monnier's avatar
Stefan Monnier committed
707
;;; vc-svn.el ends here