annotate lisp/vc-arch.el @ 81626:44c8071ceb57

*** empty log message ***
author Kenichi Handa <handa@m17n.org>
date Wed, 27 Jun 2007 00:37:28 +0000
parents 205f0e2270e9
children 0e6cd7deb746 988f1edc9674
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
75347
e3694f1cb928 Add 2007 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 74940
diff changeset
3 ;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
54396
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
64091
6fb026ad601f Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 63423
diff changeset
22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
6fb026ad601f Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 63423
diff changeset
23 ;; Boston, MA 02110-1301, USA.
54396
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
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
28 ;;
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
29 ;; http://www.gnuarch.org/
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
30 ;;
54396
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:
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
37 ;; - Open a file.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
38 ;; - C-x v = without any prefix arg.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
39 ;; - C-x v v to commit a change to a single file.
54396
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
54415
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
43 ;; - *VC-log*'s initial content lacks the `Summary:' lines.
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
44 ;; - All files under the tree are considered as "under Arch's control"
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
45 ;; without regards to =tagging-method and such.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
46 ;; - Files are always considered as `edited'.
54415
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
47 ;; - C-x v l does not work.
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
48 ;; - C-x v i does not work.
54415
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
49 ;; - C-x v ~ does not work.
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
50 ;; - C-x v u does not work.
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
51 ;; - C-x v s does not work.
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
52 ;; - C-x v r does not work.
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
53 ;; - VC-dired does not work.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
54 ;; - And more...
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
55
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
56 ;;; Code:
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
57
54532
87ca639a4eca Require CL for `case'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54531
diff changeset
58 (eval-when-compile (require 'vc) (require 'cl))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
59
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
60 ;;;
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
61 ;;; Customization options
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
62 ;;;
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 (defvar vc-arch-command
81379
fa58a242b75e (vc-arch-command): Remove bzr. It's a different program.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81326
diff changeset
65 (let ((candidates '("tla" "baz")))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
66 (while (and candidates (not (executable-find (car candidates))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
67 (setq candidates (cdr candidates)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
68 (or (car candidates) "tla")))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
69
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
70 ;; 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
71 ;; new functions when we reload this file.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
72 (put 'Arch 'vc-functions nil)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
73
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
74 ;;;###autoload (defun vc-arch-registered (file)
57094
7883de80034e (vc-arch-root, vc-arch-registered): Use vc-find-root.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57026
diff changeset
75 ;;;###autoload (if (vc-find-root file "{arch}/=tagging-method")
7883de80034e (vc-arch-root, vc-arch-registered): Use vc-find-root.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57026
diff changeset
76 ;;;###autoload (progn
7883de80034e (vc-arch-root, vc-arch-registered): Use vc-find-root.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57026
diff changeset
77 ;;;###autoload (load "vc-arch")
7883de80034e (vc-arch-root, vc-arch-registered): Use vc-find-root.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57026
diff changeset
78 ;;;###autoload (vc-arch-registered file))))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
79
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
80 (defun vc-arch-add-tagline ()
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
81 "Add an `arch-tag' to the end of the current file."
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
82 (interactive)
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
83 (comment-normalize-vars)
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
84 (goto-char (point-max))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
85 (forward-comment -1)
81620
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
86 (skip-chars-forward " \t\n")
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
87 (cond
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
88 ((not (bolp)) (insert "\n\n"))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
89 ((not (eq ?\n (char-before (1- (point))))) (insert "\n")))
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
90 (let ((beg (point))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
91 (idfile (and buffer-file-name
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
92 (expand-file-name
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
93 (concat ".arch-ids/"
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
94 (file-name-nondirectory buffer-file-name)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
95 ".id")
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
96 (file-name-directory buffer-file-name)))))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
97 (insert "arch-tag: ")
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
98 (if (and idfile (file-exists-p idfile))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
99 ;; If the file is unreadable, we do want to get an error here.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
100 (progn
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
101 (insert-file-contents idfile)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
102 (forward-line 1)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
103 (delete-file idfile))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
104 (condition-case nil
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
105 (call-process "uuidgen" nil t)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
106 (file-error (insert (format "%s <%s> %s"
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
107 (current-time-string)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
108 user-mail-address
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
109 (+ (nth 2 (current-time))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
110 (buffer-size)))))))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
111 (comment-region beg (point))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
112
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
113 (defconst vc-arch-tagline-re "^\\W*arch-tag:[ \t]*\\(.*[^ \t\n]\\)")
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
114
76769
3693d2ee35b8 (vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75469
diff changeset
115 (defmacro vc-with-current-file-buffer (file &rest body)
3693d2ee35b8 (vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75469
diff changeset
116 (declare (indent 2) (debug t))
3693d2ee35b8 (vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75469
diff changeset
117 `(let ((-kill-buf- nil)
3693d2ee35b8 (vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75469
diff changeset
118 (-file- ,file))
3693d2ee35b8 (vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75469
diff changeset
119 (with-current-buffer (or (find-buffer-visiting -file-)
3693d2ee35b8 (vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75469
diff changeset
120 (setq -kill-buf- (generate-new-buffer " temp")))
3693d2ee35b8 (vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75469
diff changeset
121 ;; Avoid find-file-literally since it can do many undesirable extra
3693d2ee35b8 (vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75469
diff changeset
122 ;; things (among which, call us back into an infinite loop).
3693d2ee35b8 (vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75469
diff changeset
123 (if -kill-buf- (insert-file-contents -file-))
3693d2ee35b8 (vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75469
diff changeset
124 (unwind-protect
3693d2ee35b8 (vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75469
diff changeset
125 (progn ,@body)
3693d2ee35b8 (vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75469
diff changeset
126 (if (buffer-live-p -kill-buf-) (kill-buffer -kill-buf-))))))
3693d2ee35b8 (vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75469
diff changeset
127
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
128 (defun vc-arch-file-source-p (file)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
129 "Can return nil, `maybe' or a non-nil value.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
130 Only the value `maybe' can be trusted :-(."
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
131 ;; FIXME: Check the tag and name of parent dirs.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
132 (unless (string-match "\\`[,+]" (file-name-nondirectory file))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
133 (or (string-match "\\`{arch}/"
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
134 (file-relative-name file (vc-arch-root file)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
135 (file-exists-p
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
136 ;; Check the presence of an ID file.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
137 (expand-file-name
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
138 (concat ".arch-ids/" (file-name-nondirectory file) ".id")
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
139 (file-name-directory file)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
140 ;; Check the presence of a tagline.
76769
3693d2ee35b8 (vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75469
diff changeset
141 (vc-with-current-file-buffer file
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
142 (save-excursion
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
143 (goto-char (point-max))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
144 (or (re-search-backward vc-arch-tagline-re (- (point) 1000) t)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
145 (progn
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
146 (goto-char (point-min))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
147 (re-search-forward vc-arch-tagline-re (+ (point) 1000) t)))))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
148 ;; FIXME: check =tagging-method to see whether untagged files might
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
149 ;; be source or not.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
150 (with-current-buffer
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
151 (find-file-noselect (expand-file-name "{arch}/=tagging-method"
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
152 (vc-arch-root file)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
153 (let ((untagged-source t)) ;Default is `names'.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
154 (save-excursion
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
155 (goto-char (point-min))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
156 (if (re-search-forward "^[ \t]*\\(\\(tagline\\|implicit\\|names\\)\\|explicit\\)" nil t)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
157 (setq untagged-source (match-end 2)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
158 (if (re-search-forward "^[ \t]*untagged-source[ \t]+\\(\\(source\\)\\|precious\\|backup\\|junk\\|unrecognized\\)" nil t)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
159 (setq untagged-source (match-end 2))))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
160 (if untagged-source 'maybe))))))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
161
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
162 (defun vc-arch-file-id (file)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
163 ;; Don't include the kind of ID this is because it seems to be too messy.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
164 (let ((idfile (expand-file-name
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
165 (concat ".arch-ids/" (file-name-nondirectory file) ".id")
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
166 (file-name-directory file))))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
167 (if (file-exists-p idfile)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
168 (with-temp-buffer
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
169 (insert-file-contents idfile)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
170 (looking-at ".*[^ \n\t]")
75469
d2adef0ec2f0 (vc-arch-file-id): Move with-current-buffer inside the if.
Richard M. Stallman <rms@gnu.org>
parents: 75347
diff changeset
171 (match-string 0))
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
172 (with-current-buffer (find-file-noselect file)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
173 (save-excursion
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
174 (goto-char (point-max))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
175 (if (or (re-search-backward vc-arch-tagline-re (- (point) 1000) t)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
176 (progn
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
177 (goto-char (point-min))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
178 (re-search-forward vc-arch-tagline-re (+ (point) 1000) t)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
179 (match-string 1)
75469
d2adef0ec2f0 (vc-arch-file-id): Move with-current-buffer inside the if.
Richard M. Stallman <rms@gnu.org>
parents: 75347
diff changeset
180 (concat "./" (file-relative-name file (vc-arch-root file)))))))))
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
181
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
182 (defun vc-arch-tagging-method (file)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
183 (with-current-buffer
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
184 (find-file-noselect
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
185 (expand-file-name "{arch}/=tagging-method" (vc-arch-root file)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
186 (save-excursion
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
187 (goto-char (point-min))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
188 (if (re-search-forward
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
189 "^[ \t]*\\(tagline\\|implicit\\|names\\|explicit\\)" nil t)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
190 (intern (match-string 1))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
191 'names))))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
192
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
193 (defun vc-arch-root (file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
194 "Return the root directory of a Arch project, if any."
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
195 (or (vc-file-getprop file 'arch-root)
63423
8269aa11cce4 (vc-arch-checkin, vc-arch-diff): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents: 59444
diff changeset
196 (vc-file-setprop
57094
7883de80034e (vc-arch-root, vc-arch-registered): Use vc-find-root.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57026
diff changeset
197 ;; Check the =tagging-method, in case someone naively manually
7883de80034e (vc-arch-root, vc-arch-registered): Use vc-find-root.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57026
diff changeset
198 ;; creates a {arch} directory somewhere.
7883de80034e (vc-arch-root, vc-arch-registered): Use vc-find-root.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57026
diff changeset
199 file 'arch-root (vc-find-root file "{arch}/=tagging-method"))))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
200
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
201 (defun vc-arch-register (file &optional rev comment)
54806
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
202 (if rev (error "Explicit initial revision not supported for Arch"))
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
203 (let ((tagmet (vc-arch-tagging-method file)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
204 (if (and (memq tagmet '(tagline implicit)) comment-start)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
205 (with-current-buffer (find-file-noselect file)
54806
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
206 (if (buffer-modified-p)
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
207 (error "Save %s first" (buffer-name)))
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
208 (vc-arch-add-tagline)
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
209 (save-buffer))
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
210 (vc-arch-command nil 0 file "add"))))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
211
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
212 (defun vc-arch-registered (file)
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
213 ;; Don't seriously check whether it's source or not. Checking would
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
214 ;; require running TLA, so it's better to not do it, so it also works if
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
215 ;; TLA is not installed.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
216 (and (vc-arch-root file)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
217 (vc-arch-file-source-p file)))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
218
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
219 (defun vc-arch-default-version (file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
220 (or (vc-file-getprop (vc-arch-root file) 'arch-default-version)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
221 (let* ((root (vc-arch-root file))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
222 (f (expand-file-name "{arch}/++default-version" root)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
223 (if (file-readable-p f)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
224 (vc-file-setprop
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
225 root 'arch-default-version
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
226 (with-temp-buffer
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
227 (insert-file-contents f)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
228 ;; Strip the terminating newline.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
229 (buffer-substring (point-min) (1- (point-max)))))))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
230
54409
a9f1e9611612 (vc-arch-workfile-unchanged-p): Define to avoid dup-diff.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54396
diff changeset
231 (defun vc-arch-workfile-unchanged-p (file)
a9f1e9611612 (vc-arch-workfile-unchanged-p): Define to avoid dup-diff.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54396
diff changeset
232 "Check if FILE is unchanged by diffing against the master version.
a9f1e9611612 (vc-arch-workfile-unchanged-p): Define to avoid dup-diff.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54396
diff changeset
233 Return non-nil if FILE is unchanged."
a9f1e9611612 (vc-arch-workfile-unchanged-p): Define to avoid dup-diff.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54396
diff changeset
234 nil)
a9f1e9611612 (vc-arch-workfile-unchanged-p): Define to avoid dup-diff.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54396
diff changeset
235
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
236 (defun vc-arch-state (file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
237 ;; There's no checkout operation and merging is not done from VC
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
238 ;; 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
239 ;; which is only activated if the file is `edited'.
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
240 (let* ((root (vc-arch-root file))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
241 (ver (vc-arch-default-version file))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
242 (pat (concat "\\`" (subst-char-in-string ?/ ?% ver)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
243 (dir (expand-file-name ",,inode-sigs/"
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
244 (expand-file-name "{arch}" root)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
245 (sigfile nil))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
246 (dolist (f (if (file-directory-p dir) (directory-files dir t pat)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
247 (if (or (not sigfile) (file-newer-than-file-p f sigfile))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
248 (setq sigfile f)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
249 (if (not sigfile)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
250 'edited ;We know nothing.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
251 (let ((id (vc-arch-file-id file)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
252 (setq id (replace-regexp-in-string "[ \t]" "_" id))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
253 (with-current-buffer (find-file-noselect sigfile)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
254 (goto-char (point-min))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
255 (while (and (search-forward id nil 'move)
57026
992d9837a265 (vc-arch-state): Fix parsing for `names' method.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56954
diff changeset
256 (save-excursion
992d9837a265 (vc-arch-state): Fix parsing for `names' method.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56954
diff changeset
257 (goto-char (- (match-beginning 0) 2))
992d9837a265 (vc-arch-state): Fix parsing for `names' method.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56954
diff changeset
258 ;; For `names', the lines start with `?./foo/bar'.
992d9837a265 (vc-arch-state): Fix parsing for `names' method.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56954
diff changeset
259 ;; For others there's 2 chars before the ./foo/bar.
992d9837a265 (vc-arch-state): Fix parsing for `names' method.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56954
diff changeset
260 (or (not (or (bolp) (looking-at "\n?")))
992d9837a265 (vc-arch-state): Fix parsing for `names' method.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56954
diff changeset
261 ;; Ignore E_ entries used for foo.id files.
992d9837a265 (vc-arch-state): Fix parsing for `names' method.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56954
diff changeset
262 (looking-at "E_")))))
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
263 (if (eobp)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
264 ;; ID not found.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
265 (if (equal (file-name-nondirectory sigfile)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
266 (subst-char-in-string
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
267 ?/ ?% (vc-arch-workfile-version file)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
268 'added
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
269 ;; Might be `added' or `up-to-date' as well.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
270 ;; FIXME: Check in the patch logs to find out.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
271 'edited)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
272 ;; Found the ID, let's check the inode.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
273 (if (not (re-search-forward
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
274 "\t.*mtime=\\([0-9]+\\):size=\\([0-9]+\\)"
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
275 (line-end-position) t))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
276 ;; Buh? Unexpected format.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
277 'edited
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
278 (let ((ats (file-attributes file)))
55873
304d478aa594 (vc-arch-state): Don't assume the file exists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55814
diff changeset
279 (if (and (eq (nth 7 ats) (string-to-number (match-string 2)))
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
280 (equal (format-time-string "%s" (nth 5 ats))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
281 (match-string 1)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
282 'up-to-date
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
283 'edited)))))))))
54806
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
284
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
285 (defun vc-arch-workfile-version (file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
286 (let* ((root (expand-file-name "{arch}" (vc-arch-root file)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
287 (defbranch (vc-arch-default-version file)))
59313
ad91f130fbdf (vc-arch-workfile-version): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59312
diff changeset
288 (when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*?\\)\\(?:--.*\\)?\\)--.*\\)\\'" defbranch))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
289 (let* ((archive (match-string 1 defbranch))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
290 (category (match-string 4 defbranch))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
291 (branch (match-string 3 defbranch))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
292 (version (match-string 2 defbranch))
54415
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
293 (sealed nil) (rev-nb 0)
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
294 (rev nil)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
295 logdir tmp)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
296 (setq logdir (expand-file-name category root))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
297 (setq logdir (expand-file-name branch logdir))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
298 (setq logdir (expand-file-name version logdir))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
299 (setq logdir (expand-file-name archive logdir))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
300 (setq logdir (expand-file-name "patch-log" logdir))
57566
d50f313f6fdd (vc-arch-workfile-version): Don't burp if the patch-log directory is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57094
diff changeset
301 (dolist (file (if (file-directory-p logdir) (directory-files logdir)))
d50f313f6fdd (vc-arch-workfile-version): Don't burp if the patch-log directory is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57094
diff changeset
302 ;; Revision names go: base-0, patch-N, version-0, versionfix-M.
54415
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
303 (when (and (eq (aref file 0) ?v) (not sealed))
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
304 (setq sealed t rev-nb 0))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
305 (if (and (string-match "-\\([0-9]+\\)\\'" file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
306 (setq tmp (string-to-number (match-string 1 file)))
54415
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
307 (or (not sealed) (eq (aref file 0) ?v))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
308 (>= tmp rev-nb))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
309 (setq rev-nb tmp rev file)))
56954
242cddb00aef (vc-arch-workfile-version): Handle the special case before the first commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56283
diff changeset
310 ;; Use "none-000" if the tree hasn't yet been committed on the
242cddb00aef (vc-arch-workfile-version): Handle the special case before the first commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56283
diff changeset
311 ;; default branch. We'll then get "Arch:000[branch]" on the mode-line.
242cddb00aef (vc-arch-workfile-version): Handle the special case before the first commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56283
diff changeset
312 (concat defbranch "--" (or rev "none-000"))))))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
313
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
314
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
315 (defcustom vc-arch-mode-line-rewrite
54415
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
316 '(("\\`.*--\\(.*--.*\\)--\\(v?\\).*-\\([0-9]+\\)\\'" . "\\2\\3[\\1]"))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
317 "Rewrite rules to shorten Arch's revision names on the mode-line."
56283
9d529d2aac14 (vc-arch-mode-line-rewrite): Add :group 'vc.
Kim F. Storm <storm@cua.dk>
parents: 55873
diff changeset
318 :type '(repeat (cons regexp string))
9d529d2aac14 (vc-arch-mode-line-rewrite): Add :group 'vc.
Kim F. Storm <storm@cua.dk>
parents: 55873
diff changeset
319 :group 'vc)
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
320
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
321 (defun vc-arch-mode-line-string (file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
322 "Return string for placement in modeline by `vc-mode-line' for FILE."
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
323 (let ((rev (vc-workfile-version file)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
324 (dolist (rule vc-arch-mode-line-rewrite)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
325 (if (string-match (car rule) rev)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
326 (setq rev (replace-match (cdr rule) t nil rev))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
327 (format "Arch%c%s"
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
328 (case (vc-state file)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
329 ((up-to-date needs-patch) ?-)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
330 (added ?@)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
331 (t ?:))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
332 rev)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
333
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
334 (defun vc-arch-diff3-rej-p (rej)
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
335 (let ((attrs (file-attributes rej)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
336 (and attrs (< (nth 7 attrs) 60)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
337 (with-temp-buffer
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
338 (insert-file-contents rej)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
339 (goto-char (point-min))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
340 (looking-at "Conflicts occured, diff3 conflict markers left in file\\.")))))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
341
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
342 (defun vc-arch-delete-rej-if-obsolete ()
54806
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
343 "For use in `after-save-hook'."
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
344 (save-excursion
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
345 (let ((rej (concat buffer-file-name ".rej")))
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
346 (when (and buffer-file-name (vc-arch-diff3-rej-p rej))
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
347 (if (not (re-search-forward "^<<<<<<< " nil t))
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
348 ;; The .rej file is obsolete.
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
349 (condition-case nil (delete-file rej) (error nil)))))))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
350
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
351 (defun vc-arch-find-file-hook ()
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
352 (let ((rej (concat buffer-file-name ".rej")))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
353 (when (and buffer-file-name (file-exists-p rej))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
354 (if (vc-arch-diff3-rej-p rej)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
355 (save-excursion
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
356 (goto-char (point-min))
54806
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
357 (if (not (re-search-forward "^<<<<<<< " nil t))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
358 ;; The .rej file is obsolete.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
359 (condition-case nil (delete-file rej) (error nil))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
360 (smerge-mode 1)
54806
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
361 (add-hook 'after-save-hook
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
362 'vc-arch-delete-rej-if-obsolete nil t)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
363 (message "There are unresolved conflicts in this file")))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
364 (message "There are unresolved conflicts in %s"
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
365 (file-name-nondirectory rej))))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
366
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
367 (defun vc-arch-find-file-not-found-hook ()
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
368 ;; Do nothing. We are not sure whether the file is `source' or not,
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
369 ;; so we shouldn't ask the user whether she wants to check it out.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
370 )
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
371
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
372 (defun vc-arch-checkout-model (file) 'implicit)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
373
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
374 (defun vc-arch-checkin (file rev comment)
63423
8269aa11cce4 (vc-arch-checkin, vc-arch-diff): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents: 59444
diff changeset
375 (if rev (error "Committing to a specific revision is unsupported"))
54415
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
376 (let ((summary (file-relative-name file (vc-arch-root file))))
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
377 ;; Extract a summary from the comment.
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
378 (when (or (string-match "\\`Summary:[ \t]*\\(.*[^ \t\n]\\)\\([ \t]*\n\\)*" comment)
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
379 (string-match "\\`[ \t]*\\(.*[^ \t\n]\\)[ \t]*\\(\n?\\'\\|\n\\([ \t]*\n\\)+\\)" comment))
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
380 (setq summary (match-string 1 comment))
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
381 (setq comment (substring comment (match-end 0))))
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
382 (vc-arch-command nil 0 file "commit" "-s" summary "-L" comment "--"
504aef04e493 (vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54409
diff changeset
383 (vc-switches 'Arch 'checkin))))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
384
55814
45f2afeb662b (vc-arch-diff): Add optional `buffer' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54806
diff changeset
385 (defun vc-arch-diff (file &optional oldvers newvers buffer)
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
386 "Get a difference report using Arch between two versions of FILE."
54531
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
387 (if (and newvers
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
388 (vc-up-to-date-p file)
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
389 (equal newvers (vc-workfile-version file)))
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
390 ;; Newvers is the base revision and the current file is unchanged,
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
391 ;; so we can diff with the current file.
2ae29225b85c (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54415
diff changeset
392 (setq newvers nil))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
393 (if newvers
63423
8269aa11cce4 (vc-arch-checkin, vc-arch-diff): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents: 59444
diff changeset
394 (error "Diffing specific revisions not implemented")
59444
5173e8c74cae (vc-arch-diff): Don't diff asynchronously if vc-disable-async-diff is
André Spiegel <spiegel@gnu.org>
parents: 59313
diff changeset
395 (let* ((async (and (not vc-disable-async-diff) (fboundp 'start-process)))
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
396 ;; Run the command from the root dir.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
397 (default-directory (vc-arch-root file))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
398 (status
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
399 (vc-arch-command
55814
45f2afeb662b (vc-arch-diff): Add optional `buffer' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54806
diff changeset
400 (or buffer "*vc-diff*")
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
401 (if async 'async 1)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
402 nil "file-diffs"
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
403 ;; Arch does not support the typical flags.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
404 ;; (vc-switches 'Arch 'diff)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
405 (file-relative-name file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
406 (if (equal oldvers (vc-workfile-version file))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
407 nil
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
408 oldvers))))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
409 (if async 1 status)))) ; async diff, pessimistic assumption.
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
410
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
411 (defun vc-arch-delete-file (file)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
412 (vc-arch-command nil 0 file "rm"))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
413
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
414 (defun vc-arch-rename-file (old new)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
415 (vc-arch-command nil 0 new "mv" (file-relative-name old)))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
416
54806
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
417 (defalias 'vc-arch-responsible-p 'vc-arch-root)
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
418
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
419 (defun vc-arch-command (buffer okstatus file &rest flags)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
420 "A wrapper around `vc-do-command' for use in vc-arch.el."
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
421 (apply 'vc-do-command buffer okstatus vc-arch-command file flags))
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
422
54806
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
423 (defun vc-arch-init-version () nil)
e16241d08bbc (vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54532
diff changeset
424
81620
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
425 ;;; Completion of versions and revisions.
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
426
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
427 (defun vc-arch-complete (table string pred action)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
428 (assert (not (functionp table)))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
429 (cond
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
430 ((null action) (try-completion string table pred))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
431 ((eq action t) (all-completions string table pred))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
432 (t (test-completion string table pred))))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
433
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
434 (defun vc-arch--version-completion-table (root string)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
435 (delq nil
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
436 (mapcar
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
437 (lambda (d)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
438 (when (string-match "/\\([^/]+\\)/\\([^/]+\\)\\'" d)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
439 (concat (match-string 2 d) "/" (match-string 1 d))))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
440 (let ((default-directory root))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
441 (file-expand-wildcards
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
442 (concat "*/*/"
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
443 (if (string-match "/" string)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
444 (concat (substring string (match-end 0))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
445 "*/" (substring string 0 (match-beginning 0)))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
446 (concat "*/" string))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
447 "*"))))))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
448
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
449 (defun vc-arch-revision-completion-table (file)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
450 (lexical-let ((file file))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
451 (lambda (string pred action)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
452 ;; FIXME: complete revision patches as well.
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
453 (let ((root (expand-file-name "{arch}" (vc-arch-root file))))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
454 (vc-arch-complete
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
455 (vc-arch--version-completion-table root string)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
456 string pred action)))))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
457
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
458 ;;; Trimming revision libraries.
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
459
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
460 ;; This code is not directly related to VC and there are many variants of
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
461 ;; this functionality available as scripts, but I like this version better,
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
462 ;; so maybe others will like it too.
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
463
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
464 (defun vc-arch-trim-find-least-useful-rev (revs)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
465 (let* ((first (pop revs))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
466 (second (pop revs))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
467 (third (pop revs))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
468 ;; We try to give more importance to recent revisions. The idea is
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
469 ;; that it's OK if checking out a revision 1000-patch-old is ten
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
470 ;; times slower than checking out a revision 100-patch-old. But at
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
471 ;; the same time a 2-patch-old rev isn't really ten times more
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
472 ;; important than a 20-patch-old, so we use an arbitrary constant
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
473 ;; "100" to reduce this effect for recent revisions. Making this
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
474 ;; constant a float has the side effect of causing the subsequent
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
475 ;; computations to be done as floats as well.
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
476 (max (+ 100.0 (car (or (car (last revs)) third))))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
477 (cost (lambda () (/ (- (car third) (car first)) (- max (car second)))))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
478 (minrev second)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
479 (mincost (funcall cost)))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
480 (while revs
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
481 (setq first second)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
482 (setq second third)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
483 (setq third (pop revs))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
484 (when (< (funcall cost) mincost)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
485 (setq minrev second)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
486 (setq mincost (funcall cost))))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
487 minrev))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
488
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
489 (defun vc-arch-trim-make-sentinel (revs)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
490 (if (null revs) (lambda (proc msg) (message "VC-Arch trimming ... done"))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
491 `(lambda (proc msg)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
492 (message "VC-Arch trimming %s..." ',(file-name-nondirectory (car revs)))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
493 (rename-file ,(car revs) ,(concat (car revs) "*rm*"))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
494 (setq proc (start-process "vc-arch-trim" nil
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
495 "rm" "-rf" ',(concat (car revs) "*rm*")))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
496 (set-process-sentinel proc (vc-arch-trim-make-sentinel ',(cdr revs))))))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
497
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
498 (defun vc-arch-trim-one-revlib (dir)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
499 "Delete half of the revisions in the revision library."
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
500 (interactive "Ddirectory: ")
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
501 (let ((revs
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
502 (sort (delq nil
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
503 (mapcar
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
504 (lambda (f)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
505 (when (string-match "-\\([0-9]+\\)\\'" f)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
506 (cons (string-to-number (match-string 1 f)) f)))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
507 (directory-files dir nil nil 'nosort)))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
508 'car-less-than-car))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
509 (subdirs nil))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
510 (when (cddr revs)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
511 (dotimes (i (/ (length revs) 2))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
512 (let ((minrev (vc-arch-trim-find-least-useful-rev revs)))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
513 (setq revs (delq minrev revs))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
514 (push minrev subdirs)))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
515 (funcall (vc-arch-trim-make-sentinel
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
516 (mapcar (lambda (x) (expand-file-name (cdr x) dir)) subdirs))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
517 nil nil))))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
518
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
519 (defun vc-arch-trim-revlib ()
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
520 "Delete half of the revisions in the revision library."
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
521 (interactive)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
522 (let ((rl-dir (with-output-to-string
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
523 (call-process vc-arch-command nil standard-output nil
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
524 "my-revision-library"))))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
525 (while (string-match "\\(.*\\)\n" rl-dir)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
526 (let ((dir (match-string 1 rl-dir)))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
527 (setq rl-dir
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
528 (if (and (file-directory-p dir) (file-writable-p dir))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
529 dir
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
530 (substring rl-dir (match-end 0))))))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
531 (unless (file-writable-p rl-dir)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
532 (error "No writable revlib directory found"))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
533 (message "Revlib at %s" rl-dir)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
534 (let* ((archives (directory-files rl-dir 'full "[^.]\\|..."))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
535 (categories
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
536 (apply 'append
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
537 (mapcar (lambda (dir)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
538 (when (file-directory-p dir)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
539 (directory-files dir 'full "[^.]\\|...")))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
540 archives)))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
541 (branches
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
542 (apply 'append
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
543 (mapcar (lambda (dir)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
544 (when (file-directory-p dir)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
545 (directory-files dir 'full "[^.]\\|...")))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
546 categories)))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
547 (versions
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
548 (apply 'append
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
549 (mapcar (lambda (dir)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
550 (when (file-directory-p dir)
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
551 (directory-files dir 'full "--.*--")))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
552 branches))))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
553 (mapc 'vc-arch-trim-one-revlib versions))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
554 ))
205f0e2270e9 (vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81379
diff changeset
555
74940
f0d812b53a76 (vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
556 ;;; Less obvious implementations.
f0d812b53a76 (vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
557
f0d812b53a76 (vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
558 (defun vc-arch-find-version (file rev buffer)
f0d812b53a76 (vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
559 (let ((out (make-temp-file "vc-out")))
f0d812b53a76 (vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
560 (unwind-protect
f0d812b53a76 (vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
561 (progn
f0d812b53a76 (vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
562 (with-temp-buffer
f0d812b53a76 (vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
563 (vc-arch-command (current-buffer) 1 nil "file-diffs" file rev)
f0d812b53a76 (vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
564 (call-process-region (point-min) (point-max)
f0d812b53a76 (vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
565 "patch" nil nil nil "-R" "-o" out file))
f0d812b53a76 (vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
566 (with-current-buffer buffer
f0d812b53a76 (vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
567 (insert-file-contents out)))
f0d812b53a76 (vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
568 (delete-file out))))
f0d812b53a76 (vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
569
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
570 (provide 'vc-arch)
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
571
56954
242cddb00aef (vc-arch-workfile-version): Handle the special case before the first commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56283
diff changeset
572 ;; arch-tag: a35c7c1c-5237-429d-88ef-3d718fd2e704
54396
7739fb21ca7f New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
573 ;;; vc-arch.el ends here