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

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

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

;; This file is part of GNU Emacs.

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

;; 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
21
;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
Stefan Monnier's avatar
Stefan Monnier committed
22 23 24

;;; Commentary:

Eric S. Raymond's avatar
Eric S. Raymond committed
25 26
;; 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
27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43

;;; 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))
44
  :version "22.1"
Stefan Monnier's avatar
Stefan Monnier committed
45 46 47 48 49 50 51 52 53 54 55
  :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))
56
  :version "22.1"
Stefan Monnier's avatar
Stefan Monnier committed
57 58
  :group 'vc)

59 60 61 62 63 64 65
(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
66 67 68 69
		 (string :tag "Argument String")
		 (repeat :tag "Argument List"
			 :value ("")
			 string))
70
  :version "22.1"
Stefan Monnier's avatar
Stefan Monnier committed
71 72 73 74
  :group 'vc)

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

79 80 81 82 83 84
;; 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
85 86 87 88 89
	      (getenv "SVN_ASP_DOT_NET_HACK"))
	 "_svn")
	(t ".svn"))
  "The name of the \".svn\" subdirectory or its equivalent.")

90 91
;;; Properties of the backend

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

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

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

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

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

Stefan Monnier's avatar
Stefan Monnier committed
116 117
(defun vc-svn-registered (file)
  "Check if FILE is SVN registered."
Chong Yidong's avatar
Chong Yidong committed
118 119
  (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory
						   "/entries")
Stefan Monnier's avatar
Stefan Monnier committed
120 121 122
					   (file-name-directory file)))
    (with-temp-buffer
      (cd (file-name-directory file))
123
      (let ((status
124 125 126 127 128 129 130 131 132 133
             (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)
134 135
	  (let ((parsed (vc-svn-parse-status file)))
	    (and parsed (not (memq parsed '(ignored unregistered))))))))))
Stefan Monnier's avatar
Stefan Monnier committed
136 137 138

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

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

149
(defun vc-svn-after-dir-status (callback)
150
  (let ((state-map '((?A . added)
151 152 153 154 155 156 157 158
                     (?C . conflict)
                     (?D . removed)
                     (?I . ignored)
                     (?M . edited)
                     (?R . removed)
                     (?? . unregistered)
                     ;; This is what vc-svn-parse-status does.
                     (?~ . edited)))
159 160 161 162 163 164
       result)
    (goto-char (point-min))
    (while (re-search-forward "^\\(.\\)..... \\(.*\\)$" nil t)
      (let ((state (cdr (assq (aref (match-string 1) 0) state-map)))
           (filename (match-string 2)))
       (when state
165
         (setq result (cons (list filename state) result)))))
166
    (funcall callback result)))
167

168
(defun vc-svn-dir-status (dir callback)
169 170 171
  "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."
172 173
  (vc-svn-command (current-buffer) 'async nil "status")
  (vc-exec-after
174
   `(vc-svn-after-dir-status (quote ,callback))))
175

176 177 178 179
(defun vc-svn-status-extra-headers (dir)
  "Generate extra status headers for a Subversion working copy."
  (vc-svn-command "*vc*" 0 nil "info")
  (let ((repo
180
	 (save-excursion
181 182 183 184 185 186 187 188 189 190 191 192
	   (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
193 194
(defun vc-svn-working-revision (file)
  "SVN-specific version of `vc-working-revision'."
Stefan Monnier's avatar
Stefan Monnier committed
195 196 197 198
  ;; 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
199
  (vc-file-getprop file 'vc-working-revision))
Stefan Monnier's avatar
Stefan Monnier committed
200

201 202 203
;; vc-svn-mode-line-string doesn't exist because the default implementation
;; works just fine.

204
(defun vc-svn-previous-revision (file rev)
205 206 207 208
  (let ((newrev (1- (string-to-number rev))))
    (when (< 0 newrev)
      (number-to-string newrev))))

209
(defun vc-svn-next-revision (file rev)
210
  (let ((newrev (1+ (string-to-number rev))))
211
    ;; The "working revision" is an uneasy conceptual fit under Subversion;
212 213 214 215 216
    ;; 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
217
    (unless (< (string-to-number (vc-file-getprop file 'vc-working-revision))
218 219 220
               newrev)
      (number-to-string newrev))))

Stefan Monnier's avatar
Stefan Monnier committed
221 222 223 224 225

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

226 227
(defun vc-svn-create-repo ()
  "Create a new SVN repository."
228 229
  (vc-do-command "*vc*" 0 "svnadmin" '("create" "SVN"))
  (vc-do-command "*vc*" 0 "svn" '(".")
230 231 232 233 234
		 "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
235 236 237

`vc-register-switches' and `vc-svn-register-switches' are passed to
the SVN command (in that order)."
238
  (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register)))
Stefan Monnier's avatar
Stefan Monnier committed
239 240 241

(defun vc-svn-responsible-p (file)
  "Return non-nil if SVN thinks it is responsible for FILE."
Chong Yidong's avatar
Chong Yidong committed
242
  (file-directory-p (expand-file-name vc-svn-admin-directory
Stefan Monnier's avatar
Stefan Monnier committed
243 244 245 246 247 248 249 250
				      (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.")

251
(defun vc-svn-checkin (files rev comment)
Stefan Monnier's avatar
Stefan Monnier committed
252
  "SVN-specific version of `vc-backend-checkin'."
253
  (if rev (error "Committing to a specific revision is unsupported in SVN"))
254
  (let ((status (apply
255
                 'vc-svn-command nil 1 files "ci"
256
                 (nconc (list "-m" comment) (vc-switches 'SVN 'checkin)))))
Stefan Monnier's avatar
Stefan Monnier committed
257 258 259 260 261
    (set-buffer "*vc*")
    (goto-char (point-min))
    (unless (equal status 0)
      ;; Check checkin problem.
      (cond
262
       ((search-forward "Transaction is out of date" nil t)
263 264
        (mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge))
	      files)
Stefan Monnier's avatar
Stefan Monnier committed
265 266 267 268 269 270 271 272 273 274
        (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
275
    ;;  file 'vc-working-revision
Stefan Monnier's avatar
Stefan Monnier committed
276 277 278
    ;;  (vc-parse-buffer "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" 2))
    ))

Eric S. Raymond's avatar
Eric S. Raymond committed
279
(defun vc-svn-find-revision (file rev buffer)
280
  "SVN-specific retrieval of a specified version into a buffer."
Stefan Monnier's avatar
Stefan Monnier committed
281 282 283 284 285
  (apply 'vc-svn-command
	 buffer 0 file
	 "cat"
	 (and rev (not (string= rev ""))
	      (concat "-r" rev))
286
	 (vc-switches 'SVN 'checkout)))
Stefan Monnier's avatar
Stefan Monnier committed
287 288 289 290

(defun vc-svn-checkout (file &optional editable rev)
  (message "Checking out %s..." file)
  (with-current-buffer (or (get-file-buffer file) (current-buffer))
291
    (vc-svn-update file editable rev (vc-switches 'SVN 'checkout)))
Stefan Monnier's avatar
Stefan Monnier committed
292 293 294 295 296
  (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))
297 298
      ;; If no revision was specified, there's nothing to do.
      nil
Stefan Monnier's avatar
Stefan Monnier committed
299
    ;; Check out a particular version (or recreate the file).
Eric S. Raymond's avatar
Eric S. Raymond committed
300
    (vc-file-setprop file 'vc-working-revision nil)
Stefan Monnier's avatar
Stefan Monnier committed
301 302
    (apply 'vc-svn-command nil 0 file
	   "update"
303 304 305 306
	   (cond
	    ((null rev) "-rBASE")
	    ((or (eq rev t) (equal rev "")) nil)
	    (t (concat "-r" rev)))
Stefan Monnier's avatar
Stefan Monnier committed
307 308
	   switches)))

309 310 311
(defun vc-svn-delete-file (file)
  (vc-svn-command nil 0 file "remove"))

312 313 314
(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
315 316 317
(defun vc-svn-revert (file &optional contents-done)
  "Revert FILE to the version it was based on."
  (unless contents-done
318
    (vc-svn-command nil 0 file "revert")))
Stefan Monnier's avatar
Stefan Monnier committed
319 320 321 322 323

(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
324
                 "merge"
325
		 "-r" (if second-version
326 327
			(concat first-version ":" second-version)
		      first-version))
Stefan Monnier's avatar
Stefan Monnier committed
328 329 330
  (vc-file-setprop file 'vc-state 'edited)
  (with-current-buffer (get-buffer "*vc*")
    (goto-char (point-min))
331 332
    (if (looking-at "C  ")
        1				; signal conflict
Stefan Monnier's avatar
Stefan Monnier committed
333 334 335 336 337
      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
338
  ;; (vc-file-setprop file 'vc-working-revision nil)
Stefan Monnier's avatar
Stefan Monnier committed
339 340 341 342 343 344
  (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))
345
    ;; get new working revision
Stefan Monnier's avatar
Stefan Monnier committed
346
    (if (re-search-forward
347
	 "^\\(Updated to\\|At\\) revision \\([0-9]+\\)" nil t)
Eric S. Raymond's avatar
Eric S. Raymond committed
348 349
	(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
350
    ;; get file status
351
    (goto-char (point-min))
Stefan Monnier's avatar
Stefan Monnier committed
352
    (prog1
353
        (if (looking-at "At revision")
Stefan Monnier's avatar
Stefan Monnier committed
354 355
            0 ;; there were no news; indicate success
          (if (re-search-forward
356 357 358 359 360 361
               ;; 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 ]\\)?  \\)"
362
                       (regexp-quote (file-name-nondirectory file)))
Stefan Monnier's avatar
Stefan Monnier committed
363 364 365
               nil t)
              (cond
               ;; Merge successful, we are in sync with repository now
366
               ((string= (match-string 2) "U")
Stefan Monnier's avatar
Stefan Monnier committed
367 368 369 370 371
                (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
372
               ((string= (match-string 2) "G")
Stefan Monnier's avatar
Stefan Monnier committed
373 374 375 376 377 378 379 380 381 382 383
                (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))))

384 385 386
(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
387 388 389 390
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)
391
    (with-temp-buffer
392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408
      (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
409
		   "*vc*" 0 "svnadmin" nil
410
		   "setlog" "--bypass-hooks" directory
411 412 413 414 415
		   "-r" rev (format "%s" tempfile))
	    (error "Log edit failed"))
	  (delete-file tempfile))

      ;; Remote repository, using svn+ssh.
416
      (unless (vc-do-command "*vc*" 0 "scp" nil "-q" tempfile remotefile)
417 418
	(error "Copy of comment to %s failed" remotefile))
      (unless (vc-do-command
419
	       "*vc*" 0 "ssh" nil "-q" host
420 421 422
	       (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
423 424 425 426 427

;;;
;;; History functions
;;;

428 429
(defvar log-view-per-file-logs)

430 431 432 433
(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))

434 435
(defun vc-svn-print-log (files &optional buffer)
  "Get change log(s) associated with FILES."
Stefan Monnier's avatar
Stefan Monnier committed
436
  (save-current-buffer
437
    (vc-setup-buffer buffer)
Stefan Monnier's avatar
Stefan Monnier committed
438 439
    (let ((inhibit-read-only t))
      (goto-char (point-min))
Eric S. Raymond's avatar
Eric S. Raymond committed
440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455
      (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")))))
456 457

(defun vc-svn-diff (files &optional oldvers newvers buffer)
458
  "Get a difference report using SVN between two revisions of fileset FILES."
459 460 461
  (and oldvers
       (catch 'no
	 (dolist (f files)
Eric S. Raymond's avatar
Eric S. Raymond committed
462
	   (or (equal oldvers (vc-working-revision f))
463 464 465 466 467 468 469
	       (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))
470
  (let* ((switches
471 472 473
	    (if vc-svn-diff-switches
		(vc-switches 'SVN 'diff)
	      (list "-x" (mapconcat 'identity (vc-switches nil 'diff) " "))))
474
	   (async (and (not vc-disable-async-diff)
475
                       (vc-stay-local-p files)
476
		       (or oldvers newvers)))) ; Svn diffs those locally.
477
      (apply 'vc-svn-command buffer
478
	     (if async 'async 0)
479
	     files "diff"
480
	     (append
481
	      switches
482 483 484
	      (when oldvers
		(list "-r" (if newvers (concat oldvers ":" newvers)
			     oldvers)))))
485 486 487
      (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.
488
	(buffer-size (get-buffer buffer)))))
Stefan Monnier's avatar
Stefan Monnier committed
489 490

;;;
491
;;; Tag system
Stefan Monnier's avatar
Stefan Monnier committed
492 493
;;;

494
(defun vc-svn-create-tag (dir name branchp)
495
  "Assign to DIR's current revision a given NAME.
Stefan Monnier's avatar
Stefan Monnier committed
496
If BRANCHP is non-nil, the name is created as a branch (and the current
497 498 499
workspace is immediately moved to that new branch).
NAME is assumed to be a URL."
  (vc-svn-command nil 0 dir "copy" name)
500
  (when branchp (vc-svn-retrieve-tag dir name nil)))
Stefan Monnier's avatar
Stefan Monnier committed
501

502 503 504
(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'.
505 506 507 508 509
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
510 511 512 513 514 515

;;;
;;; Miscellaneous
;;;

;; Subversion makes backups for us, so don't bother.
516
;; (defalias 'vc-svn-make-version-backups-p 'vc-stay-local-p
Stefan Monnier's avatar
Stefan Monnier committed
517 518 519 520 521 522 523 524 525 526 527 528 529 530
;;   "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
531
(defcustom vc-svn-program "svn"
532
  "Name of the SVN executable."
Stefan Monnier's avatar
Stefan Monnier committed
533 534 535
  :type 'string
  :group 'vc)

536 537 538
(defun vc-svn-root (dir)
  (vc-find-root dir vc-svn-admin-directory t))

539
(defun vc-svn-command (buffer okstatus file-or-list &rest flags)
Stefan Monnier's avatar
Stefan Monnier committed
540 541 542
  "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."
543
  (apply 'vc-do-command (or buffer "*vc*") okstatus vc-svn-program file-or-list
Stefan Monnier's avatar
Stefan Monnier committed
544 545 546 547 548
         (if (stringp vc-svn-global-switches)
             (cons vc-svn-global-switches flags)
           (append vc-svn-global-switches
                   flags))))

549 550 551 552 553
(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
554 555 556
      (vc-insert-file (expand-file-name (concat vc-svn-admin-directory
						"/entries")
					dirname)))
557 558
    (goto-char (point-min))
    (when (re-search-forward
559
	   ;; Old `svn' used name="svn:this_dir", newer use just name="".
560 561
	   (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*"
		   "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
562 563 564
		   "url=\"\\(?1:[^\"]+\\)\""
                   ;; Yet newer ones don't use XML any more.
                   "\\|^\ndir\n[0-9]+\n\\(?1:.*\\)") nil t)
565 566 567 568
      ;; 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
569

570 571 572 573
(defun vc-svn-resolve-when-done ()
  "Call \"svn resolved\" if the conflict markers have been removed."
  (save-excursion
    (goto-char (point-min))
574 575 576 577
    (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))))
578 579 580 581 582 583 584 585 586 587 588

;; 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
589
          (smerge-start-session)
590 591 592 593 594 595 596 597 598
          (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")))

599
(defun vc-svn-parse-status (&optional filename)
Stefan Monnier's avatar
Stefan Monnier committed
600
  "Parse output of \"svn status\" command in the current buffer.
601 602
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
603 604 605
  (let (file status)
    (goto-char (point-min))
    (while (re-search-forward
606
            ;; Ignore the files with status X.
607
	    "^\\(\\?\\|[ ACDGIMR!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\)\\) +" nil t)
608 609 610 611 612
      ;; 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
613
      (setq status (char-after (line-beginning-position)))
614
      (if (eq status ??)
Eric S. Raymond's avatar
Eric S. Raymond committed
615
	  (vc-file-setprop file 'vc-state 'unregistered)
616 617
	;; `vc-BACKEND-registered' must not set vc-backend,
	;; which is instead set in vc-registered.
Eric S. Raymond's avatar
Eric S. Raymond committed
618
	(unless filename (vc-file-setprop file 'vc-backend 'SVN))
619 620
	;; Use the last-modified revision, so that searching in vc-print-log
	;; output works.
Eric S. Raymond's avatar
Eric S. Raymond committed
621
	(vc-file-setprop file 'vc-working-revision (match-string 3))
622
        ;; Remember Svn's own status.
Eric S. Raymond's avatar
Eric S. Raymond committed
623 624
        (vc-file-setprop file 'vc-svn-status status)
	(vc-file-setprop
Stefan Monnier's avatar
Stefan Monnier committed
625 626 627 628
	 file 'vc-state
	 (cond
	  ((eq status ?\ )
	   (if (eq (char-after (match-beginning 1)) ?*)
629
	       'needs-update
Eric S. Raymond's avatar
Eric S. Raymond committed
630
             (vc-file-setprop file 'vc-checkout-time
Stefan Monnier's avatar
Stefan Monnier committed
631 632 633
                              (nth 5 (file-attributes file)))
	     'up-to-date))
	  ((eq status ?A)
634
	   ;; If the file was actually copied, (match-string 2) is "-".
Eric S. Raymond's avatar
Eric S. Raymond committed
635 636
	   (vc-file-setprop file 'vc-working-revision "0")
	   (vc-file-setprop file 'vc-checkout-time 0)
637
	   'added)
638 639 640
	  ((eq status ?C)
	   (vc-file-setprop file 'vc-state 'conflict))
	  ((eq status '?M)
Stefan Monnier's avatar
Stefan Monnier committed
641 642 643
	   (if (eq (char-after (match-beginning 1)) ?*)
	       'needs-merge
	     'edited))
644
	  ((eq status ?I)
Eric S. Raymond's avatar
Eric S. Raymond committed
645
	   (vc-file-setprop file 'vc-state 'ignored))
646
	  ((eq status ?R)
Eric S. Raymond's avatar
Eric S. Raymond committed
647
	   (vc-file-setprop file 'vc-state 'removed))
648 649
	  (t 'edited)))))
    (if filename (vc-file-getprop filename 'vc-state))))
Stefan Monnier's avatar
Stefan Monnier committed
650 651 652 653 654 655 656 657 658

(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))))

659 660
(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
661 662 663
  (and (string-match "^[0-9]" tag)
       (not (string-match "[^0-9]" tag))))

664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687
;; 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))

(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
688 689
(provide 'vc-svn)

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