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