2003-05-05 15:42:27 +00:00
|
|
|
;;; vc-svn.el --- non-resident support for Subversion version-control
|
|
|
|
|
|
2012-01-05 09:46:05 +00:00
|
|
|
;; Copyright (C) 2003-2012 Free Software Foundation, Inc.
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
;; Author: FSF (see vc.el for full credits)
|
|
|
|
|
;; Maintainer: Stefan Monnier <monnier@gnu.org>
|
2010-08-29 16:17:13 +00:00
|
|
|
;; Package: vc
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2003-05-05 15:42:27 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
;; 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
|
2008-05-06 08:06:51 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
2007-10-09 16:54:40 +00:00
|
|
|
;; Sync'd with Subversion's vc-svn.el as of revision 5801. but this version
|
|
|
|
|
;; has been extensively modified since to handle filesets.
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
(eval-when-compile
|
|
|
|
|
(require 'vc))
|
|
|
|
|
|
2010-02-05 19:20:17 +00:00
|
|
|
;; Clear up the cache to force vc-call to check again and discover
|
|
|
|
|
;; new functions when we reload this file.
|
|
|
|
|
(put 'SVN 'vc-functions nil)
|
|
|
|
|
|
2003-05-05 15:42:27 +00:00
|
|
|
;;;
|
|
|
|
|
;;; Customization options
|
|
|
|
|
;;;
|
|
|
|
|
|
2012-02-25 04:29:09 +00:00
|
|
|
(defgroup vc-svn nil
|
|
|
|
|
"VC Subversion (svn) backend."
|
|
|
|
|
:version "24.1"
|
|
|
|
|
:group 'vc)
|
|
|
|
|
|
2008-11-22 03:27:18 +00:00
|
|
|
;; FIXME there is also svnadmin.
|
|
|
|
|
(defcustom vc-svn-program "svn"
|
|
|
|
|
"Name of the SVN executable."
|
|
|
|
|
:type 'string
|
2012-02-25 04:29:09 +00:00
|
|
|
:group 'vc-svn)
|
2008-11-22 03:27:18 +00:00
|
|
|
|
2003-05-05 15:42:27 +00:00
|
|
|
(defcustom vc-svn-global-switches nil
|
2008-11-22 03:27:18 +00:00
|
|
|
"Global switches to pass to any SVN command."
|
2003-05-05 15:42:27 +00:00
|
|
|
:type '(choice (const :tag "None" nil)
|
|
|
|
|
(string :tag "Argument String")
|
|
|
|
|
(repeat :tag "Argument List"
|
|
|
|
|
:value ("")
|
|
|
|
|
string))
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1"
|
2012-02-25 04:29:09 +00:00
|
|
|
:group 'vc-svn)
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
(defcustom vc-svn-register-switches nil
|
2008-12-04 07:03:53 +00:00
|
|
|
"Switches for registering a file into SVN.
|
2003-05-05 15:42:27 +00:00
|
|
|
A string or list of strings passed to the checkin program by
|
2008-12-04 07:03:53 +00:00
|
|
|
\\[vc-register]. If nil, use the value of `vc-register-switches'.
|
|
|
|
|
If t, use no switches."
|
|
|
|
|
:type '(choice (const :tag "Unspecified" nil)
|
|
|
|
|
(const :tag "None" t)
|
2003-05-05 15:42:27 +00:00
|
|
|
(string :tag "Argument String")
|
2008-12-04 07:03:53 +00:00
|
|
|
(repeat :tag "Argument List" :value ("") string))
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1"
|
2012-02-25 04:29:09 +00:00
|
|
|
:group 'vc-svn)
|
2003-05-05 15:42:27 +00:00
|
|
|
|
2003-07-23 15:34:14 +00:00
|
|
|
(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.
|
2008-11-30 01:58:06 +00:00
|
|
|
If nil, use the value of `vc-diff-switches' (or `diff-switches'),
|
2011-01-25 16:01:53 +00:00
|
|
|
together with \"-x --diff-cmd=\"`diff-command' (since 'svn diff'
|
|
|
|
|
does not support the default \"-c\" value of `diff-switches').
|
|
|
|
|
If you want to force an empty list of arguments, use t."
|
2003-07-23 15:34:14 +00:00
|
|
|
:type '(choice (const :tag "Unspecified" nil)
|
|
|
|
|
(const :tag "None" t)
|
2003-05-05 15:42:27 +00:00
|
|
|
(string :tag "Argument String")
|
|
|
|
|
(repeat :tag "Argument List"
|
|
|
|
|
:value ("")
|
|
|
|
|
string))
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1"
|
2012-02-25 04:29:09 +00:00
|
|
|
:group 'vc-svn)
|
2003-05-05 15:42:27 +00:00
|
|
|
|
2010-10-03 21:05:47 +00:00
|
|
|
(defcustom vc-svn-header '("\$Id\$")
|
2008-11-22 03:27:18 +00:00
|
|
|
"Header keywords to be inserted by `vc-insert-headers'."
|
2010-10-03 21:05:47 +00:00
|
|
|
:version "24.1" ; no longer consult the obsolete vc-header-alist
|
2003-05-05 15:42:27 +00:00
|
|
|
:type '(repeat string)
|
2012-02-25 04:29:09 +00:00
|
|
|
:group 'vc-svn)
|
2003-05-05 15:42:27 +00:00
|
|
|
|
2007-02-19 19:42:10 +00:00
|
|
|
;; 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))
|
2006-11-09 03:34:17 +00:00
|
|
|
(getenv "SVN_ASP_DOT_NET_HACK"))
|
|
|
|
|
"_svn")
|
|
|
|
|
(t ".svn"))
|
|
|
|
|
"The name of the \".svn\" subdirectory or its equivalent.")
|
|
|
|
|
|
2007-07-18 16:32:40 +00:00
|
|
|
;;; Properties of the backend
|
|
|
|
|
|
2008-05-02 17:47:25 +00:00
|
|
|
(defun vc-svn-revision-granularity () 'repository)
|
|
|
|
|
(defun vc-svn-checkout-model (files) 'implicit)
|
|
|
|
|
|
2003-05-05 15:42:27 +00:00
|
|
|
;;;
|
|
|
|
|
;;; State-querying functions
|
|
|
|
|
;;;
|
|
|
|
|
|
2006-11-09 03:34:17 +00:00
|
|
|
;;; vc-svn-admin-directory is generally not defined when the
|
|
|
|
|
;;; autoloaded function is called.
|
|
|
|
|
|
2003-05-05 15:42:27 +00:00
|
|
|
;;;###autoload (defun vc-svn-registered (f)
|
2006-11-09 03:34:17 +00:00
|
|
|
;;;###autoload (let ((admin-dir (cond ((and (eq system-type 'windows-nt)
|
2007-02-19 19:42:10 +00:00
|
|
|
;;;###autoload (getenv "SVN_ASP_DOT_NET_HACK"))
|
|
|
|
|
;;;###autoload "_svn")
|
|
|
|
|
;;;###autoload (t ".svn"))))
|
2011-02-12 01:12:53 +00:00
|
|
|
;;;###autoload (when (vc-find-root f admin-dir)
|
2003-05-05 15:42:27 +00:00
|
|
|
;;;###autoload (load "vc-svn")
|
2006-11-09 03:34:17 +00:00
|
|
|
;;;###autoload (vc-svn-registered f))))
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
(defun vc-svn-registered (file)
|
|
|
|
|
"Check if FILE is SVN registered."
|
2011-02-12 01:12:53 +00:00
|
|
|
(when (vc-svn-root file)
|
2003-05-05 15:42:27 +00:00
|
|
|
(with-temp-buffer
|
|
|
|
|
(cd (file-name-directory file))
|
2009-08-25 09:05:07 +00:00
|
|
|
(let* (process-file-side-effects
|
|
|
|
|
(status
|
2005-12-13 22:25:24 +00:00
|
|
|
(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)
|
2008-01-20 19:56:43 +00:00
|
|
|
(let ((parsed (vc-svn-parse-status file)))
|
|
|
|
|
(and parsed (not (memq parsed '(ignored unregistered))))))))))
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
(defun vc-svn-state (file &optional localp)
|
|
|
|
|
"SVN-specific version of `vc-state'."
|
2009-08-25 09:05:07 +00:00
|
|
|
(let (process-file-side-effects)
|
|
|
|
|
(setq localp (or localp (vc-stay-local-p file 'SVN)))
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(cd (file-name-directory file))
|
|
|
|
|
(vc-svn-command t 0 file "status" (if localp "-v" "-u"))
|
|
|
|
|
(vc-svn-parse-status file))))
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
(defun vc-svn-state-heuristic (file)
|
|
|
|
|
"SVN-specific state heuristic."
|
|
|
|
|
(vc-svn-state file 'local))
|
|
|
|
|
|
2008-10-04 20:24:24 +00:00
|
|
|
;; 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)
|
2008-01-19 16:32:23 +00:00
|
|
|
(let ((state-map '((?A . added)
|
2008-04-11 15:59:22 +00:00
|
|
|
(?C . conflict)
|
|
|
|
|
(?I . ignored)
|
|
|
|
|
(?M . edited)
|
2009-05-05 04:17:27 +00:00
|
|
|
(?D . removed)
|
2008-04-11 15:59:22 +00:00
|
|
|
(?R . removed)
|
|
|
|
|
(?? . unregistered)
|
|
|
|
|
;; This is what vc-svn-parse-status does.
|
|
|
|
|
(?~ . edited)))
|
2011-01-19 03:49:00 +00:00
|
|
|
(re (if remote "^\\(.\\)\\(.\\).....? \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$"
|
|
|
|
|
;; Subexp 3 is a dummy in this case, so the numbers match.
|
|
|
|
|
"^\\(.\\)\\(.\\)...\\(.\\) \\(.*\\)$"))
|
2008-01-19 16:32:23 +00:00
|
|
|
result)
|
|
|
|
|
(goto-char (point-min))
|
2008-10-04 20:24:24 +00:00
|
|
|
(while (re-search-forward re nil t)
|
2008-01-19 16:32:23 +00:00
|
|
|
(let ((state (cdr (assq (aref (match-string 1) 0) state-map)))
|
2011-01-19 03:49:00 +00:00
|
|
|
(propstat (cdr (assq (aref (match-string 2) 0) state-map)))
|
2011-03-03 07:27:52 +00:00
|
|
|
(filename (if (memq system-type '(windows-nt ms-dos))
|
|
|
|
|
(replace-regexp-in-string "\\\\" "/" (match-string 4))
|
|
|
|
|
(match-string 4))))
|
2011-01-20 07:17:22 +00:00
|
|
|
(and (memq propstat '(conflict edited))
|
|
|
|
|
(not (eq state 'conflict)) ; conflict always wins
|
|
|
|
|
(setq state propstat))
|
2011-01-19 03:49:00 +00:00
|
|
|
(and remote (string-equal (match-string 3) "*")
|
2008-10-04 20:24:24 +00:00
|
|
|
;; FIXME are there other possible combinations?
|
|
|
|
|
(cond ((eq state 'edited) (setq state 'needs-merge))
|
|
|
|
|
((not state) (setq state 'needs-update))))
|
2009-04-15 00:32:47 +00:00
|
|
|
(when (and state (not (string= "." filename)))
|
2008-03-31 15:36:56 +00:00
|
|
|
(setq result (cons (list filename state) result)))))
|
2008-04-11 15:59:22 +00:00
|
|
|
(funcall callback result)))
|
2008-01-19 16:32:23 +00:00
|
|
|
|
2008-04-11 15:17:59 +00:00
|
|
|
(defun vc-svn-dir-status (dir callback)
|
2008-01-19 16:32:23 +00:00
|
|
|
"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."
|
2008-10-04 20:24:24 +00:00
|
|
|
;; FIXME should this rather be all the files in dir?
|
2009-01-31 15:51:07 +00:00
|
|
|
;; FIXME: the vc-stay-local-p logic below is disabled, it ends up
|
|
|
|
|
;; calling synchronously (vc-svn-registered DIR) => calling svn status -v DIR
|
|
|
|
|
;; which is VERY SLOW for big trees and it makes emacs
|
|
|
|
|
;; completely unresponsive during that time.
|
* vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Add an optional argument for the backend, use it instead of
calling vc-backend.
(vc-mode-line): Add an optional argument for the backend. Pass
the backend to vc-state and vc-working-revision. Move code for
special handling for vc-state being a buffer to ...
* vc-rcs.el (vc-rcs-find-file-hook):
* vc-sccs.el (vc-sccs-find-file-hook): ... here. New functions.
* vc-svn.el (vc-svn-state, vc-svn-dir-status, vc-svn-checkout)
(vc-svn-print-log, vc-svn-diff): Pass 'SVN to vc-state,
vc-stay-local-p and vc-mode-line calls.
* vc-cvs.el (vc-cvs-state, vc-cvs-checkout, vc-cvs-print-log)
(vc-cvs-diff, vc-cvs-annotate-command)
(vc-cvs-make-version-backups-p, vc-cvs-stay-local-p)
(vc-cvs-dir-status): Pass 'CVS to vc-state, vc-stay-local-p and
vc-mode-line calls.
* vc.el (vc-deduce-fileset): Use vc-deduce-fileset instead of
direct comparison.
(vc-next-action, vc-transfer-file, vc-rename-file): Also pass the
backend when calling vc-mode-line.
(vc-register): Do not create a closure for calling the vc register
function, call it directly.
2009-06-23 06:35:40 +00:00
|
|
|
(let* ((local (and nil (vc-stay-local-p dir 'SVN)))
|
2009-01-31 15:51:07 +00:00
|
|
|
(remote (or t (not local) (eq local 'only-file))))
|
2008-10-04 20:24:24 +00:00
|
|
|
(vc-svn-command (current-buffer) 'async nil "status"
|
|
|
|
|
(if remote "-u"))
|
2008-03-29 05:34:52 +00:00
|
|
|
(vc-exec-after
|
2008-10-04 20:24:24 +00:00
|
|
|
`(vc-svn-after-dir-status (quote ,callback) ,remote))))
|
2008-01-18 23:45:04 +00:00
|
|
|
|
2008-10-04 01:22:26 +00:00
|
|
|
(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))))
|
|
|
|
|
|
2008-10-27 07:21:43 +00:00
|
|
|
(defun vc-svn-dir-extra-headers (dir)
|
2008-05-16 18:15:26 +00:00
|
|
|
"Generate extra status headers for a Subversion working copy."
|
2009-08-25 09:05:07 +00:00
|
|
|
(let (process-file-side-effects)
|
|
|
|
|
(vc-svn-command "*vc*" 0 nil "info"))
|
2008-05-16 18:15:26 +00:00
|
|
|
(let ((repo
|
2008-06-16 08:55:56 +00:00
|
|
|
(save-excursion
|
2008-05-16 18:15:26 +00:00
|
|
|
(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 "")))))
|
|
|
|
|
|
2007-10-10 18:52:45 +00:00
|
|
|
(defun vc-svn-working-revision (file)
|
|
|
|
|
"SVN-specific version of `vc-working-revision'."
|
2003-05-05 15:42:27 +00:00
|
|
|
;; 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)
|
2007-10-10 18:52:45 +00:00
|
|
|
(vc-file-getprop file 'vc-working-revision))
|
2003-05-05 15:42:27 +00:00
|
|
|
|
2003-07-04 22:21:45 +00:00
|
|
|
;; vc-svn-mode-line-string doesn't exist because the default implementation
|
|
|
|
|
;; works just fine.
|
|
|
|
|
|
2007-10-10 19:39:23 +00:00
|
|
|
(defun vc-svn-previous-revision (file rev)
|
2006-02-06 15:58:38 +00:00
|
|
|
(let ((newrev (1- (string-to-number rev))))
|
|
|
|
|
(when (< 0 newrev)
|
|
|
|
|
(number-to-string newrev))))
|
|
|
|
|
|
2007-10-10 19:39:23 +00:00
|
|
|
(defun vc-svn-next-revision (file rev)
|
2006-02-06 15:58:38 +00:00
|
|
|
(let ((newrev (1+ (string-to-number rev))))
|
2007-10-10 19:39:23 +00:00
|
|
|
;; The "working revision" is an uneasy conceptual fit under Subversion;
|
2006-02-06 15:58:38 +00:00
|
|
|
;; 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.
|
2007-10-10 18:52:45 +00:00
|
|
|
(unless (< (string-to-number (vc-file-getprop file 'vc-working-revision))
|
2006-02-06 15:58:38 +00:00
|
|
|
newrev)
|
|
|
|
|
(number-to-string newrev))))
|
|
|
|
|
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; State-changing functions
|
|
|
|
|
;;;
|
|
|
|
|
|
2007-07-18 16:32:40 +00:00
|
|
|
(defun vc-svn-create-repo ()
|
|
|
|
|
"Create a new SVN repository."
|
2008-05-10 13:27:16 +00:00
|
|
|
(vc-do-command "*vc*" 0 "svnadmin" '("create" "SVN"))
|
2011-11-10 02:36:48 +00:00
|
|
|
(vc-svn-command "*vc*" 0 "." "checkout"
|
|
|
|
|
(concat "file://" default-directory "SVN")))
|
2007-07-18 16:32:40 +00:00
|
|
|
|
|
|
|
|
(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.
|
2008-12-04 07:03:53 +00:00
|
|
|
Passes either `vc-svn-register-switches' or `vc-register-switches'
|
|
|
|
|
to the SVN command."
|
2007-07-18 16:32:40 +00:00
|
|
|
(apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register)))
|
2003-05-05 15:42:27 +00:00
|
|
|
|
2011-02-12 01:12:53 +00:00
|
|
|
(defun vc-svn-root (file)
|
|
|
|
|
(vc-find-root file vc-svn-admin-directory))
|
2003-05-05 15:42:27 +00:00
|
|
|
|
2011-02-12 01:12:53 +00:00
|
|
|
(defalias 'vc-svn-responsible-p 'vc-svn-root)
|
|
|
|
|
|
|
|
|
|
(defalias 'vc-svn-could-register 'vc-svn-root
|
2003-05-05 15:42:27 +00:00
|
|
|
"Return non-nil if FILE could be registered in SVN.
|
|
|
|
|
This is only possible if SVN is responsible for FILE's directory.")
|
|
|
|
|
|
2010-03-19 09:37:41 +00:00
|
|
|
(defun vc-svn-checkin (files rev comment &optional extra-args-ignored)
|
2003-05-05 15:42:27 +00:00
|
|
|
"SVN-specific version of `vc-backend-checkin'."
|
2008-02-20 12:42:35 +00:00
|
|
|
(if rev (error "Committing to a specific revision is unsupported in SVN"))
|
2004-06-04 04:37:10 +00:00
|
|
|
(let ((status (apply
|
2007-07-18 16:32:40 +00:00
|
|
|
'vc-svn-command nil 1 files "ci"
|
2004-06-04 04:37:10 +00:00
|
|
|
(nconc (list "-m" comment) (vc-switches 'SVN 'checkin)))))
|
2003-05-05 15:42:27 +00:00
|
|
|
(set-buffer "*vc*")
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(unless (equal status 0)
|
|
|
|
|
;; Check checkin problem.
|
|
|
|
|
(cond
|
2003-05-08 18:31:21 +00:00
|
|
|
((search-forward "Transaction is out of date" nil t)
|
2007-07-18 16:32:40 +00:00
|
|
|
(mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge))
|
|
|
|
|
files)
|
2003-05-05 15:42:27 +00:00
|
|
|
(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
|
2007-10-10 18:52:45 +00:00
|
|
|
;; file 'vc-working-revision
|
2003-05-05 15:42:27 +00:00
|
|
|
;; (vc-parse-buffer "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" 2))
|
|
|
|
|
))
|
|
|
|
|
|
2007-10-10 18:52:45 +00:00
|
|
|
(defun vc-svn-find-revision (file rev buffer)
|
2007-07-18 16:32:40 +00:00
|
|
|
"SVN-specific retrieval of a specified version into a buffer."
|
2009-08-25 09:05:07 +00:00
|
|
|
(let (process-file-side-effects)
|
|
|
|
|
(apply 'vc-svn-command
|
|
|
|
|
buffer 0 file
|
|
|
|
|
"cat"
|
|
|
|
|
(and rev (not (string= rev ""))
|
|
|
|
|
(concat "-r" rev))
|
|
|
|
|
(vc-switches 'SVN 'checkout))))
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
(defun vc-svn-checkout (file &optional editable rev)
|
|
|
|
|
(message "Checking out %s..." file)
|
|
|
|
|
(with-current-buffer (or (get-file-buffer file) (current-buffer))
|
* vc.el (vc-mark-resolved): Add `backend' argument.
(vc-next-action): Pass it the backend.
(vc-next-action, vc-checkout, vc-mark-resolved, vc-version-diff)
(vc-merge, vc-rollback, vc-update, vc-transfer-file, vc-delete-file)
(vc-default-comment-history, vc-default-create-snapshot)
(vc-default-retrieve-snapshot, vc-default-revert, vc-annotate)
(vc-annotate-revision-previous-to-line)
(vc-annotate-show-diff-revision-at-line, vc-annotate-warp-revision):
* vc-svn.el (vc-svn-checkout):
* vc-mcvs.el (vc-mcvs-checkout):
* vc-hooks.el (vc-state, vc-default-workfile-unchanged-p)
(vc-working-revision, vc-before-save, vc-mode-line):
Prefer vc-call-backend to vc-call so as not to recompute the backend.
2008-05-09 16:41:26 +00:00
|
|
|
(vc-svn-update file editable rev (vc-switches 'SVN 'checkout)))
|
* vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Add an optional argument for the backend, use it instead of
calling vc-backend.
(vc-mode-line): Add an optional argument for the backend. Pass
the backend to vc-state and vc-working-revision. Move code for
special handling for vc-state being a buffer to ...
* vc-rcs.el (vc-rcs-find-file-hook):
* vc-sccs.el (vc-sccs-find-file-hook): ... here. New functions.
* vc-svn.el (vc-svn-state, vc-svn-dir-status, vc-svn-checkout)
(vc-svn-print-log, vc-svn-diff): Pass 'SVN to vc-state,
vc-stay-local-p and vc-mode-line calls.
* vc-cvs.el (vc-cvs-state, vc-cvs-checkout, vc-cvs-print-log)
(vc-cvs-diff, vc-cvs-annotate-command)
(vc-cvs-make-version-backups-p, vc-cvs-stay-local-p)
(vc-cvs-dir-status): Pass 'CVS to vc-state, vc-stay-local-p and
vc-mode-line calls.
* vc.el (vc-deduce-fileset): Use vc-deduce-fileset instead of
direct comparison.
(vc-next-action, vc-transfer-file, vc-rename-file): Also pass the
backend when calling vc-mode-line.
(vc-register): Do not create a closure for calling the vc register
function, call it directly.
2009-06-23 06:35:40 +00:00
|
|
|
(vc-mode-line file 'SVN)
|
2003-05-05 15:42:27 +00:00
|
|
|
(message "Checking out %s...done" file))
|
|
|
|
|
|
|
|
|
|
(defun vc-svn-update (file editable rev switches)
|
|
|
|
|
(if (and (file-exists-p file) (not rev))
|
2007-02-19 19:42:10 +00:00
|
|
|
;; If no revision was specified, there's nothing to do.
|
|
|
|
|
nil
|
2003-05-05 15:42:27 +00:00
|
|
|
;; Check out a particular version (or recreate the file).
|
2007-10-10 18:52:45 +00:00
|
|
|
(vc-file-setprop file 'vc-working-revision nil)
|
2003-05-05 15:42:27 +00:00
|
|
|
(apply 'vc-svn-command nil 0 file
|
|
|
|
|
"update"
|
2003-07-04 22:21:45 +00:00
|
|
|
(cond
|
|
|
|
|
((null rev) "-rBASE")
|
|
|
|
|
((or (eq rev t) (equal rev "")) nil)
|
|
|
|
|
(t (concat "-r" rev)))
|
2003-05-05 15:42:27 +00:00
|
|
|
switches)))
|
|
|
|
|
|
2003-05-14 19:38:39 +00:00
|
|
|
(defun vc-svn-delete-file (file)
|
|
|
|
|
(vc-svn-command nil 0 file "remove"))
|
|
|
|
|
|
2003-05-09 14:13:40 +00:00
|
|
|
(defun vc-svn-rename-file (old new)
|
|
|
|
|
(vc-svn-command nil 0 new "move" (file-relative-name old)))
|
|
|
|
|
|
2003-05-05 15:42:27 +00:00
|
|
|
(defun vc-svn-revert (file &optional contents-done)
|
|
|
|
|
"Revert FILE to the version it was based on."
|
|
|
|
|
(unless contents-done
|
2007-02-19 19:42:10 +00:00
|
|
|
(vc-svn-command nil 0 file "revert")))
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
(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
|
2003-05-05 16:13:04 +00:00
|
|
|
"merge"
|
2003-05-05 16:13:39 +00:00
|
|
|
"-r" (if second-version
|
2003-05-05 16:13:04 +00:00
|
|
|
(concat first-version ":" second-version)
|
|
|
|
|
first-version))
|
2003-05-05 15:42:27 +00:00
|
|
|
(vc-file-setprop file 'vc-state 'edited)
|
|
|
|
|
(with-current-buffer (get-buffer "*vc*")
|
|
|
|
|
(goto-char (point-min))
|
2003-05-05 16:13:04 +00:00
|
|
|
(if (looking-at "C ")
|
|
|
|
|
1 ; signal conflict
|
2003-05-05 15:42:27 +00:00
|
|
|
0))) ; signal success
|
|
|
|
|
|
|
|
|
|
(defun vc-svn-merge-news (file)
|
|
|
|
|
"Merge in any new changes made to FILE."
|
|
|
|
|
(message "Merging changes into %s..." file)
|
2007-10-10 18:52:45 +00:00
|
|
|
;; (vc-file-setprop file 'vc-working-revision nil)
|
2003-05-05 15:42:27 +00:00
|
|
|
(vc-file-setprop file 'vc-checkout-time 0)
|
2011-11-10 02:36:48 +00:00
|
|
|
(vc-svn-command nil 0 file "update")
|
2003-05-05 15:42:27 +00:00
|
|
|
;; Analyze the merge result reported by SVN, and set
|
|
|
|
|
;; file properties accordingly.
|
|
|
|
|
(with-current-buffer (get-buffer "*vc*")
|
|
|
|
|
(goto-char (point-min))
|
2007-10-10 19:39:23 +00:00
|
|
|
;; get new working revision
|
2003-05-05 15:42:27 +00:00
|
|
|
(if (re-search-forward
|
2003-05-05 16:06:10 +00:00
|
|
|
"^\\(Updated to\\|At\\) revision \\([0-9]+\\)" nil t)
|
2007-10-10 18:52:45 +00:00
|
|
|
(vc-file-setprop file 'vc-working-revision (match-string 2))
|
|
|
|
|
(vc-file-setprop file 'vc-working-revision nil))
|
2003-05-05 15:42:27 +00:00
|
|
|
;; get file status
|
2003-05-05 16:06:10 +00:00
|
|
|
(goto-char (point-min))
|
2003-05-05 15:42:27 +00:00
|
|
|
(prog1
|
2003-05-05 16:06:10 +00:00
|
|
|
(if (looking-at "At revision")
|
2003-05-05 15:42:27 +00:00
|
|
|
0 ;; there were no news; indicate success
|
|
|
|
|
(if (re-search-forward
|
2007-02-07 23:02:12 +00:00
|
|
|
;; 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 ]\\)? \\)"
|
2003-05-05 16:06:10 +00:00
|
|
|
(regexp-quote (file-name-nondirectory file)))
|
2003-05-05 15:42:27 +00:00
|
|
|
nil t)
|
|
|
|
|
(cond
|
|
|
|
|
;; Merge successful, we are in sync with repository now
|
2007-02-07 23:02:12 +00:00
|
|
|
((string= (match-string 2) "U")
|
2003-05-05 15:42:27 +00:00
|
|
|
(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
|
2007-02-07 23:02:12 +00:00
|
|
|
((string= (match-string 2) "G")
|
2003-05-05 15:42:27 +00:00
|
|
|
(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))))
|
|
|
|
|
|
2008-01-02 00:42:37 +00:00
|
|
|
(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
|
2008-12-03 03:25:15 +00:00
|
|
|
uses locally for temp files must also be writable by you on that host.
|
2008-04-09 03:38:39 +00:00
|
|
|
This is only supported if the repository access method is either file://
|
|
|
|
|
or svn+ssh://."
|
|
|
|
|
(let (tempfile host remotefile directory fileurl-p)
|
2008-01-02 00:42:37 +00:00
|
|
|
(with-temp-buffer
|
2011-11-10 02:36:48 +00:00
|
|
|
(vc-svn-command (current-buffer) 0 nil "info")
|
2008-04-09 03:38:39 +00:00
|
|
|
(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
|
2008-05-10 13:27:16 +00:00
|
|
|
"*vc*" 0 "svnadmin" nil
|
2008-06-16 08:55:56 +00:00
|
|
|
"setlog" "--bypass-hooks" directory
|
2008-04-09 03:38:39 +00:00
|
|
|
"-r" rev (format "%s" tempfile))
|
|
|
|
|
(error "Log edit failed"))
|
|
|
|
|
(delete-file tempfile))
|
|
|
|
|
|
|
|
|
|
;; Remote repository, using svn+ssh.
|
2008-05-10 13:27:16 +00:00
|
|
|
(unless (vc-do-command "*vc*" 0 "scp" nil "-q" tempfile remotefile)
|
2008-04-09 03:38:39 +00:00
|
|
|
(error "Copy of comment to %s failed" remotefile))
|
|
|
|
|
(unless (vc-do-command
|
2008-05-10 13:27:16 +00:00
|
|
|
"*vc*" 0 "ssh" nil "-q" host
|
2008-04-09 03:38:39 +00:00
|
|
|
(format "svnadmin setlog --bypass-hooks %s -r %s %s; rm %s"
|
|
|
|
|
directory rev tempfile tempfile))
|
|
|
|
|
(error "Log edit failed")))))
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; History functions
|
|
|
|
|
;;;
|
|
|
|
|
|
2008-06-16 08:55:56 +00:00
|
|
|
(defvar log-view-per-file-logs)
|
|
|
|
|
|
2008-06-15 14:58:24 +00:00
|
|
|
(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))
|
|
|
|
|
|
2009-12-07 09:02:11 +00:00
|
|
|
(defun vc-svn-print-log (files buffer &optional shortlog start-revision limit)
|
2007-07-18 16:32:40 +00:00
|
|
|
"Get change log(s) associated with FILES."
|
2003-05-05 15:42:27 +00:00
|
|
|
(save-current-buffer
|
2004-04-20 16:49:26 +00:00
|
|
|
(vc-setup-buffer buffer)
|
2003-05-05 15:42:27 +00:00
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
|
(goto-char (point-min))
|
2007-12-27 03:10:52 +00:00
|
|
|
(if files
|
|
|
|
|
(dolist (file files)
|
|
|
|
|
(insert "Working file: " file "\n")
|
2009-11-15 20:28:58 +00:00
|
|
|
(apply
|
|
|
|
|
'vc-svn-command
|
2007-12-27 03:10:52 +00:00
|
|
|
buffer
|
|
|
|
|
'async
|
* vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Add an optional argument for the backend, use it instead of
calling vc-backend.
(vc-mode-line): Add an optional argument for the backend. Pass
the backend to vc-state and vc-working-revision. Move code for
special handling for vc-state being a buffer to ...
* vc-rcs.el (vc-rcs-find-file-hook):
* vc-sccs.el (vc-sccs-find-file-hook): ... here. New functions.
* vc-svn.el (vc-svn-state, vc-svn-dir-status, vc-svn-checkout)
(vc-svn-print-log, vc-svn-diff): Pass 'SVN to vc-state,
vc-stay-local-p and vc-mode-line calls.
* vc-cvs.el (vc-cvs-state, vc-cvs-checkout, vc-cvs-print-log)
(vc-cvs-diff, vc-cvs-annotate-command)
(vc-cvs-make-version-backups-p, vc-cvs-stay-local-p)
(vc-cvs-dir-status): Pass 'CVS to vc-state, vc-stay-local-p and
vc-mode-line calls.
* vc.el (vc-deduce-fileset): Use vc-deduce-fileset instead of
direct comparison.
(vc-next-action, vc-transfer-file, vc-rename-file): Also pass the
backend when calling vc-mode-line.
(vc-register): Do not create a closure for calling the vc register
function, call it directly.
2009-06-23 06:35:40 +00:00
|
|
|
;; (if (and (= (length files) 1) (vc-stay-local-p file 'SVN)) 'async 0)
|
2007-12-27 03:10:52 +00:00
|
|
|
(list file)
|
|
|
|
|
"log"
|
2009-12-07 09:02:11 +00:00
|
|
|
(append
|
|
|
|
|
(list
|
|
|
|
|
(if start-revision
|
|
|
|
|
(format "-r%s" start-revision)
|
|
|
|
|
;; 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"))
|
2010-01-15 03:54:36 +00:00
|
|
|
(when limit (list "--limit" (format "%s" limit))))))
|
2007-12-27 03:10:52 +00:00
|
|
|
;; Dump log for the entire directory.
|
2009-12-07 09:02:11 +00:00
|
|
|
(apply 'vc-svn-command buffer 0 nil "log"
|
|
|
|
|
(append
|
|
|
|
|
(list
|
|
|
|
|
(if start-revision (format "-r%s" start-revision) "-rHEAD:0"))
|
2010-01-15 03:54:36 +00:00
|
|
|
(when limit (list "--limit" (format "%s" limit)))))))))
|
2007-07-18 16:32:40 +00:00
|
|
|
|
|
|
|
|
(defun vc-svn-diff (files &optional oldvers newvers buffer)
|
2007-10-10 19:39:23 +00:00
|
|
|
"Get a difference report using SVN between two revisions of fileset FILES."
|
2009-02-04 10:49:04 +00:00
|
|
|
(and oldvers
|
|
|
|
|
(not newvers)
|
|
|
|
|
files
|
|
|
|
|
(catch 'no
|
|
|
|
|
(dolist (f files)
|
|
|
|
|
(or (equal oldvers (vc-working-revision f))
|
|
|
|
|
(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))
|
2007-07-18 16:32:40 +00:00
|
|
|
(let* ((switches
|
2004-08-23 18:23:52 +00:00
|
|
|
(if vc-svn-diff-switches
|
|
|
|
|
(vc-switches 'SVN 'diff)
|
2011-01-25 16:01:53 +00:00
|
|
|
(list (concat "--diff-cmd=" diff-command) "-x"
|
2008-11-30 01:58:06 +00:00
|
|
|
(mapconcat 'identity (vc-switches nil 'diff) " "))))
|
2005-01-09 21:30:56 +00:00
|
|
|
(async (and (not vc-disable-async-diff)
|
* vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Add an optional argument for the backend, use it instead of
calling vc-backend.
(vc-mode-line): Add an optional argument for the backend. Pass
the backend to vc-state and vc-working-revision. Move code for
special handling for vc-state being a buffer to ...
* vc-rcs.el (vc-rcs-find-file-hook):
* vc-sccs.el (vc-sccs-find-file-hook): ... here. New functions.
* vc-svn.el (vc-svn-state, vc-svn-dir-status, vc-svn-checkout)
(vc-svn-print-log, vc-svn-diff): Pass 'SVN to vc-state,
vc-stay-local-p and vc-mode-line calls.
* vc-cvs.el (vc-cvs-state, vc-cvs-checkout, vc-cvs-print-log)
(vc-cvs-diff, vc-cvs-annotate-command)
(vc-cvs-make-version-backups-p, vc-cvs-stay-local-p)
(vc-cvs-dir-status): Pass 'CVS to vc-state, vc-stay-local-p and
vc-mode-line calls.
* vc.el (vc-deduce-fileset): Use vc-deduce-fileset instead of
direct comparison.
(vc-next-action, vc-transfer-file, vc-rename-file): Also pass the
backend when calling vc-mode-line.
(vc-register): Do not create a closure for calling the vc register
function, call it directly.
2009-06-23 06:35:40 +00:00
|
|
|
(vc-stay-local-p files 'SVN)
|
2007-11-10 05:22:16 +00:00
|
|
|
(or oldvers newvers)))) ; Svn diffs those locally.
|
2004-04-20 16:49:26 +00:00
|
|
|
(apply 'vc-svn-command buffer
|
2003-05-09 14:13:40 +00:00
|
|
|
(if async 'async 0)
|
2007-07-18 16:32:40 +00:00
|
|
|
files "diff"
|
2003-05-09 14:13:40 +00:00
|
|
|
(append
|
2004-08-23 18:23:52 +00:00
|
|
|
switches
|
2003-05-09 14:13:40 +00:00
|
|
|
(when oldvers
|
|
|
|
|
(list "-r" (if newvers (concat oldvers ":" newvers)
|
|
|
|
|
oldvers)))))
|
2003-05-08 18:31:21 +00:00
|
|
|
(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.
|
2007-07-18 16:32:40 +00:00
|
|
|
(buffer-size (get-buffer buffer)))))
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
;;;
|
2008-05-15 17:38:50 +00:00
|
|
|
;;; Tag system
|
2003-05-05 15:42:27 +00:00
|
|
|
;;;
|
|
|
|
|
|
2008-05-15 17:38:50 +00:00
|
|
|
(defun vc-svn-create-tag (dir name branchp)
|
2007-10-10 19:39:23 +00:00
|
|
|
"Assign to DIR's current revision a given NAME.
|
2003-05-05 15:42:27 +00:00
|
|
|
If BRANCHP is non-nil, the name is created as a branch (and the current
|
2003-07-04 22:21:45 +00:00
|
|
|
workspace is immediately moved to that new branch).
|
|
|
|
|
NAME is assumed to be a URL."
|
|
|
|
|
(vc-svn-command nil 0 dir "copy" name)
|
2008-05-15 17:38:50 +00:00
|
|
|
(when branchp (vc-svn-retrieve-tag dir name nil)))
|
2003-05-05 15:42:27 +00:00
|
|
|
|
2008-05-15 17:38:50 +00:00
|
|
|
(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'.
|
2003-07-04 22:21:45 +00:00
|
|
|
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'.
|
|
|
|
|
)
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Miscellaneous
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
;; Subversion makes backups for us, so don't bother.
|
* vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Add an optional argument for the backend, use it instead of
calling vc-backend.
(vc-mode-line): Add an optional argument for the backend. Pass
the backend to vc-state and vc-working-revision. Move code for
special handling for vc-state being a buffer to ...
* vc-rcs.el (vc-rcs-find-file-hook):
* vc-sccs.el (vc-sccs-find-file-hook): ... here. New functions.
* vc-svn.el (vc-svn-state, vc-svn-dir-status, vc-svn-checkout)
(vc-svn-print-log, vc-svn-diff): Pass 'SVN to vc-state,
vc-stay-local-p and vc-mode-line calls.
* vc-cvs.el (vc-cvs-state, vc-cvs-checkout, vc-cvs-print-log)
(vc-cvs-diff, vc-cvs-annotate-command)
(vc-cvs-make-version-backups-p, vc-cvs-stay-local-p)
(vc-cvs-dir-status): Pass 'CVS to vc-state, vc-stay-local-p and
vc-mode-line calls.
* vc.el (vc-deduce-fileset): Use vc-deduce-fileset instead of
direct comparison.
(vc-next-action, vc-transfer-file, vc-rename-file): Also pass the
backend when calling vc-mode-line.
(vc-register): Do not create a closure for calling the vc register
function, call it directly.
2009-06-23 06:35:40 +00:00
|
|
|
;; (defun vc-svn-make-version-backups-p (file)
|
|
|
|
|
;; "Return non-nil if version backups should be made for FILE."
|
|
|
|
|
;; (vc-stay-local-p file 'SVN))
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
(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
|
|
|
|
|
;;;
|
|
|
|
|
|
2007-07-18 16:32:40 +00:00
|
|
|
(defun vc-svn-command (buffer okstatus file-or-list &rest flags)
|
2003-05-05 15:42:27 +00:00
|
|
|
"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',
|
2011-11-10 02:36:48 +00:00
|
|
|
and that it passes \"--non-interactive\" and `vc-svn-global-switches' to
|
|
|
|
|
it before FLAGS."
|
|
|
|
|
;; Might be nice if svn defaulted to non-interactive if stdin not tty.
|
|
|
|
|
;; http://svn.haxx.se/dev/archive-2008-05/0762.shtml
|
|
|
|
|
;; http://svn.haxx.se/dev/archive-2009-04/0094.shtml
|
|
|
|
|
;; Maybe newer ones do?
|
|
|
|
|
(or (member "--non-interactive"
|
|
|
|
|
(setq flags (if (stringp vc-svn-global-switches)
|
2003-05-05 15:42:27 +00:00
|
|
|
(cons vc-svn-global-switches flags)
|
2011-11-10 02:36:48 +00:00
|
|
|
(append vc-svn-global-switches flags))))
|
|
|
|
|
(setq flags (cons "--non-interactive" flags)))
|
|
|
|
|
(apply 'vc-do-command (or buffer "*vc*") okstatus vc-svn-program file-or-list
|
|
|
|
|
flags))
|
2003-05-05 15:42:27 +00:00
|
|
|
|
2003-05-09 16:41:19 +00:00
|
|
|
(defun vc-svn-repository-hostname (dirname)
|
|
|
|
|
(with-temp-buffer
|
2011-02-12 01:12:53 +00:00
|
|
|
(let (process-file-side-effects)
|
|
|
|
|
(vc-svn-command t t dirname "info" "--xml"))
|
2003-05-09 16:41:19 +00:00
|
|
|
(goto-char (point-min))
|
2011-02-12 01:12:53 +00:00
|
|
|
(when (re-search-forward "<url>\\(.*\\)</url>" nil t)
|
2004-12-13 06:30:40 +00:00
|
|
|
;; 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))))
|
2003-05-05 15:42:27 +00:00
|
|
|
|
2007-09-28 18:45:43 +00:00
|
|
|
(defun vc-svn-resolve-when-done ()
|
|
|
|
|
"Call \"svn resolved\" if the conflict markers have been removed."
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (point-min))
|
2008-01-15 04:37:20 +00:00
|
|
|
(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))))
|
2007-09-28 18:45:43 +00:00
|
|
|
|
|
|
|
|
;; 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
|
2008-01-16 06:22:59 +00:00
|
|
|
(smerge-start-session)
|
2007-09-28 18:45:43 +00:00
|
|
|
(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")))
|
|
|
|
|
|
2006-10-20 07:56:20 +00:00
|
|
|
(defun vc-svn-parse-status (&optional filename)
|
2003-05-05 15:42:27 +00:00
|
|
|
"Parse output of \"svn status\" command in the current buffer.
|
2006-10-20 07:56:20 +00:00
|
|
|
Set file properties accordingly. Unless FILENAME is non-nil, parse only
|
|
|
|
|
information about FILENAME and return its status."
|
2011-01-19 03:49:00 +00:00
|
|
|
(let (file status propstat)
|
2003-05-05 15:42:27 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (re-search-forward
|
2007-12-29 13:20:49 +00:00
|
|
|
;; Ignore the files with status X.
|
2008-08-06 16:49:23 +00:00
|
|
|
"^\\(?:\\?\\|[ ACDGIMR!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\)\\) +" nil t)
|
2007-01-14 14:49:28 +00:00
|
|
|
;; 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)))))
|
2011-01-19 03:49:00 +00:00
|
|
|
(setq status (char-after (line-beginning-position))
|
|
|
|
|
;; Status of the item's properties ([ MC]).
|
|
|
|
|
propstat (char-after (1+ (line-beginning-position))))
|
2007-12-29 13:20:49 +00:00
|
|
|
(if (eq status ??)
|
2008-01-01 18:40:42 +00:00
|
|
|
(vc-file-setprop file 'vc-state 'unregistered)
|
2003-05-08 18:31:21 +00:00
|
|
|
;; Use the last-modified revision, so that searching in vc-print-log
|
|
|
|
|
;; output works.
|
2008-01-01 18:40:42 +00:00
|
|
|
(vc-file-setprop file 'vc-working-revision (match-string 3))
|
2007-09-28 18:45:43 +00:00
|
|
|
;; Remember Svn's own status.
|
2008-01-01 18:40:42 +00:00
|
|
|
(vc-file-setprop file 'vc-svn-status status)
|
|
|
|
|
(vc-file-setprop
|
2003-05-05 15:42:27 +00:00
|
|
|
file 'vc-state
|
|
|
|
|
(cond
|
2011-01-19 03:49:00 +00:00
|
|
|
((and (eq status ?\ ) (eq propstat ?\ ))
|
2003-05-05 15:42:27 +00:00
|
|
|
(if (eq (char-after (match-beginning 1)) ?*)
|
2008-05-01 19:13:16 +00:00
|
|
|
'needs-update
|
2008-01-01 18:40:42 +00:00
|
|
|
(vc-file-setprop file 'vc-checkout-time
|
2003-05-05 15:42:27 +00:00
|
|
|
(nth 5 (file-attributes file)))
|
|
|
|
|
'up-to-date))
|
|
|
|
|
((eq status ?A)
|
2003-05-08 18:31:21 +00:00
|
|
|
;; If the file was actually copied, (match-string 2) is "-".
|
2008-01-01 18:40:42 +00:00
|
|
|
(vc-file-setprop file 'vc-working-revision "0")
|
|
|
|
|
(vc-file-setprop file 'vc-checkout-time 0)
|
2007-12-29 13:20:49 +00:00
|
|
|
'added)
|
2011-01-19 03:49:00 +00:00
|
|
|
;; Conflict in contents or properties.
|
|
|
|
|
((or (eq status ?C) (eq propstat ?C))
|
2008-04-10 07:32:25 +00:00
|
|
|
(vc-file-setprop file 'vc-state 'conflict))
|
2011-01-19 03:49:00 +00:00
|
|
|
;; Modified contents or properties.
|
|
|
|
|
((or (eq status ?M) (eq propstat ?M))
|
2003-05-05 15:42:27 +00:00
|
|
|
(if (eq (char-after (match-beginning 1)) ?*)
|
|
|
|
|
'needs-merge
|
|
|
|
|
'edited))
|
2007-12-28 18:16:55 +00:00
|
|
|
((eq status ?I)
|
2008-01-01 18:40:42 +00:00
|
|
|
(vc-file-setprop file 'vc-state 'ignored))
|
2009-05-05 04:17:27 +00:00
|
|
|
((memq status '(?D ?R))
|
2008-01-01 18:40:42 +00:00
|
|
|
(vc-file-setprop file 'vc-state 'removed))
|
2006-10-20 07:56:20 +00:00
|
|
|
(t 'edited)))))
|
2008-08-06 16:49:23 +00:00
|
|
|
(when filename (vc-file-getprop filename 'vc-state))))
|
2003-05-05 15:42:27 +00:00
|
|
|
|
|
|
|
|
(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))))
|
|
|
|
|
|
2007-10-10 19:39:23 +00:00
|
|
|
(defun vc-svn-valid-revision-number-p (tag)
|
|
|
|
|
"Return non-nil if TAG is a valid revision number."
|
2003-05-05 15:42:27 +00:00
|
|
|
(and (string-match "^[0-9]" tag)
|
|
|
|
|
(not (string-match "[^0-9]" tag))))
|
|
|
|
|
|
2004-12-13 06:30:40 +00:00
|
|
|
;; Support for `svn annotate'
|
|
|
|
|
|
|
|
|
|
(defun vc-svn-annotate-command (file buf &optional rev)
|
2009-09-14 04:42:04 +00:00
|
|
|
(vc-svn-command buf 'async file "annotate" (if rev (concat "-r" rev))))
|
2004-12-13 06:30:40 +00:00
|
|
|
|
|
|
|
|
(defun vc-svn-annotate-time-of-rev (rev)
|
2011-11-15 07:55:13 +00:00
|
|
|
;; Arbitrarily assume 10 commits per day.
|
2004-12-13 06:30:40 +00:00
|
|
|
(/ (string-to-number rev) 10.0))
|
|
|
|
|
|
2008-06-25 02:45:50 +00:00
|
|
|
(defvar vc-annotate-parent-rev)
|
|
|
|
|
|
2004-12-13 06:30:40 +00:00
|
|
|
(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))))
|
|
|
|
|
|
2010-02-05 19:20:17 +00:00
|
|
|
(defun vc-svn-revision-table (files)
|
|
|
|
|
(let ((vc-svn-revisions '()))
|
|
|
|
|
(with-current-buffer "*vc*"
|
|
|
|
|
(vc-svn-command nil 0 files "log" "-q")
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(forward-line)
|
|
|
|
|
(let ((start (point-min))
|
|
|
|
|
(loglines (buffer-substring-no-properties (point-min)
|
|
|
|
|
(point-max))))
|
|
|
|
|
(while (string-match "^r\\([0-9]+\\) " loglines)
|
|
|
|
|
(push (match-string 1 loglines) vc-svn-revisions)
|
|
|
|
|
(setq start (+ start (match-end 0)))
|
|
|
|
|
(setq loglines (buffer-substring-no-properties start (point-max)))))
|
|
|
|
|
vc-svn-revisions)))
|
|
|
|
|
|
2003-05-05 15:42:27 +00:00
|
|
|
(provide 'vc-svn)
|
|
|
|
|
|
|
|
|
|
;;; vc-svn.el ends here
|