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