Commit | Line | Data |
---|---|---|
b6e0e86c SM |
1 | ;;; vc-bzr.el --- VC backend for the bzr revision control system |
2 | ||
f4d0cf23 | 3 | ;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. |
b6e0e86c | 4 | |
b6e0e86c SM |
5 | ;; Author: Dave Love <fx@gnu.org>, Riccardo Murri <riccardo.murri@gmail.com> |
6 | ;; Keywords: tools | |
7 | ;; Created: Sept 2006 | |
f4d0cf23 | 8 | ;; Version: 2008-01-04 (Bzr revno 25) |
b6e0e86c SM |
9 | ;; URL: http://launchpad.net/vc-bzr |
10 | ||
eb3fa2cf GM |
11 | ;; This file is part of GNU Emacs. |
12 | ||
13 | ;; GNU Emacs is free software: you can redistribute it and/or modify | |
b6e0e86c | 14 | ;; it under the terms of the GNU General Public License as published by |
eb3fa2cf GM |
15 | ;; the Free Software Foundation, either version 3 of the License, or |
16 | ;; (at your option) any later version. | |
b6e0e86c | 17 | |
eb3fa2cf | 18 | ;; GNU Emacs is distributed in the hope that it will be useful, |
b6e0e86c SM |
19 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
20 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 | ;; GNU General Public License for more details. | |
22 | ||
23 | ;; You should have received a copy of the GNU General Public License | |
eb3fa2cf | 24 | ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
b6e0e86c SM |
25 | |
26 | ;;; Commentary: | |
27 | ||
f4d0cf23 SM |
28 | ;; See <URL:http://bazaar-vcs.org/> concerning bzr. See |
29 | ;; <URL:http://launchpad.net/vc-bzr> for alternate development | |
30 | ;; branches of `vc-bzr'. | |
b6e0e86c | 31 | |
eb3fa2cf | 32 | ;; Load this library to register bzr support in VC. |
77b5d458 SM |
33 | |
34 | ;; Known bugs | |
35 | ;; ========== | |
36 | ||
37 | ;; When edititing a symlink and *both* the symlink and its target | |
38 | ;; are bzr-versioned, `vc-bzr` presently runs `bzr status` on the | |
39 | ;; symlink, thereby not detecting whether the actual contents | |
eb3fa2cf | 40 | ;; (that is, the target contents) are changed. |
77b5d458 SM |
41 | ;; See https://bugs.launchpad.net/vc-bzr/+bug/116607 |
42 | ||
43 | ;; For an up-to-date list of bugs, please see: | |
44 | ;; https://bugs.launchpad.net/vc-bzr/+bugs | |
b6e0e86c | 45 | |
70e2f6c7 ER |
46 | ;;; Properties of the backend |
47 | ||
48 | (defun vc-bzr-revision-granularity () 'repository) | |
49 | (defun vc-bzr-checkout-model (files) 'implicit) | |
b6e0e86c SM |
50 | |
51 | ;;; Code: | |
52 | ||
53 | (eval-when-compile | |
37320a58 | 54 | (require 'cl) |
a0c38937 DN |
55 | (require 'vc) ;; for vc-exec-after |
56 | (require 'vc-dir)) | |
b6e0e86c | 57 | |
360cf7bc SM |
58 | ;; Clear up the cache to force vc-call to check again and discover |
59 | ;; new functions when we reload this file. | |
4211679b | 60 | (put 'Bzr 'vc-functions nil) |
360cf7bc | 61 | |
b6e0e86c SM |
62 | (defgroup vc-bzr nil |
63 | "VC bzr backend." | |
fba500b6 | 64 | :version "22.2" |
b6e0e86c SM |
65 | :group 'vc) |
66 | ||
67 | (defcustom vc-bzr-program "bzr" | |
37320a58 | 68 | "Name of the bzr command (excluding any arguments)." |
b6e0e86c SM |
69 | :group 'vc-bzr |
70 | :type 'string) | |
71 | ||
b6e0e86c | 72 | (defcustom vc-bzr-diff-switches nil |
37320a58 | 73 | "String/list of strings specifying extra switches for bzr diff under VC." |
b6e0e86c SM |
74 | :type '(choice (const :tag "None" nil) |
75 | (string :tag "Argument String") | |
76 | (repeat :tag "Argument List" :value ("") string)) | |
77 | :group 'vc-bzr) | |
78 | ||
f4d0cf23 SM |
79 | (defcustom vc-bzr-log-switches nil |
80 | "String/list of strings specifying extra switches for `bzr log' under VC." | |
81 | :type '(choice (const :tag "None" nil) | |
82 | (string :tag "Argument String") | |
83 | (repeat :tag "Argument List" :value ("") string)) | |
84 | :group 'vc-bzr) | |
85 | ||
37320a58 SM |
86 | ;; since v0.9, bzr supports removing the progress indicators |
87 | ;; by setting environment variable BZR_PROGRESS_BAR to "none". | |
8cdd17b4 | 88 | (defun vc-bzr-command (bzr-command buffer okstatus file-or-list &rest args) |
37320a58 | 89 | "Wrapper round `vc-do-command' using `vc-bzr-program' as COMMAND. |
f4d0cf23 SM |
90 | Invoke the bzr command adding `BZR_PROGRESS_BAR=none' and |
91 | `LC_MESSAGES=C' to the environment." | |
37320a58 SM |
92 | (let ((process-environment |
93 | (list* "BZR_PROGRESS_BAR=none" ; Suppress progress output (bzr >=0.9) | |
f4d0cf23 | 94 | "LC_MESSAGES=C" ; Force English output |
a460c94c | 95 | process-environment))) |
2888a97e | 96 | (apply 'vc-do-command (or buffer "*vc*") okstatus vc-bzr-program |
f4d0cf23 | 97 | file-or-list bzr-command args))) |
b6e0e86c | 98 | |
37320a58 SM |
99 | |
100 | ;;;###autoload | |
f4d0cf23 | 101 | (defconst vc-bzr-admin-dirname ".bzr" |
b6e6e09a | 102 | "Name of the directory containing Bzr repository status files.") |
a460c94c | 103 | ;;;###autoload |
b6e6e09a SM |
104 | (defconst vc-bzr-admin-checkout-format-file |
105 | (concat vc-bzr-admin-dirname "/checkout/format")) | |
a460c94c | 106 | (defconst vc-bzr-admin-dirstate |
b6e6e09a SM |
107 | (concat vc-bzr-admin-dirname "/checkout/dirstate")) |
108 | (defconst vc-bzr-admin-branch-format-file | |
109 | (concat vc-bzr-admin-dirname "/branch/format")) | |
a460c94c | 110 | (defconst vc-bzr-admin-revhistory |
b6e6e09a | 111 | (concat vc-bzr-admin-dirname "/branch/revision-history")) |
12451866 RF |
112 | (defconst vc-bzr-admin-lastrev |
113 | (concat vc-bzr-admin-dirname "/branch/last-revision")) | |
37320a58 SM |
114 | |
115 | ;;;###autoload (defun vc-bzr-registered (file) | |
b6e6e09a | 116 | ;;;###autoload (if (vc-find-root file vc-bzr-admin-checkout-format-file) |
37320a58 SM |
117 | ;;;###autoload (progn |
118 | ;;;###autoload (load "vc-bzr") | |
119 | ;;;###autoload (vc-bzr-registered file)))) | |
b6e0e86c | 120 | |
a460c94c SM |
121 | (defun vc-bzr-root (file) |
122 | "Return the root directory of the bzr repository containing FILE." | |
123 | ;; Cache technique copied from vc-arch.el. | |
124 | (or (vc-file-getprop file 'bzr-root) | |
b38f5e6f DN |
125 | (let ((root (vc-find-root file vc-bzr-admin-checkout-format-file))) |
126 | (when root (vc-file-setprop file 'bzr-root root))))) | |
b6e0e86c | 127 | |
82eb83ff | 128 | (require 'sha1) ;For sha1-program |
a460c94c | 129 | |
82eb83ff SM |
130 | (defun vc-bzr-sha1 (file) |
131 | (with-temp-buffer | |
132 | (set-buffer-multibyte nil) | |
133 | (let ((prog sha1-program) | |
134 | (args nil)) | |
135 | (when (consp prog) | |
136 | (setq args (cdr prog)) | |
137 | (setq prog (car prog))) | |
07c4b87c | 138 | (apply 'process-file prog (file-relative-name file) t nil args) |
82eb83ff SM |
139 | (buffer-substring (point-min) (+ (point-min) 40))))) |
140 | ||
141 | (defun vc-bzr-state-heuristic (file) | |
142 | "Like `vc-bzr-state' but hopefully without running Bzr." | |
143 | ;; `bzr status' is excrutiatingly slow with large histories and | |
144 | ;; pending merges, so try to avoid using it until they fix their | |
145 | ;; performance problems. | |
146 | ;; This function tries first to parse Bzr internal file | |
147 | ;; `checkout/dirstate', but it may fail if Bzr internal file format | |
148 | ;; has changed. As a safeguard, the `checkout/dirstate' file is | |
149 | ;; only parsed if it contains the string `#bazaar dirstate flat | |
150 | ;; format 3' in the first line. | |
151 | ;; If the `checkout/dirstate' file cannot be parsed, fall back to | |
152 | ;; running `vc-bzr-state'." | |
fba500b6 SM |
153 | (lexical-let ((root (vc-bzr-root file))) |
154 | (when root ; Short cut. | |
155 | ;; This looks at internal files. May break if they change | |
156 | ;; their format. | |
157 | (lexical-let ((dirstate (expand-file-name vc-bzr-admin-dirstate root))) | |
158 | (if (not (file-readable-p dirstate)) | |
159 | (vc-bzr-state file) ; Expensive. | |
160 | (with-temp-buffer | |
161 | (insert-file-contents dirstate) | |
162 | (goto-char (point-min)) | |
163 | (if (not (looking-at "#bazaar dirstate flat format 3")) | |
164 | (vc-bzr-state file) ; Some other unknown format? | |
165 | (let* ((relfile (file-relative-name file root)) | |
166 | (reldir (file-name-directory relfile))) | |
82eb83ff SM |
167 | (if (re-search-forward |
168 | (concat "^\0" | |
169 | (if reldir (regexp-quote | |
170 | (directory-file-name reldir))) | |
171 | "\0" | |
172 | (regexp-quote (file-name-nondirectory relfile)) | |
173 | "\0" | |
769087ce SM |
174 | "[^\0]*\0" ;id? |
175 | "\\([^\0]*\\)\0" ;"a/f/d", a=removed? | |
176 | "[^\0]*\0" ;sha1 (empty if conflicted)? | |
177 | "\\([^\0]*\\)\0" ;size? | |
178 | "[^\0]*\0" ;"y/n", executable? | |
179 | "[^\0]*\0" ;? | |
180 | "\\([^\0]*\\)\0" ;"a/f/d" a=added? | |
181 | "\\([^\0]*\\)\0" ;sha1 again? | |
182 | "[^\0]*\0" ;size again? | |
183 | "[^\0]*\0" ;"y/n", executable again? | |
184 | "[^\0]*\0" ;last revid? | |
185 | ;; There are more fields when merges are pending. | |
186 | ) | |
82eb83ff | 187 | nil t) |
769087ce SM |
188 | ;; Apparently the second sha1 is the one we want: when |
189 | ;; there's a conflict, the first sha1 is absent (and the | |
190 | ;; first size seems to correspond to the file with | |
191 | ;; conflict markers). | |
82eb83ff | 192 | (cond |
769087ce | 193 | ((eq (char-after (match-beginning 1)) ?a) 'removed) |
82eb83ff | 194 | ((eq (char-after (match-beginning 3)) ?a) 'added) |
769087ce | 195 | ((and (eq (string-to-number (match-string 2)) |
82eb83ff | 196 | (nth 7 (file-attributes file))) |
769087ce | 197 | (equal (match-string 4) |
82eb83ff SM |
198 | (vc-bzr-sha1 file))) |
199 | 'up-to-date) | |
200 | (t 'edited)) | |
201 | 'unregistered))))))))) | |
202 | ||
203 | (defun vc-bzr-registered (file) | |
204 | "Return non-nil if FILE is registered with bzr." | |
205 | (let ((state (vc-bzr-state-heuristic file))) | |
206 | (not (memq state '(nil unregistered ignored))))) | |
77b5d458 SM |
207 | |
208 | (defconst vc-bzr-state-words | |
33e5d7d4 | 209 | "added\\|ignored\\|kind changed\\|modified\\|removed\\|renamed\\|unknown" |
77b5d458 SM |
210 | "Regexp matching file status words as reported in `bzr' output.") |
211 | ||
b6e6e09a SM |
212 | (defun vc-bzr-file-name-relative (filename) |
213 | "Return file name FILENAME stripped of the initial Bzr repository path." | |
214 | (lexical-let* | |
215 | ((filename* (expand-file-name filename)) | |
f4d0cf23 | 216 | (rootdir (vc-bzr-root filename*))) |
def61be2 | 217 | (when rootdir |
b6e6e09a SM |
218 | (file-relative-name filename* rootdir)))) |
219 | ||
33e5d7d4 SM |
220 | (defun vc-bzr-status (file) |
221 | "Return FILE status according to Bzr. | |
222 | Return value is a cons (STATUS . WARNING), where WARNING is a | |
fba500b6 SM |
223 | string or nil, and STATUS is one of the symbols: `added', |
224 | `ignored', `kindchanged', `modified', `removed', `renamed', `unknown', | |
33e5d7d4 SM |
225 | which directly correspond to `bzr status' output, or 'unchanged |
226 | for files whose copy in the working tree is identical to the one | |
227 | in the branch repository, or nil for files that are not | |
228 | registered with Bzr. | |
229 | ||
230 | If any error occurred in running `bzr status', then return nil." | |
77b5d458 | 231 | (with-temp-buffer |
fba500b6 SM |
232 | (let ((ret (condition-case nil |
233 | (vc-bzr-command "status" t 0 file) | |
234 | (file-error nil))) ; vc-bzr-program not found. | |
235 | (status 'unchanged)) | |
236 | ;; the only secure status indication in `bzr status' output | |
237 | ;; is a couple of lines following the pattern:: | |
238 | ;; | <status>: | |
239 | ;; | <file name> | |
240 | ;; if the file is up-to-date, we get no status report from `bzr', | |
241 | ;; so if the regexp search for the above pattern fails, we consider | |
242 | ;; the file to be up-to-date. | |
243 | (goto-char (point-min)) | |
244 | (when (re-search-forward | |
245 | ;; bzr prints paths relative to the repository root. | |
246 | (concat "^\\(" vc-bzr-state-words "\\):[ \t\n]+" | |
247 | (regexp-quote (vc-bzr-file-name-relative file)) | |
f4d0cf23 SM |
248 | ;; Bzr appends a '/' to directory names and |
249 | ;; '*' to executable files | |
250 | (if (file-directory-p file) "/?" "\\*?") | |
fba500b6 SM |
251 | "[ \t\n]*$") |
252 | nil t) | |
6e98ad29 | 253 | (lexical-let ((statusword (match-string 1))) |
fba500b6 SM |
254 | ;; Erase the status text that matched. |
255 | (delete-region (match-beginning 0) (match-end 0)) | |
33e5d7d4 | 256 | (setq status |
f4d0cf23 | 257 | (intern (replace-regexp-in-string " " "" statusword))))) |
fba500b6 SM |
258 | (when status |
259 | (goto-char (point-min)) | |
260 | (skip-chars-forward " \n\t") ;Throw away spaces. | |
261 | (cons status | |
262 | ;; "bzr" will output warnings and informational messages to | |
263 | ;; stderr; due to Emacs' `vc-do-command' (and, it seems, | |
264 | ;; `start-process' itself) limitations, we cannot catch stderr | |
265 | ;; and stdout into different buffers. So, if there's anything | |
266 | ;; left in the buffer after removing the above status | |
267 | ;; keywords, let us just presume that any other message from | |
268 | ;; "bzr" is a user warning, and display it. | |
269 | (unless (eobp) (buffer-substring (point) (point-max)))))))) | |
a0e5e075 | 270 | |
33e5d7d4 SM |
271 | (defun vc-bzr-state (file) |
272 | (lexical-let ((result (vc-bzr-status file))) | |
273 | (when (consp result) | |
6efbb10c DN |
274 | (when (cdr result) |
275 | (message "Warnings in `bzr' output: %s" (cdr result))) | |
33e5d7d4 | 276 | (cdr (assq (car result) |
6a3f9bb7 | 277 | '((added . added) |
fba500b6 | 278 | (kindchanged . edited) |
33e5d7d4 SM |
279 | (renamed . edited) |
280 | (modified . edited) | |
54bf3704 | 281 | (removed . removed) |
3702367b | 282 | (ignored . ignored) |
54bf3704 | 283 | (unknown . unregistered) |
33e5d7d4 | 284 | (unchanged . up-to-date))))))) |
b6e0e86c | 285 | |
b0a08954 SM |
286 | (defun vc-bzr-resolve-when-done () |
287 | "Call \"bzr resolve\" if the conflict markers have been removed." | |
288 | (save-excursion | |
289 | (goto-char (point-min)) | |
290 | (unless (re-search-forward "^<<<<<<< " nil t) | |
291 | (vc-bzr-command "resolve" nil 0 buffer-file-name) | |
292 | ;; Remove the hook so that it is not called multiple times. | |
293 | (remove-hook 'after-save-hook 'vc-bzr-resolve-when-done t)))) | |
294 | ||
295 | (defun vc-bzr-find-file-hook () | |
296 | (when (and buffer-file-name | |
297 | ;; FIXME: We should check that "bzr status" says "conflict". | |
298 | (file-exists-p (concat buffer-file-name ".BASE")) | |
299 | (file-exists-p (concat buffer-file-name ".OTHER")) | |
300 | (file-exists-p (concat buffer-file-name ".THIS")) | |
301 | ;; If "bzr status" says there's a conflict but there are no | |
302 | ;; conflict markers, it's not clear what we should do. | |
303 | (save-excursion | |
304 | (goto-char (point-min)) | |
305 | (re-search-forward "^<<<<<<< " nil t))) | |
306 | ;; TODO: the merge algorithm used in `bzr merge' is nicely configurable, | |
307 | ;; but the one in `bzr pull' isn't, so it would be good to provide an | |
308 | ;; elisp function to remerge from the .BASE/OTHER/THIS files. | |
309 | (smerge-start-session) | |
310 | (add-hook 'after-save-hook 'vc-bzr-resolve-when-done nil t) | |
311 | (message "There are unresolved conflicts in this file"))) | |
312 | ||
b6e0e86c | 313 | (defun vc-bzr-workfile-unchanged-p (file) |
33e5d7d4 | 314 | (eq 'unchanged (car (vc-bzr-status file)))) |
b6e0e86c | 315 | |
ac3f4c6f | 316 | (defun vc-bzr-working-revision (file) |
82eb83ff SM |
317 | ;; Together with the code in vc-state-heuristic, this makes it possible |
318 | ;; to get the initial VC state of a Bzr file even if Bzr is not installed. | |
a460c94c SM |
319 | (lexical-let* |
320 | ((rootdir (vc-bzr-root file)) | |
6e98ad29 SM |
321 | (branch-format-file (expand-file-name vc-bzr-admin-branch-format-file |
322 | rootdir)) | |
323 | (revhistory-file (expand-file-name vc-bzr-admin-revhistory rootdir)) | |
324 | (lastrev-file (expand-file-name vc-bzr-admin-lastrev rootdir))) | |
325 | ;; This looks at internal files to avoid forking a bzr process. | |
326 | ;; May break if they change their format. | |
a460c94c | 327 | (if (file-exists-p branch-format-file) |
fba500b6 | 328 | (with-temp-buffer |
def61be2 | 329 | (insert-file-contents branch-format-file) |
a460c94c SM |
330 | (goto-char (point-min)) |
331 | (cond | |
332 | ((or | |
333 | (looking-at "Bazaar-NG branch, format 0.0.4") | |
334 | (looking-at "Bazaar-NG branch format 5")) | |
335 | ;; count lines in .bzr/branch/revision-history | |
def61be2 | 336 | (insert-file-contents revhistory-file) |
a460c94c SM |
337 | (number-to-string (count-lines (line-end-position) (point-max)))) |
338 | ((looking-at "Bazaar Branch Format 6 (bzr 0.15)") | |
339 | ;; revno is the first number in .bzr/branch/last-revision | |
def61be2 | 340 | (insert-file-contents lastrev-file) |
a460c94c SM |
341 | (if (re-search-forward "[0-9]+" nil t) |
342 | (buffer-substring (match-beginning 0) (match-end 0)))))) | |
343 | ;; fallback to calling "bzr revno" | |
b6e6e09a | 344 | (lexical-let* |
a460c94c | 345 | ((result (vc-bzr-command-discarding-stderr |
07c4b87c | 346 | vc-bzr-program "revno" (file-relative-name file))) |
b6e6e09a SM |
347 | (exitcode (car result)) |
348 | (output (cdr result))) | |
349 | (cond | |
350 | ((eq exitcode 0) (substring output 0 -1)) | |
351 | (t nil)))))) | |
b6e0e86c | 352 | |
a6ea7ffc | 353 | (defun vc-bzr-create-repo () |
4211679b | 354 | "Create a new Bzr repository." |
a6ea7ffc DN |
355 | (vc-bzr-command "init" nil 0 nil)) |
356 | ||
25a4ea6d | 357 | (defun vc-bzr-init-revision (&optional file) |
f4d0cf23 SM |
358 | "Always return nil, as Bzr cannot register explicit versions." |
359 | nil) | |
360 | ||
882e82db SM |
361 | (defun vc-bzr-previous-revision (file rev) |
362 | (if (string-match "\\`[0-9]+\\'" rev) | |
363 | (number-to-string (1- (string-to-number rev))) | |
364 | (concat "before:" rev))) | |
365 | ||
366 | (defun vc-bzr-next-revision (file rev) | |
367 | (if (string-match "\\`[0-9]+\\'" rev) | |
368 | (number-to-string (1+ (string-to-number rev))) | |
369 | (error "Don't know how to compute the next revision of %s" rev))) | |
370 | ||
8cdd17b4 | 371 | (defun vc-bzr-register (files &optional rev comment) |
b6e0e86c SM |
372 | "Register FILE under bzr. |
373 | Signal an error unless REV is nil. | |
374 | COMMENT is ignored." | |
5b5afd50 | 375 | (if rev (error "Can't register explicit revision with bzr")) |
8cdd17b4 | 376 | (vc-bzr-command "add" nil 0 files)) |
b6e0e86c SM |
377 | |
378 | ;; Could run `bzr status' in the directory and see if it succeeds, but | |
379 | ;; that's relatively expensive. | |
b6e6e09a | 380 | (defalias 'vc-bzr-responsible-p 'vc-bzr-root |
b6e0e86c SM |
381 | "Return non-nil if FILE is (potentially) controlled by bzr. |
382 | The criterion is that there is a `.bzr' directory in the same | |
37320a58 | 383 | or a superior directory.") |
b6e0e86c SM |
384 | |
385 | (defun vc-bzr-could-register (file) | |
386 | "Return non-nil if FILE could be registered under bzr." | |
387 | (and (vc-bzr-responsible-p file) ; shortcut | |
388 | (condition-case () | |
389 | (with-temp-buffer | |
390 | (vc-bzr-command "add" t 0 file "--dry-run") | |
391 | ;; The command succeeds with no output if file is | |
392 | ;; registered (in bzr 0.8). | |
360cf7bc | 393 | (goto-char (point-min)) |
b6e0e86c SM |
394 | (looking-at "added ")) |
395 | (error)))) | |
396 | ||
397 | (defun vc-bzr-unregister (file) | |
398 | "Unregister FILE from bzr." | |
f4d0cf23 | 399 | (vc-bzr-command "remove" nil 0 file "--keep")) |
b6e0e86c | 400 | |
8cdd17b4 | 401 | (defun vc-bzr-checkin (files rev comment) |
b6e0e86c SM |
402 | "Check FILE in to bzr with log message COMMENT. |
403 | REV non-nil gets an error." | |
5b5afd50 | 404 | (if rev (error "Can't check in a specific revision with bzr")) |
8cdd17b4 | 405 | (vc-bzr-command "commit" nil 0 files "-m" comment)) |
b6e0e86c | 406 | |
d3c24c25 DN |
407 | (defun vc-bzr-find-revision (file rev buffer) |
408 | "Fetch revision REV of file FILE and put it into BUFFER." | |
f4d0cf23 SM |
409 | (with-current-buffer buffer |
410 | (if (and rev (stringp rev) (not (string= rev ""))) | |
411 | (vc-bzr-command "cat" t 0 file "-r" rev) | |
412 | (vc-bzr-command "cat" t 0 file)))) | |
413 | ||
5a3b79c4 SM |
414 | (defun vc-bzr-checkout (file &optional editable rev) |
415 | (if rev (error "Operation not supported") | |
416 | ;; Else, there's nothing to do. | |
417 | nil)) | |
b6e0e86c SM |
418 | |
419 | (defun vc-bzr-revert (file &optional contents-done) | |
420 | (unless contents-done | |
33e5d7d4 | 421 | (with-temp-buffer (vc-bzr-command "revert" t 0 file)))) |
b6e0e86c | 422 | |
37320a58 SM |
423 | (defvar log-view-message-re) |
424 | (defvar log-view-file-re) | |
425 | (defvar log-view-font-lock-keywords) | |
426 | (defvar log-view-current-tag-function) | |
def61be2 | 427 | (defvar log-view-per-file-logs) |
37320a58 SM |
428 | |
429 | (define-derived-mode vc-bzr-log-view-mode log-view-mode "Bzr-Log-View" | |
430 | (remove-hook 'log-view-mode-hook 'vc-bzr-log-view-mode) ;Deactivate the hack. | |
b6e0e86c | 431 | (require 'add-log) |
6653c6b7 | 432 | (set (make-local-variable 'log-view-per-file-logs) nil) |
ac51b151 | 433 | (set (make-local-variable 'log-view-file-re) "^Working file:[ \t]+\\(.+\\)") |
37320a58 | 434 | (set (make-local-variable 'log-view-message-re) |
f392f8b4 | 435 | "^ *-+\n *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)") |
b6e0e86c | 436 | (set (make-local-variable 'log-view-font-lock-keywords) |
37320a58 SM |
437 | ;; log-view-font-lock-keywords is careful to use the buffer-local |
438 | ;; value of log-view-message-re only since Emacs-23. | |
439 | (append `((,log-view-message-re . 'log-view-message-face)) | |
440 | ;; log-view-font-lock-keywords | |
441 | '(("^ *committer: \ | |
5ec05779 | 442 | \\([^<(]+?\\)[ ]*[(<]\\([[:alnum:]_.+-]+@[[:alnum:]_.-]+\\)[>)]" |
37320a58 SM |
443 | (1 'change-log-name) |
444 | (2 'change-log-email)) | |
445 | ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face)))))) | |
b6e0e86c | 446 | |
8cdd17b4 ER |
447 | (defun vc-bzr-print-log (files &optional buffer) ; get buffer arg in Emacs 22 |
448 | "Get bzr change log for FILES into specified BUFFER." | |
ac51b151 DN |
449 | ;; `vc-do-command' creates the buffer, but we need it before running |
450 | ;; the command. | |
451 | (vc-setup-buffer buffer) | |
452 | ;; If the buffer exists from a previous invocation it might be | |
453 | ;; read-only. | |
5a3b79c4 SM |
454 | ;; FIXME: `vc-bzr-command' runs `bzr log' with `LC_MESSAGES=C', so |
455 | ;; the log display may not what the user wants - but I see no other | |
456 | ;; way of getting the above regexps working. | |
457 | (dolist (file files) | |
5a07b0f0 SM |
458 | (vc-exec-after |
459 | `(let ((inhibit-read-only t)) | |
5a3b79c4 SM |
460 | (with-current-buffer buffer |
461 | ;; Insert the file name so that log-view.el can find it. | |
5a07b0f0 SM |
462 | (insert "Working file: " ',file "\n")) ;; Like RCS/CVS. |
463 | (apply 'vc-bzr-command "log" ',buffer 'async ',file | |
464 | ',(if (stringp vc-bzr-log-switches) | |
5a3b79c4 | 465 | (list vc-bzr-log-switches) |
5a07b0f0 | 466 | vc-bzr-log-switches)))))) |
b6e0e86c | 467 | |
5b5afd50 ER |
468 | (defun vc-bzr-show-log-entry (revision) |
469 | "Find entry for patch name REVISION in bzr change log buffer." | |
b6e0e86c SM |
470 | (goto-char (point-min)) |
471 | (let (case-fold-search) | |
f392f8b4 DN |
472 | (if (re-search-forward |
473 | ;; "revno:" can appear either at the beginning of a line, or indented. | |
def61be2 | 474 | (concat "^[ ]*-+\n[ ]*revno: " |
f392f8b4 DN |
475 | ;; The revision can contain ".", quote it so that it |
476 | ;; does not interfere with regexp matching. | |
477 | (regexp-quote revision) "$") nil t) | |
b6e0e86c SM |
478 | (beginning-of-line 0) |
479 | (goto-char (point-min))))) | |
480 | ||
8cdd17b4 | 481 | (defun vc-bzr-diff (files &optional rev1 rev2 buffer) |
b6e0e86c | 482 | "VC bzr backend for diff." |
39f44442 | 483 | ;; `bzr diff' exits with code 1 if diff is non-empty. |
5a07b0f0 | 484 | (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 'async files |
def61be2 | 485 | "--diff-options" (mapconcat 'identity |
39f44442 | 486 | (vc-diff-switches-list bzr) |
59ce725a | 487 | " ") |
39f44442 SM |
488 | ;; This `when' is just an optimization because bzr-1.2 is *much* |
489 | ;; faster when the revision argument is not given. | |
490 | (when (or rev1 rev2) | |
491 | (list "-r" (format "%s..%s" | |
def61be2 | 492 | (or rev1 "revno:-1") |
39f44442 | 493 | (or rev2 "")))))) |
b6e0e86c | 494 | |
b6e0e86c | 495 | |
5b5afd50 ER |
496 | ;; FIXME: vc-{next,previous}-revision need fixing in vc.el to deal with |
497 | ;; straight integer revisions. | |
b6e0e86c SM |
498 | |
499 | (defun vc-bzr-delete-file (file) | |
500 | "Delete FILE and delete it in the bzr repository." | |
501 | (condition-case () | |
502 | (delete-file file) | |
503 | (file-error nil)) | |
504 | (vc-bzr-command "remove" nil 0 file)) | |
505 | ||
506 | (defun vc-bzr-rename-file (old new) | |
507 | "Rename file from OLD to NEW using `bzr mv'." | |
508 | (vc-bzr-command "mv" nil 0 new old)) | |
509 | ||
510 | (defvar vc-bzr-annotation-table nil | |
511 | "Internal use.") | |
512 | (make-variable-buffer-local 'vc-bzr-annotation-table) | |
513 | ||
5b5afd50 | 514 | (defun vc-bzr-annotate-command (file buffer &optional revision) |
b6e0e86c SM |
515 | "Prepare BUFFER for `vc-annotate' on FILE. |
516 | Each line is tagged with the revision number, which has a `help-echo' | |
517 | property containing author and date information." | |
6e98ad29 | 518 | (apply #'vc-bzr-command "annotate" buffer 0 file "--long" "--all" |
a6762235 DN |
519 | (if revision (list "-r" revision))) |
520 | (with-current-buffer buffer | |
521 | ;; Store the tags for the annotated source lines in a hash table | |
522 | ;; to allow saving space by sharing the text properties. | |
523 | (setq vc-bzr-annotation-table (make-hash-table :test 'equal)) | |
524 | (goto-char (point-min)) | |
1690cfbf | 525 | (while (re-search-forward "^\\( *[0-9.]+ *\\) \\([^\n ]+\\) +\\([0-9]\\{8\\}\\) |" |
a6762235 DN |
526 | nil t) |
527 | (let* ((rev (match-string 1)) | |
528 | (author (match-string 2)) | |
529 | (date (match-string 3)) | |
530 | (key (match-string 0)) | |
531 | (tag (gethash key vc-bzr-annotation-table))) | |
532 | (unless tag | |
533 | (setq tag (propertize rev 'help-echo (concat "Author: " author | |
534 | ", date: " date) | |
535 | 'mouse-face 'highlight)) | |
536 | (puthash key tag vc-bzr-annotation-table)) | |
537 | (replace-match "") | |
538 | (insert tag " |"))))) | |
b6e0e86c | 539 | |
f8bd9ac6 DN |
540 | (declare-function vc-annotate-convert-time "vc-annotate" (time)) |
541 | ||
b6e0e86c | 542 | (defun vc-bzr-annotate-time () |
1690cfbf | 543 | (when (re-search-forward "^ *[0-9.]+ +|" nil t) |
a6762235 DN |
544 | (let ((prop (get-text-property (line-beginning-position) 'help-echo))) |
545 | (string-match "[0-9]+\\'" prop) | |
f8381803 | 546 | (let ((str (match-string-no-properties 0 prop))) |
b6e0e86c SM |
547 | (vc-annotate-convert-time |
548 | (encode-time 0 0 0 | |
f8381803 SM |
549 | (string-to-number (substring str 6 8)) |
550 | (string-to-number (substring str 4 6)) | |
551 | (string-to-number (substring str 0 4)))))))) | |
b6e0e86c SM |
552 | |
553 | (defun vc-bzr-annotate-extract-revision-at-line () | |
554 | "Return revision for current line of annoation buffer, or nil. | |
555 | Return nil if current line isn't annotated." | |
556 | (save-excursion | |
557 | (beginning-of-line) | |
96be1503 | 558 | (if (looking-at " *\\([0-9.]+\\) *| ") |
a6762235 | 559 | (match-string-no-properties 1)))) |
b6e0e86c | 560 | |
a460c94c SM |
561 | (defun vc-bzr-command-discarding-stderr (command &rest args) |
562 | "Execute shell command COMMAND (with ARGS); return its output and exitcode. | |
b6e6e09a SM |
563 | Return value is a cons (EXITCODE . OUTPUT), where EXITCODE is |
564 | the (numerical) exit code of the process, and OUTPUT is a string | |
565 | containing whatever the process sent to its standard output | |
566 | stream. Standard error output is discarded." | |
567 | (with-temp-buffer | |
a460c94c | 568 | (cons |
07c4b87c | 569 | (apply #'process-file command nil (list (current-buffer) nil) nil args) |
b6e6e09a | 570 | (buffer-substring (point-min) (point-max))))) |
b6e0e86c | 571 | |
0a299408 ER |
572 | (defun vc-bzr-prettify-state-info (file) |
573 | "Bzr-specific version of `vc-prettify-state-info'." | |
b6e0e86c | 574 | (if (eq 'edited (vc-state file)) |
def61be2 | 575 | (concat "(" (symbol-name (or (vc-file-getprop file 'vc-bzr-state) |
f4d0cf23 SM |
576 | 'edited)) ")") |
577 | ;; else fall back to default vc.el representation | |
0a299408 | 578 | (vc-default-prettify-state-info 'Bzr file))) |
b6e0e86c | 579 | |
a0c38937 DN |
580 | (defstruct (vc-bzr-extra-fileinfo |
581 | (:copier nil) | |
582 | (:constructor vc-bzr-create-extra-fileinfo (extra-name)) | |
583 | (:conc-name vc-bzr-extra-fileinfo->)) | |
584 | extra-name) ;; original name for rename targets, new name for | |
585 | ||
586 | (defun vc-bzr-status-printer (info) | |
587 | "Pretty-printer for the vc-dir-fileinfo structure." | |
588 | (let ((extra (vc-dir-fileinfo->extra info))) | |
589 | (vc-default-status-printer 'Bzr info) | |
590 | (when extra | |
591 | (insert (propertize | |
592 | (format " (renamed from %s)" | |
593 | (vc-bzr-extra-fileinfo->extra-name extra)) | |
594 | 'face 'font-lock-comment-face))))) | |
595 | ||
701d018c | 596 | ;; FIXME: this needs testing, it's probably incomplete. |
c1b51374 | 597 | (defun vc-bzr-after-dir-status (update-function) |
7ee8e7eb | 598 | (let ((status-str nil) |
701d018c DN |
599 | (translation '(("+N " . added) |
600 | ("-D " . removed) | |
601 | (" M " . edited) ;; file text modified | |
602 | (" *" . edited) ;; execute bit changed | |
603 | (" M*" . edited) ;; text modified + execute bit changed | |
604 | ;; FIXME: what about ignored files? | |
605 | (" D " . missing) | |
f8381803 | 606 | ;; For conflicts, should we list the .THIS/.BASE/.OTHER? |
701d018c DN |
607 | ("C " . conflict) |
608 | ("? " . unregistered) | |
a0c38937 DN |
609 | ("? " . unregistered) |
610 | ;; No such state, but we need to distinguish this case. | |
611 | ("R " . renamed) | |
f8381803 SM |
612 | ;; Ignore "P " and "P." for pending patches. |
613 | )) | |
7ee8e7eb DN |
614 | (translated nil) |
615 | (result nil)) | |
616 | (goto-char (point-min)) | |
617 | (while (not (eobp)) | |
618 | (setq status-str | |
701d018c | 619 | (buffer-substring-no-properties (point) (+ (point) 3))) |
21f7bc38 | 620 | (setq translated (cdr (assoc status-str translation))) |
a0c38937 DN |
621 | (cond |
622 | ((eq translated 'conflict) | |
623 | ;; For conflicts the file appears twice in the listing: once | |
624 | ;; with the M flag and once with the C flag, so take care | |
625 | ;; not to add it twice to `result'. Ugly. | |
626 | (let* ((file | |
627 | (buffer-substring-no-properties | |
628 | ;;For files with conflicts the format is: | |
629 | ;;C Text conflict in FILENAME | |
630 | ;; Bah. | |
631 | (+ (point) 21) (line-end-position))) | |
632 | (entry (assoc file result))) | |
633 | (when entry | |
634 | (setf (nth 1 entry) 'conflict)))) | |
635 | ((eq translated 'renamed) | |
636 | (re-search-forward "R \\(.*\\) => \\(.*\\)$" (line-end-position) t) | |
637 | (let ((new-name (match-string 2)) | |
638 | (old-name (match-string 1))) | |
639 | (push (list new-name 'edited | |
640 | (vc-bzr-create-extra-fileinfo old-name)) result))) | |
641 | (t | |
21f7bc38 DN |
642 | (push (list (buffer-substring-no-properties |
643 | (+ (point) 4) | |
def61be2 | 644 | (line-end-position)) |
a0c38937 | 645 | translated) result))) |
7ee8e7eb | 646 | (forward-line)) |
c1b51374 | 647 | (funcall update-function result))) |
7ee8e7eb | 648 | |
c1b51374 | 649 | (defun vc-bzr-dir-status (dir update-function) |
7ee8e7eb | 650 | "Return a list of conses (file . state) for DIR." |
115c0061 DN |
651 | (vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S") |
652 | (vc-exec-after | |
c1b51374 | 653 | `(vc-bzr-after-dir-status (quote ,update-function)))) |
7ee8e7eb | 654 | |
39f44442 SM |
655 | ;;; Revision completion |
656 | ||
39f44442 SM |
657 | (defun vc-bzr-revision-completion-table (files) |
658 | (lexical-let ((files files)) | |
659 | ;; What about using `files'?!? --Stef | |
660 | (lambda (string pred action) | |
661 | (cond | |
662 | ((string-match "\\`\\(ancestor\\|branch\\|\\(revno:\\)?[-0-9]+:\\):" | |
663 | string) | |
ec50e665 | 664 | (completion-table-with-context (substring string 0 (match-end 0)) |
f8381803 SM |
665 | ;; FIXME: only allow directories. |
666 | ;; FIXME: don't allow envvars. | |
ec50e665 SM |
667 | 'read-file-name-internal |
668 | (substring string (match-end 0)) | |
669 | ;; Dropping `pred'. Maybe we should | |
670 | ;; just stash it in | |
671 | ;; `read-file-name-predicate'? | |
672 | nil | |
673 | action)) | |
39f44442 | 674 | ((string-match "\\`\\(before\\):" string) |
ec50e665 SM |
675 | (completion-table-with-context (substring string 0 (match-end 0)) |
676 | (vc-bzr-revision-completion-table files) | |
677 | (substring string (match-end 0)) | |
678 | pred | |
679 | action)) | |
39f44442 SM |
680 | ((string-match "\\`\\(tag\\):" string) |
681 | (let ((prefix (substring string 0 (match-end 0))) | |
682 | (tag (substring string (match-end 0))) | |
683 | (table nil)) | |
684 | (with-temp-buffer | |
685 | ;; "bzr-1.2 tags" is much faster with --show-ids. | |
07c4b87c | 686 | (process-file vc-bzr-program nil '(t) nil "tags" "--show-ids") |
39f44442 SM |
687 | ;; The output is ambiguous, unless we assume that revids do not |
688 | ;; contain spaces. | |
689 | (goto-char (point-min)) | |
690 | (while (re-search-forward "^\\(.*[^ \n]\\) +[^ \n]*$" nil t) | |
691 | (push (match-string-no-properties 1) table))) | |
ec50e665 | 692 | (completion-table-with-context prefix table tag pred action))) |
39f44442 SM |
693 | |
694 | ((string-match "\\`\\(revid\\):" string) | |
695 | ;; FIXME: How can I get a list of revision ids? | |
696 | ) | |
f8381803 SM |
697 | ((eq (car-safe action) 'boundaries) |
698 | (list* 'boundaries | |
8100b5a8 | 699 | (string-match "[^:]*\\'" string) |
f8381803 | 700 | (string-match ":" (cdr action)))) |
39f44442 | 701 | (t |
f8381803 SM |
702 | ;; Could use completion-table-with-terminator, except that it |
703 | ;; currently doesn't work right w.r.t pcm and doesn't give | |
704 | ;; the *Completions* output we want. | |
39f44442 SM |
705 | (complete-with-action action '("revno:" "revid:" "last:" "before:" |
706 | "tag:" "date:" "ancestor:" "branch:" | |
707 | "submit:") | |
708 | string pred)))))) | |
709 | ||
b6e0e86c | 710 | (eval-after-load "vc" |
b6e6e09a | 711 | '(add-to-list 'vc-directory-exclusion-list vc-bzr-admin-dirname t)) |
b6e0e86c | 712 | |
b6e0e86c SM |
713 | (provide 'vc-bzr) |
714 | ;; arch-tag: 8101bad8-4e92-4e7d-85ae-d8e08b4e7c06 | |
715 | ;;; vc-bzr.el ends here |