Commit | Line | Data |
---|---|---|
0d42eb3e | 1 | ;;; vc-arch.el --- VC backend for the Arch version-control system -*- lexical-binding: t -*- |
0f6c7af8 | 2 | |
acaf905b | 3 | ;; Copyright (C) 2004-2012 Free Software Foundation, Inc. |
0f6c7af8 SM |
4 | |
5 | ;; Author: FSF (see vc.el for full credits) | |
6 | ;; Maintainer: Stefan Monnier <monnier@gnu.org> | |
bd78fa1d | 7 | ;; Package: vc |
0f6c7af8 SM |
8 | |
9 | ;; This file is part of GNU Emacs. | |
10 | ||
eb3fa2cf | 11 | ;; GNU Emacs is free software: you can redistribute it and/or modify |
0f6c7af8 | 12 | ;; it under the terms of the GNU General Public License as published by |
eb3fa2cf GM |
13 | ;; the Free Software Foundation, either version 3 of the License, or |
14 | ;; (at your option) any later version. | |
0f6c7af8 SM |
15 | |
16 | ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 | ;; GNU General Public License for more details. | |
20 | ||
21 | ;; You should have received a copy of the GNU General Public License | |
eb3fa2cf | 22 | ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
0f6c7af8 SM |
23 | |
24 | ;;; Commentary: | |
25 | ||
26 | ;; The home page of the Arch version control system is at | |
df617e7f | 27 | ;; |
0f6c7af8 | 28 | ;; http://www.gnuarch.org/ |
df617e7f | 29 | ;; |
0f6c7af8 SM |
30 | ;; This is derived from vc-mcvs.el as follows: |
31 | ;; - cp vc-mcvs.el vc-arch.el and then M-% mcvs RET arch RET | |
32 | ;; | |
33 | ;; Then of course started the hacking. | |
34 | ;; | |
35 | ;; What has been partly tested: | |
df617e7f SM |
36 | ;; - Open a file. |
37 | ;; - C-x v = without any prefix arg. | |
38 | ;; - C-x v v to commit a change to a single file. | |
0f6c7af8 SM |
39 | |
40 | ;; Bugs: | |
41 | ||
ce1438d6 | 42 | ;; - *vc-log*'s initial content lacks the `Summary:' lines. |
0f6c7af8 SM |
43 | ;; - All files under the tree are considered as "under Arch's control" |
44 | ;; without regards to =tagging-method and such. | |
45 | ;; - Files are always considered as `edited'. | |
27fde599 | 46 | ;; - C-x v l does not work. |
0f6c7af8 | 47 | ;; - C-x v i does not work. |
27fde599 SM |
48 | ;; - C-x v ~ does not work. |
49 | ;; - C-x v u does not work. | |
50 | ;; - C-x v s does not work. | |
51 | ;; - C-x v r does not work. | |
caf37b1f | 52 | ;; - VC directory listings do not work. |
0f6c7af8 SM |
53 | ;; - And more... |
54 | ||
55 | ;;; Code: | |
56 | ||
a464a6c7 | 57 | (eval-when-compile (require 'vc)) |
0f6c7af8 | 58 | |
70e2f6c7 ER |
59 | ;;; Properties of the backend |
60 | ||
61 | (defun vc-arch-revision-granularity () 'repository) | |
0d42eb3e | 62 | (defun vc-arch-checkout-model (_files) 'implicit) |
70e2f6c7 | 63 | |
0f6c7af8 SM |
64 | ;;; |
65 | ;;; Customization options | |
66 | ;;; | |
67 | ||
67b0de11 CY |
68 | (defgroup vc-arch nil |
69 | "VC Arch backend." | |
70 | :version "24.1" | |
71 | :group 'vc) | |
72 | ||
e98a0cab GM |
73 | ;; It seems Arch diff does not accept many options, so this is not |
74 | ;; very useful. It exists mainly so that the VC backends are all | |
75 | ;; consistent with regards to their treatment of diff switches. | |
76 | (defcustom vc-arch-diff-switches t | |
77 | "String or list of strings specifying switches for Arch diff under VC. | |
78 | If nil, use the value of `vc-diff-switches'. If t, use no switches." | |
79 | :type '(choice (const :tag "Unspecified" nil) | |
80 | (const :tag "None" t) | |
81 | (string :tag "Argument String") | |
82 | (repeat :tag "Argument List" :value ("") string)) | |
83 | :version "23.1" | |
67b0de11 | 84 | :group 'vc-arch) |
e98a0cab | 85 | |
e94851d3 GM |
86 | (define-obsolete-variable-alias 'vc-arch-command 'vc-arch-program "23.1") |
87 | ||
88 | (defcustom vc-arch-program | |
b4c4ba41 | 89 | (let ((candidates '("tla" "baz"))) |
0f6c7af8 SM |
90 | (while (and candidates (not (executable-find (car candidates)))) |
91 | (setq candidates (cdr candidates))) | |
e94851d3 GM |
92 | (or (car candidates) "tla")) |
93 | "Name of the Arch executable." | |
94 | :type 'string | |
67b0de11 | 95 | :group 'vc-arch) |
0f6c7af8 SM |
96 | |
97 | ;; Clear up the cache to force vc-call to check again and discover | |
98 | ;; new functions when we reload this file. | |
99 | (put 'Arch 'vc-functions nil) | |
100 | ||
101 | ;;;###autoload (defun vc-arch-registered (file) | |
ef9c4df0 SM |
102 | ;;;###autoload (if (vc-find-root file "{arch}/=tagging-method") |
103 | ;;;###autoload (progn | |
104 | ;;;###autoload (load "vc-arch") | |
105 | ;;;###autoload (vc-arch-registered file)))) | |
0f6c7af8 | 106 | |
df617e7f | 107 | (defun vc-arch-add-tagline () |
0f6c7af8 SM |
108 | "Add an `arch-tag' to the end of the current file." |
109 | (interactive) | |
df617e7f | 110 | (comment-normalize-vars) |
0f6c7af8 SM |
111 | (goto-char (point-max)) |
112 | (forward-comment -1) | |
56dada42 SM |
113 | (skip-chars-forward " \t\n") |
114 | (cond | |
115 | ((not (bolp)) (insert "\n\n")) | |
116 | ((not (eq ?\n (char-before (1- (point))))) (insert "\n"))) | |
df617e7f SM |
117 | (let ((beg (point)) |
118 | (idfile (and buffer-file-name | |
119 | (expand-file-name | |
120 | (concat ".arch-ids/" | |
121 | (file-name-nondirectory buffer-file-name) | |
122 | ".id") | |
123 | (file-name-directory buffer-file-name))))) | |
0f6c7af8 | 124 | (insert "arch-tag: ") |
df617e7f SM |
125 | (if (and idfile (file-exists-p idfile)) |
126 | ;; If the file is unreadable, we do want to get an error here. | |
127 | (progn | |
128 | (insert-file-contents idfile) | |
129 | (forward-line 1) | |
130 | (delete-file idfile)) | |
131 | (condition-case nil | |
132 | (call-process "uuidgen" nil t) | |
133 | (file-error (insert (format "%s <%s> %s" | |
134 | (current-time-string) | |
135 | user-mail-address | |
136 | (+ (nth 2 (current-time)) | |
137 | (buffer-size))))))) | |
0f6c7af8 SM |
138 | (comment-region beg (point)))) |
139 | ||
df617e7f SM |
140 | (defconst vc-arch-tagline-re "^\\W*arch-tag:[ \t]*\\(.*[^ \t\n]\\)") |
141 | ||
74cb3d21 SM |
142 | (defmacro vc-with-current-file-buffer (file &rest body) |
143 | (declare (indent 2) (debug t)) | |
144 | `(let ((-kill-buf- nil) | |
145 | (-file- ,file)) | |
146 | (with-current-buffer (or (find-buffer-visiting -file-) | |
147 | (setq -kill-buf- (generate-new-buffer " temp"))) | |
148 | ;; Avoid find-file-literally since it can do many undesirable extra | |
149 | ;; things (among which, call us back into an infinite loop). | |
150 | (if -kill-buf- (insert-file-contents -file-)) | |
151 | (unwind-protect | |
152 | (progn ,@body) | |
153 | (if (buffer-live-p -kill-buf-) (kill-buffer -kill-buf-)))))) | |
154 | ||
df617e7f SM |
155 | (defun vc-arch-file-source-p (file) |
156 | "Can return nil, `maybe' or a non-nil value. | |
157 | Only the value `maybe' can be trusted :-(." | |
158 | ;; FIXME: Check the tag and name of parent dirs. | |
159 | (unless (string-match "\\`[,+]" (file-name-nondirectory file)) | |
160 | (or (string-match "\\`{arch}/" | |
161 | (file-relative-name file (vc-arch-root file))) | |
162 | (file-exists-p | |
163 | ;; Check the presence of an ID file. | |
164 | (expand-file-name | |
165 | (concat ".arch-ids/" (file-name-nondirectory file) ".id") | |
166 | (file-name-directory file))) | |
167 | ;; Check the presence of a tagline. | |
74cb3d21 | 168 | (vc-with-current-file-buffer file |
df617e7f SM |
169 | (save-excursion |
170 | (goto-char (point-max)) | |
171 | (or (re-search-backward vc-arch-tagline-re (- (point) 1000) t) | |
172 | (progn | |
173 | (goto-char (point-min)) | |
174 | (re-search-forward vc-arch-tagline-re (+ (point) 1000) t))))) | |
175 | ;; FIXME: check =tagging-method to see whether untagged files might | |
176 | ;; be source or not. | |
177 | (with-current-buffer | |
178 | (find-file-noselect (expand-file-name "{arch}/=tagging-method" | |
179 | (vc-arch-root file))) | |
180 | (let ((untagged-source t)) ;Default is `names'. | |
181 | (save-excursion | |
182 | (goto-char (point-min)) | |
183 | (if (re-search-forward "^[ \t]*\\(\\(tagline\\|implicit\\|names\\)\\|explicit\\)" nil t) | |
184 | (setq untagged-source (match-end 2))) | |
185 | (if (re-search-forward "^[ \t]*untagged-source[ \t]+\\(\\(source\\)\\|precious\\|backup\\|junk\\|unrecognized\\)" nil t) | |
186 | (setq untagged-source (match-end 2)))) | |
187 | (if untagged-source 'maybe)))))) | |
188 | ||
189 | (defun vc-arch-file-id (file) | |
190 | ;; Don't include the kind of ID this is because it seems to be too messy. | |
191 | (let ((idfile (expand-file-name | |
192 | (concat ".arch-ids/" (file-name-nondirectory file) ".id") | |
193 | (file-name-directory file)))) | |
194 | (if (file-exists-p idfile) | |
195 | (with-temp-buffer | |
196 | (insert-file-contents idfile) | |
197 | (looking-at ".*[^ \n\t]") | |
e56b4640 | 198 | (match-string 0)) |
df617e7f SM |
199 | (with-current-buffer (find-file-noselect file) |
200 | (save-excursion | |
201 | (goto-char (point-max)) | |
202 | (if (or (re-search-backward vc-arch-tagline-re (- (point) 1000) t) | |
203 | (progn | |
204 | (goto-char (point-min)) | |
205 | (re-search-forward vc-arch-tagline-re (+ (point) 1000) t))) | |
206 | (match-string 1) | |
e56b4640 | 207 | (concat "./" (file-relative-name file (vc-arch-root file))))))))) |
df617e7f SM |
208 | |
209 | (defun vc-arch-tagging-method (file) | |
210 | (with-current-buffer | |
211 | (find-file-noselect | |
212 | (expand-file-name "{arch}/=tagging-method" (vc-arch-root file))) | |
213 | (save-excursion | |
214 | (goto-char (point-min)) | |
215 | (if (re-search-forward | |
216 | "^[ \t]*\\(tagline\\|implicit\\|names\\|explicit\\)" nil t) | |
217 | (intern (match-string 1)) | |
218 | 'names)))) | |
219 | ||
0f6c7af8 | 220 | (defun vc-arch-root (file) |
d1f18ec0 | 221 | "Return the root directory of an Arch project, if any." |
0f6c7af8 | 222 | (or (vc-file-getprop file 'arch-root) |
b38f5e6f DN |
223 | ;; Check the =tagging-method, in case someone naively manually |
224 | ;; creates a {arch} directory somewhere. | |
225 | (let ((root (vc-find-root file "{arch}/=tagging-method"))) | |
226 | (when root | |
227 | (vc-file-setprop | |
228 | file 'arch-root root))))) | |
0f6c7af8 | 229 | |
0d42eb3e | 230 | (defun vc-arch-register (files &optional rev _comment) |
7bbdf1cb | 231 | (if rev (error "Explicit initial revision not supported for Arch")) |
8cdd17b4 ER |
232 | (dolist (file files) |
233 | (let ((tagmet (vc-arch-tagging-method file))) | |
234 | (if (and (memq tagmet '(tagline implicit)) comment-start) | |
235 | (with-current-buffer (find-file-noselect file) | |
236 | (if (buffer-modified-p) | |
237 | (error "Save %s first" (buffer-name))) | |
238 | (vc-arch-add-tagline) | |
239 | (save-buffer))))) | |
240 | (vc-arch-command nil 0 files "add")) | |
df617e7f | 241 | |
0f6c7af8 | 242 | (defun vc-arch-registered (file) |
df617e7f SM |
243 | ;; Don't seriously check whether it's source or not. Checking would |
244 | ;; require running TLA, so it's better to not do it, so it also works if | |
245 | ;; TLA is not installed. | |
246 | (and (vc-arch-root file) | |
247 | (vc-arch-file-source-p file))) | |
0f6c7af8 SM |
248 | |
249 | (defun vc-arch-default-version (file) | |
250 | (or (vc-file-getprop (vc-arch-root file) 'arch-default-version) | |
251 | (let* ((root (vc-arch-root file)) | |
252 | (f (expand-file-name "{arch}/++default-version" root))) | |
253 | (if (file-readable-p f) | |
254 | (vc-file-setprop | |
255 | root 'arch-default-version | |
256 | (with-temp-buffer | |
257 | (insert-file-contents f) | |
258 | ;; Strip the terminating newline. | |
259 | (buffer-substring (point-min) (1- (point-max))))))))) | |
260 | ||
0d42eb3e | 261 | (defun vc-arch-workfile-unchanged-p (_file) |
004f9b3f | 262 | "Stub: arch workfiles are always considered to be in a changed state," |
68eb03ca SM |
263 | nil) |
264 | ||
0f6c7af8 SM |
265 | (defun vc-arch-state (file) |
266 | ;; There's no checkout operation and merging is not done from VC | |
267 | ;; so the only operation that's state dependent that VC supports is commit | |
268 | ;; which is only activated if the file is `edited'. | |
df617e7f SM |
269 | (let* ((root (vc-arch-root file)) |
270 | (ver (vc-arch-default-version file)) | |
271 | (pat (concat "\\`" (subst-char-in-string ?/ ?% ver))) | |
272 | (dir (expand-file-name ",,inode-sigs/" | |
273 | (expand-file-name "{arch}" root))) | |
274 | (sigfile nil)) | |
275 | (dolist (f (if (file-directory-p dir) (directory-files dir t pat))) | |
276 | (if (or (not sigfile) (file-newer-than-file-p f sigfile)) | |
277 | (setq sigfile f))) | |
278 | (if (not sigfile) | |
279 | 'edited ;We know nothing. | |
280 | (let ((id (vc-arch-file-id file))) | |
281 | (setq id (replace-regexp-in-string "[ \t]" "_" id)) | |
282 | (with-current-buffer (find-file-noselect sigfile) | |
283 | (goto-char (point-min)) | |
284 | (while (and (search-forward id nil 'move) | |
c9cb3a26 SM |
285 | (save-excursion |
286 | (goto-char (- (match-beginning 0) 2)) | |
287 | ;; For `names', the lines start with `?./foo/bar'. | |
288 | ;; For others there's 2 chars before the ./foo/bar. | |
289 | (or (not (or (bolp) (looking-at "\n?"))) | |
290 | ;; Ignore E_ entries used for foo.id files. | |
291 | (looking-at "E_"))))) | |
df617e7f SM |
292 | (if (eobp) |
293 | ;; ID not found. | |
294 | (if (equal (file-name-nondirectory sigfile) | |
295 | (subst-char-in-string | |
ac3f4c6f | 296 | ?/ ?% (vc-arch-working-revision file))) |
df617e7f SM |
297 | 'added |
298 | ;; Might be `added' or `up-to-date' as well. | |
299 | ;; FIXME: Check in the patch logs to find out. | |
300 | 'edited) | |
301 | ;; Found the ID, let's check the inode. | |
302 | (if (not (re-search-forward | |
303 | "\t.*mtime=\\([0-9]+\\):size=\\([0-9]+\\)" | |
304 | (line-end-position) t)) | |
305 | ;; Buh? Unexpected format. | |
306 | 'edited | |
307 | (let ((ats (file-attributes file))) | |
f9e66e49 | 308 | (if (and (eq (nth 7 ats) (string-to-number (match-string 2))) |
df617e7f SM |
309 | (equal (format-time-string "%s" (nth 5 ats)) |
310 | (match-string 1))) | |
311 | 'up-to-date | |
312 | 'edited))))))))) | |
7bbdf1cb | 313 | |
b4a7be38 MH |
314 | (defun vc-arch-dir-status (dir callback) |
315 | "Run 'tla inventory' for DIR and pass results to CALLBACK. | |
316 | CALLBACK expects (ENTRIES &optional MORE-TO-COME); see | |
317 | `vc-dir-refresh'." | |
318 | (let ((default-directory dir)) | |
319 | (vc-arch-command t 'async nil "changes")) | |
320 | ;; The updating could be done asynchronously. | |
321 | (vc-exec-after | |
322 | `(vc-arch-after-dir-status ',callback))) | |
323 | ||
324 | (defun vc-arch-after-dir-status (callback) | |
325 | (let* ((state-map '(("M " . edited) | |
326 | ("Mb" . edited) ;binary | |
327 | ("D " . removed) | |
328 | ("D/" . removed) ;directory | |
329 | ("A " . added) | |
330 | ("A/" . added) ;directory | |
331 | ("=>" . renamed) | |
332 | ("/>" . renamed) ;directory | |
333 | ("lf" . symlink-to-file) | |
334 | ("fl" . file-to-symlink) | |
335 | ("--" . permissions-changed) | |
336 | ("-/" . permissions-changed) ;directory | |
337 | )) | |
338 | (state-map-regexp (regexp-opt (mapcar 'car state-map) t)) | |
339 | (entry-regexp (concat "^" state-map-regexp " \\(.*\\)$")) | |
340 | result) | |
341 | (goto-char (point-min)) | |
342 | ;;(message "Got %s" (buffer-string)) | |
343 | (while (re-search-forward entry-regexp nil t) | |
344 | (let* ((state-string (match-string 1)) | |
345 | (state (cdr (assoc state-string state-map))) | |
346 | (filename (match-string 2))) | |
347 | (push (list filename state) result))) | |
348 | ||
349 | (funcall callback result nil))) | |
350 | ||
ac3f4c6f | 351 | (defun vc-arch-working-revision (file) |
0f6c7af8 SM |
352 | (let* ((root (expand-file-name "{arch}" (vc-arch-root file))) |
353 | (defbranch (vc-arch-default-version file))) | |
c771f3d6 | 354 | (when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*?\\)\\(?:--.*\\)?\\)--.*\\)\\'" defbranch)) |
0f6c7af8 SM |
355 | (let* ((archive (match-string 1 defbranch)) |
356 | (category (match-string 4 defbranch)) | |
357 | (branch (match-string 3 defbranch)) | |
358 | (version (match-string 2 defbranch)) | |
27fde599 | 359 | (sealed nil) (rev-nb 0) |
0f6c7af8 SM |
360 | (rev nil) |
361 | logdir tmp) | |
362 | (setq logdir (expand-file-name category root)) | |
363 | (setq logdir (expand-file-name branch logdir)) | |
364 | (setq logdir (expand-file-name version logdir)) | |
365 | (setq logdir (expand-file-name archive logdir)) | |
366 | (setq logdir (expand-file-name "patch-log" logdir)) | |
bcabe045 SM |
367 | (dolist (file (if (file-directory-p logdir) (directory-files logdir))) |
368 | ;; Revision names go: base-0, patch-N, version-0, versionfix-M. | |
27fde599 SM |
369 | (when (and (eq (aref file 0) ?v) (not sealed)) |
370 | (setq sealed t rev-nb 0)) | |
0f6c7af8 SM |
371 | (if (and (string-match "-\\([0-9]+\\)\\'" file) |
372 | (setq tmp (string-to-number (match-string 1 file))) | |
27fde599 | 373 | (or (not sealed) (eq (aref file 0) ?v)) |
0f6c7af8 SM |
374 | (>= tmp rev-nb)) |
375 | (setq rev-nb tmp rev file))) | |
86d660c6 SM |
376 | ;; Use "none-000" if the tree hasn't yet been committed on the |
377 | ;; default branch. We'll then get "Arch:000[branch]" on the mode-line. | |
378 | (concat defbranch "--" (or rev "none-000")))))) | |
0f6c7af8 SM |
379 | |
380 | ||
381 | (defcustom vc-arch-mode-line-rewrite | |
27fde599 | 382 | '(("\\`.*--\\(.*--.*\\)--\\(v?\\).*-\\([0-9]+\\)\\'" . "\\2\\3[\\1]")) |
0f6c7af8 | 383 | "Rewrite rules to shorten Arch's revision names on the mode-line." |
d30bef64 | 384 | :type '(repeat (cons regexp string)) |
67b0de11 | 385 | :group 'vc-arch) |
0f6c7af8 SM |
386 | |
387 | (defun vc-arch-mode-line-string (file) | |
37269466 | 388 | "Return a string for `vc-mode-line' to put in the mode line for FILE." |
ac3f4c6f | 389 | (let ((rev (vc-working-revision file))) |
0f6c7af8 SM |
390 | (dolist (rule vc-arch-mode-line-rewrite) |
391 | (if (string-match (car rule) rev) | |
392 | (setq rev (replace-match (cdr rule) t nil rev)))) | |
393 | (format "Arch%c%s" | |
a464a6c7 SM |
394 | (pcase (vc-state file) |
395 | ((or `up-to-date `needs-update) ?-) | |
396 | (`added ?@) | |
df617e7f | 397 | (t ?:)) |
0f6c7af8 SM |
398 | rev))) |
399 | ||
400 | (defun vc-arch-diff3-rej-p (rej) | |
df617e7f SM |
401 | (let ((attrs (file-attributes rej))) |
402 | (and attrs (< (nth 7 attrs) 60) | |
403 | (with-temp-buffer | |
404 | (insert-file-contents rej) | |
405 | (goto-char (point-min)) | |
e1dbe924 | 406 | (looking-at "Conflicts occurred, diff3 conflict markers left in file\\."))))) |
0f6c7af8 SM |
407 | |
408 | (defun vc-arch-delete-rej-if-obsolete () | |
7bbdf1cb SM |
409 | "For use in `after-save-hook'." |
410 | (save-excursion | |
411 | (let ((rej (concat buffer-file-name ".rej"))) | |
412 | (when (and buffer-file-name (vc-arch-diff3-rej-p rej)) | |
54648b5c DN |
413 | (unless (re-search-forward "^<<<<<<< " nil t) |
414 | ;; The .rej file is obsolete. | |
415 | (condition-case nil (delete-file rej) (error nil)) | |
416 | ;; Remove the hook so that it is not called multiple times. | |
417 | (remove-hook 'after-save-hook 'vc-arch-delete-rej-if-obsolete t)))))) | |
0f6c7af8 SM |
418 | |
419 | (defun vc-arch-find-file-hook () | |
420 | (let ((rej (concat buffer-file-name ".rej"))) | |
421 | (when (and buffer-file-name (file-exists-p rej)) | |
422 | (if (vc-arch-diff3-rej-p rej) | |
423 | (save-excursion | |
424 | (goto-char (point-min)) | |
7bbdf1cb | 425 | (if (not (re-search-forward "^<<<<<<< " nil t)) |
0f6c7af8 SM |
426 | ;; The .rej file is obsolete. |
427 | (condition-case nil (delete-file rej) (error nil)) | |
28e4e2b4 | 428 | (smerge-mode 1) |
7bbdf1cb | 429 | (add-hook 'after-save-hook |
0f6c7af8 SM |
430 | 'vc-arch-delete-rej-if-obsolete nil t) |
431 | (message "There are unresolved conflicts in this file"))) | |
432 | (message "There are unresolved conflicts in %s" | |
433 | (file-name-nondirectory rej)))))) | |
434 | ||
4624de78 | 435 | (defun vc-arch-checkin (files rev comment) |
ef5c2eca | 436 | (if rev (error "Committing to a specific revision is unsupported")) |
8cdd17b4 | 437 | ;; FIXME: This implementation probably only works for singleton filesets |
98a6dc9f | 438 | (let ((summary (file-relative-name (car files) (vc-arch-root (car files))))) |
27fde599 SM |
439 | ;; Extract a summary from the comment. |
440 | (when (or (string-match "\\`Summary:[ \t]*\\(.*[^ \t\n]\\)\\([ \t]*\n\\)*" comment) | |
441 | (string-match "\\`[ \t]*\\(.*[^ \t\n]\\)[ \t]*\\(\n?\\'\\|\n\\([ \t]*\n\\)+\\)" comment)) | |
442 | (setq summary (match-string 1 comment)) | |
443 | (setq comment (substring comment (match-end 0)))) | |
8cdd17b4 | 444 | (vc-arch-command nil 0 files "commit" "-s" summary "-L" comment "--" |
27fde599 | 445 | (vc-switches 'Arch 'checkin)))) |
0f6c7af8 | 446 | |
8cdd17b4 ER |
447 | (defun vc-arch-diff (files &optional oldvers newvers buffer) |
448 | "Get a difference report using Arch between two versions of FILES." | |
f3b8feb4 SM |
449 | ;; FIXME: This implementation only works for singleton filesets. To make |
450 | ;; it work for more cases, we have to either call `file-diffs' manually on | |
451 | ;; each and every `file' in the fileset, or use `changes --diffs' (and | |
452 | ;; variants) and maybe filter the output with `filterdiff' to only include | |
453 | ;; the files in which we're interested. | |
454 | (let ((file (car files))) | |
455 | (if (and newvers | |
456 | (vc-up-to-date-p file) | |
ac3f4c6f | 457 | (equal newvers (vc-working-revision file))) |
f3b8feb4 SM |
458 | ;; Newvers is the base revision and the current file is unchanged, |
459 | ;; so we can diff with the current file. | |
460 | (setq newvers nil)) | |
461 | (if newvers | |
462 | (error "Diffing specific revisions not implemented") | |
9fb5c929 MA |
463 | (let* (process-file-side-effects |
464 | (async (not vc-disable-async-diff)) | |
f3b8feb4 SM |
465 | ;; Run the command from the root dir. |
466 | (default-directory (vc-arch-root file)) | |
467 | (status | |
468 | (vc-arch-command | |
469 | (or buffer "*vc-diff*") | |
470 | (if async 'async 1) | |
471 | nil "file-diffs" | |
e98a0cab | 472 | (vc-switches 'Arch 'diff) |
f3b8feb4 | 473 | (file-relative-name file) |
ac3f4c6f | 474 | (if (equal oldvers (vc-working-revision file)) |
f3b8feb4 SM |
475 | nil |
476 | oldvers)))) | |
477 | (if async 1 status))))) ; async diff, pessimistic assumption. | |
0f6c7af8 SM |
478 | |
479 | (defun vc-arch-delete-file (file) | |
480 | (vc-arch-command nil 0 file "rm")) | |
481 | ||
482 | (defun vc-arch-rename-file (old new) | |
483 | (vc-arch-command nil 0 new "mv" (file-relative-name old))) | |
484 | ||
7bbdf1cb SM |
485 | (defalias 'vc-arch-responsible-p 'vc-arch-root) |
486 | ||
0f6c7af8 SM |
487 | (defun vc-arch-command (buffer okstatus file &rest flags) |
488 | "A wrapper around `vc-do-command' for use in vc-arch.el." | |
e94851d3 | 489 | (apply 'vc-do-command (or buffer "*vc*") okstatus vc-arch-program file flags)) |
0f6c7af8 | 490 | |
ac3f4c6f | 491 | (defun vc-arch-init-revision () nil) |
7bbdf1cb | 492 | |
56dada42 SM |
493 | ;;; Completion of versions and revisions. |
494 | ||
56dada42 SM |
495 | (defun vc-arch--version-completion-table (root string) |
496 | (delq nil | |
497 | (mapcar | |
498 | (lambda (d) | |
499 | (when (string-match "/\\([^/]+\\)/\\([^/]+\\)\\'" d) | |
500 | (concat (match-string 2 d) "/" (match-string 1 d)))) | |
501 | (let ((default-directory root)) | |
502 | (file-expand-wildcards | |
503 | (concat "*/*/" | |
504 | (if (string-match "/" string) | |
505 | (concat (substring string (match-end 0)) | |
506 | "*/" (substring string 0 (match-beginning 0))) | |
507 | (concat "*/" string)) | |
508 | "*")))))) | |
509 | ||
a44d450b | 510 | (defun vc-arch-revision-completion-table (files) |
0d42eb3e SM |
511 | (lambda (string pred action) |
512 | ;; FIXME: complete revision patches as well. | |
513 | (let* ((root (expand-file-name "{arch}" (vc-arch-root (car files)))) | |
514 | (table (vc-arch--version-completion-table root string))) | |
515 | (complete-with-action action table string pred)))) | |
56dada42 SM |
516 | |
517 | ;;; Trimming revision libraries. | |
518 | ||
519 | ;; This code is not directly related to VC and there are many variants of | |
520 | ;; this functionality available as scripts, but I like this version better, | |
521 | ;; so maybe others will like it too. | |
522 | ||
523 | (defun vc-arch-trim-find-least-useful-rev (revs) | |
524 | (let* ((first (pop revs)) | |
525 | (second (pop revs)) | |
526 | (third (pop revs)) | |
527 | ;; We try to give more importance to recent revisions. The idea is | |
528 | ;; that it's OK if checking out a revision 1000-patch-old is ten | |
529 | ;; times slower than checking out a revision 100-patch-old. But at | |
530 | ;; the same time a 2-patch-old rev isn't really ten times more | |
531 | ;; important than a 20-patch-old, so we use an arbitrary constant | |
532 | ;; "100" to reduce this effect for recent revisions. Making this | |
533 | ;; constant a float has the side effect of causing the subsequent | |
534 | ;; computations to be done as floats as well. | |
535 | (max (+ 100.0 (car (or (car (last revs)) third)))) | |
536 | (cost (lambda () (/ (- (car third) (car first)) (- max (car second))))) | |
537 | (minrev second) | |
538 | (mincost (funcall cost))) | |
539 | (while revs | |
540 | (setq first second) | |
541 | (setq second third) | |
542 | (setq third (pop revs)) | |
543 | (when (< (funcall cost) mincost) | |
544 | (setq minrev second) | |
545 | (setq mincost (funcall cost)))) | |
546 | minrev)) | |
547 | ||
548 | (defun vc-arch-trim-make-sentinel (revs) | |
0d42eb3e SM |
549 | (if (null revs) (lambda (_proc _msg) (message "VC-Arch trimming ... done")) |
550 | (lambda (_proc _msg) | |
551 | (message "VC-Arch trimming %s..." (file-name-nondirectory (car revs))) | |
552 | (rename-file (car revs) (concat (car revs) "*rm*")) | |
553 | (let ((proc (start-process "vc-arch-trim" nil | |
554 | "rm" "-rf" (concat (car revs) "*rm*")))) | |
e87c4c6e | 555 | (set-process-sentinel proc (vc-arch-trim-make-sentinel (cdr revs))))))) |
56dada42 SM |
556 | |
557 | (defun vc-arch-trim-one-revlib (dir) | |
558 | "Delete half of the revisions in the revision library." | |
559 | (interactive "Ddirectory: ") | |
e87c4c6e SM |
560 | (let ((garbage (directory-files dir 'full "\\`,," 'nosort))) |
561 | (when garbage | |
562 | (funcall (vc-arch-trim-make-sentinel garbage) nil nil))) | |
56dada42 SM |
563 | (let ((revs |
564 | (sort (delq nil | |
565 | (mapcar | |
566 | (lambda (f) | |
567 | (when (string-match "-\\([0-9]+\\)\\'" f) | |
568 | (cons (string-to-number (match-string 1 f)) f))) | |
569 | (directory-files dir nil nil 'nosort))) | |
570 | 'car-less-than-car)) | |
571 | (subdirs nil)) | |
572 | (when (cddr revs) | |
0d42eb3e | 573 | (dotimes (_i (/ (length revs) 2)) |
56dada42 SM |
574 | (let ((minrev (vc-arch-trim-find-least-useful-rev revs))) |
575 | (setq revs (delq minrev revs)) | |
576 | (push minrev subdirs))) | |
577 | (funcall (vc-arch-trim-make-sentinel | |
578 | (mapcar (lambda (x) (expand-file-name (cdr x) dir)) subdirs)) | |
579 | nil nil)))) | |
580 | ||
581 | (defun vc-arch-trim-revlib () | |
582 | "Delete half of the revisions in the revision library." | |
583 | (interactive) | |
584 | (let ((rl-dir (with-output-to-string | |
e94851d3 | 585 | (call-process vc-arch-program nil standard-output nil |
56dada42 SM |
586 | "my-revision-library")))) |
587 | (while (string-match "\\(.*\\)\n" rl-dir) | |
588 | (let ((dir (match-string 1 rl-dir))) | |
589 | (setq rl-dir | |
590 | (if (and (file-directory-p dir) (file-writable-p dir)) | |
591 | dir | |
592 | (substring rl-dir (match-end 0)))))) | |
593 | (unless (file-writable-p rl-dir) | |
594 | (error "No writable revlib directory found")) | |
595 | (message "Revlib at %s" rl-dir) | |
596 | (let* ((archives (directory-files rl-dir 'full "[^.]\\|...")) | |
597 | (categories | |
598 | (apply 'append | |
599 | (mapcar (lambda (dir) | |
600 | (when (file-directory-p dir) | |
601 | (directory-files dir 'full "[^.]\\|..."))) | |
602 | archives))) | |
603 | (branches | |
604 | (apply 'append | |
605 | (mapcar (lambda (dir) | |
606 | (when (file-directory-p dir) | |
607 | (directory-files dir 'full "[^.]\\|..."))) | |
608 | categories))) | |
609 | (versions | |
610 | (apply 'append | |
611 | (mapcar (lambda (dir) | |
612 | (when (file-directory-p dir) | |
613 | (directory-files dir 'full "--.*--"))) | |
614 | branches)))) | |
615 | (mapc 'vc-arch-trim-one-revlib versions)) | |
616 | )) | |
80d7d79f SM |
617 | |
618 | (defvar vc-arch-extra-menu-map | |
619 | (let ((map (make-sparse-keymap))) | |
620 | (define-key map [add-tagline] | |
621 | '(menu-item "Add tagline" vc-arch-add-tagline)) | |
622 | map)) | |
623 | ||
624 | (defun vc-arch-extra-menu () vc-arch-extra-menu-map) | |
e94851d3 | 625 | |
80d7d79f | 626 | |
544bdc40 SM |
627 | ;;; Less obvious implementations. |
628 | ||
ac3f4c6f | 629 | (defun vc-arch-find-revision (file rev buffer) |
544bdc40 SM |
630 | (let ((out (make-temp-file "vc-out"))) |
631 | (unwind-protect | |
632 | (progn | |
633 | (with-temp-buffer | |
634 | (vc-arch-command (current-buffer) 1 nil "file-diffs" file rev) | |
635 | (call-process-region (point-min) (point-max) | |
636 | "patch" nil nil nil "-R" "-o" out file)) | |
637 | (with-current-buffer buffer | |
638 | (insert-file-contents out))) | |
639 | (delete-file out)))) | |
640 | ||
0f6c7af8 SM |
641 | (provide 'vc-arch) |
642 | ||
0f6c7af8 | 643 | ;;; vc-arch.el ends here |