annotate lisp/vc-arch.el @ 54396:7739fb21ca7f

New file.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 15 Mar 2004 03:39:09 +0000
parents
children a9f1e9611612
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1 ;;; vc-arch.el --- VC backend for the Arch version-control system
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
3 ;; Copyright (C) 1995,98,99,2000,01,02,03,2004 Free Software Foundation, Inc.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
4
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
5 ;; Author: FSF (see vc.el for full credits)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
6 ;; Maintainer: Stefan Monnier <monnier@gnu.org>
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
7
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
9
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
13 ;; any later version.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
14
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
18 ;; GNU General Public License for more details.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
19
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
23 ;; Boston, MA 02111-1307, USA.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
24
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
25 ;;; Commentary:
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
26
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
27 ;; The home page of the Arch version control system is at
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
28 ;;
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
29 ;; http://www.gnuarch.org/
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
30 ;;
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
31 ;; This is derived from vc-mcvs.el as follows:
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
32 ;; - cp vc-mcvs.el vc-arch.el and then M-% mcvs RET arch RET
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
33 ;;
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
34 ;; Then of course started the hacking.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
35 ;;
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
36 ;; What has been partly tested:
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
37 ;; - Open a file
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
38 ;; - C-x v = without any prefix arg
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
39 ;; - C-x v v to commit a change to a single file
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
40
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
41 ;; Bugs:
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
42
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
43 ;; - All files under the tree are considered as "under Arch's control"
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
44 ;; without regards to =tagging-method and such.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
45 ;; - Files are always considered as `edited'.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
46 ;; - C-x v i does not work.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
47 ;; - VC-dired does not work.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
48 ;; - And more...
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
49
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
50 ;;; Code:
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
51
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
52 (eval-when-compile (require 'vc))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
53
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
54 ;;;
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
55 ;;; Customization options
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
56 ;;;
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
57
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
58 (defvar vc-arch-command
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
59 (let ((candidates '("tla")))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
60 (while (and candidates (not (executable-find (car candidates))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
61 (setq candidates (cdr candidates)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
62 (or (car candidates) "tla")))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
63
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
64 ;; Clear up the cache to force vc-call to check again and discover
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
65 ;; new functions when we reload this file.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
66 (put 'Arch 'vc-functions nil)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
67
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
68 ;;;###autoload (defun vc-arch-registered (file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
69 ;;;###autoload (let ((dir file))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
70 ;;;###autoload (while (and (stringp dir)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
71 ;;;###autoload (not (equal
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
72 ;;;###autoload dir (setq dir (file-name-directory dir))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
73 ;;;###autoload dir)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
74 ;;;###autoload (setq dir (if (file-directory-p
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
75 ;;;###autoload (expand-file-name "{arch}" dir))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
76 ;;;###autoload t (directory-file-name dir))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
77 ;;;###autoload (if (eq dir t)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
78 ;;;###autoload (progn
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
79 ;;;###autoload (load "vc-arch")
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
80 ;;;###autoload (vc-arch-registered file)))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
81
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
82 (defun vc-arch-add-tag ()
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
83 "Add an `arch-tag' to the end of the current file."
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
84 (interactive)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
85 (goto-char (point-max))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
86 (forward-comment -1)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
87 (unless (bolp) (insert "\n"))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
88 (let ((beg (point)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
89 (insert "arch-tag: ")
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
90 (call-process "uuidgen" nil t) ;Also inserts a terminal newline.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
91 (comment-region beg (point))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
92
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
93 (defun vc-arch-root (file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
94 "Return the root directory of a Arch project, if any."
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
95 (or (vc-file-getprop file 'arch-root)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
96 (vc-file-setprop
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
97 file 'arch-root
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
98 (let ((root nil))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
99 (while (not (or root
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
100 (equal file (setq file (file-name-directory file)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
101 (null file)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
102 (if (file-directory-p (expand-file-name "{arch}" file))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
103 (setq root file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
104 (setq file (directory-file-name file))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
105 root))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
106
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
107 (defun vc-arch-registered (file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
108 ;; Don't check whether it's source or not. Checking would require
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
109 ;; running TLA, so it's better to not do it, so it also works if TLA is
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
110 ;; not installed.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
111 (vc-arch-root file))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
112
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
113 (defun vc-arch-default-version (file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
114 (or (vc-file-getprop (vc-arch-root file) 'arch-default-version)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
115 (let* ((root (vc-arch-root file))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
116 (f (expand-file-name "{arch}/++default-version" root)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
117 (if (file-readable-p f)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
118 (vc-file-setprop
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
119 root 'arch-default-version
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
120 (with-temp-buffer
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
121 (insert-file-contents f)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
122 ;; Strip the terminating newline.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
123 (buffer-substring (point-min) (1- (point-max)))))))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
124
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
125 (defun vc-arch-state (file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
126 ;; There's no checkout operation and merging is not done from VC
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
127 ;; so the only operation that's state dependent that VC supports is commit
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
128 ;; which is only activated if the file is `edited'.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
129 'edited)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
130
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
131 (defun vc-arch-workfile-version (file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
132 (let* ((root (expand-file-name "{arch}" (vc-arch-root file)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
133 (defbranch (vc-arch-default-version file)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
134 (when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*\\)--.*\\)--.*\\)\\'" defbranch))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
135 (let* ((archive (match-string 1 defbranch))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
136 (category (match-string 4 defbranch))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
137 (branch (match-string 3 defbranch))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
138 (version (match-string 2 defbranch))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
139 (rev-nb 0)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
140 (rev nil)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
141 logdir tmp)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
142 (setq logdir (expand-file-name category root))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
143 (setq logdir (expand-file-name branch logdir))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
144 (setq logdir (expand-file-name version logdir))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
145 (setq logdir (expand-file-name archive logdir))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
146 (setq logdir (expand-file-name "patch-log" logdir))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
147 (dolist (file (directory-files logdir))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
148 (if (and (string-match "-\\([0-9]+\\)\\'" file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
149 (setq tmp (string-to-number (match-string 1 file)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
150 (>= tmp rev-nb))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
151 (setq rev-nb tmp rev file)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
152 (concat defbranch "--" rev)))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
153
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
154
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
155 (defcustom vc-arch-mode-line-rewrite
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
156 '(("\\`.*--\\(.*--.*\\)--.*-\\([0-9]+\\)\\'" . "\\2[\\1]"))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
157 "Rewrite rules to shorten Arch's revision names on the mode-line."
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
158 :type '(repeat (cons regexp string)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
159
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
160 (defun vc-arch-mode-line-string (file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
161 "Return string for placement in modeline by `vc-mode-line' for FILE."
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
162 (let ((rev (vc-workfile-version file)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
163 (dolist (rule vc-arch-mode-line-rewrite)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
164 (if (string-match (car rule) rev)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
165 (setq rev (replace-match (cdr rule) t nil rev))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
166 (format "Arch%c%s"
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
167 (if (memq (vc-state file) '(up-to-date needs-patch)) ?- ?:)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
168 rev)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
169
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
170 (defun vc-arch-diff3-rej-p (rej)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
171 (and (eq (nth 7 (file-attributes rej)) 56)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
172 (with-temp-buffer
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
173 (insert-file-contents rej)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
174 (goto-char (point-min))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
175 (looking-at "Conflicts occured, diff3 conflict markers left in file\\.$"))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
176
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
177 (defun vc-arch-delete-rej-if-obsolete ()
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
178 "For use in `write-file-functions'."
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
179 (let ((rej (concat buffer-file-name ".rej")))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
180 (when (and buffer-file-name (vc-arch-diff3-rej-p rej))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
181 (if (not (re-search-forward "^>>>>>>> " nil t))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
182 ;; The .rej file is obsolete.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
183 (condition-case nil (delete-file rej) (error nil)))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
184 ;; This did not save the buffer.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
185 nil)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
186
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
187 (defun vc-arch-find-file-hook ()
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
188 (let ((rej (concat buffer-file-name ".rej")))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
189 (when (and buffer-file-name (file-exists-p rej))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
190 (if (vc-arch-diff3-rej-p rej)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
191 (save-excursion
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
192 (goto-char (point-min))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
193 (if (not (re-search-forward "^>>>>>>> " nil t))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
194 ;; The .rej file is obsolete.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
195 (condition-case nil (delete-file rej) (error nil))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
196 (smerge-mode 1)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
197 (add-hook 'write-file-functions
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
198 'vc-arch-delete-rej-if-obsolete nil t)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
199 (message "There are unresolved conflicts in this file")))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
200 (message "There are unresolved conflicts in %s"
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
201 (file-name-nondirectory rej))))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
202
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
203 (defun vc-arch-checkout-model (file) 'implicit)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
204
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
205 (defun vc-arch-checkin (file rev comment)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
206 (if rev (error "Committing to a specific revision is unsupported."))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
207 (vc-arch-command nil 0 file "commit" "-L" comment "--"
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
208 (vc-switches 'Arch 'checkin)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
209
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
210 (defun vc-arch-diff (file &optional oldvers newvers)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
211 "Get a difference report using Arch between two versions of FILE."
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
212 (if newvers
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
213 (error "Diffing specific revisions not implemented.")
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
214 (let* ((async (fboundp 'start-process))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
215 ;; Run the command from the root dir.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
216 (default-directory (vc-arch-root file))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
217 (status
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
218 (vc-arch-command
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
219 "*vc-diff*"
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
220 (if async 'async 1)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
221 nil "file-diffs"
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
222 ;; Arch does not support the typical flags.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
223 ;; (vc-switches 'Arch 'diff)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
224 (file-relative-name file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
225 (if (equal oldvers (vc-workfile-version file))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
226 nil
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
227 oldvers))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
228 (if async 1 status)))) ; async diff, pessimistic assumption.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
229
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
230 (defun vc-arch-delete-file (file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
231 (vc-arch-command nil 0 file "rm"))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
232
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
233 (defun vc-arch-rename-file (old new)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
234 (vc-arch-command nil 0 new "mv" (file-relative-name old)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
235
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
236 (defun vc-arch-command (buffer okstatus file &rest flags)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
237 "A wrapper around `vc-do-command' for use in vc-arch.el."
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
238 (apply 'vc-do-command buffer okstatus vc-arch-command file flags))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
239
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
240 (provide 'vc-arch)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
241
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
242 ;;; arch-tag: a35c7c1c-5237-429d-88ef-3d718fd2e704
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
243 ;;; vc-arch.el ends here