2009-12-07 Michael Kifer <kifer@cs.stonybrook.edu>
[bpt/emacs.git] / lisp / vc-bzr.el
CommitLineData
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.
75If 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
93Invoke 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)
e82b1099
MA
137 (args nil)
138 process-file-side-effects)
82eb83ff
SM
139 (when (consp prog)
140 (setq args (cdr prog))
141 (setq prog (car prog)))
07c4b87c 142 (apply 'process-file prog (file-relative-name file) t nil args)
82eb83ff
SM
143 (buffer-substring (point-min) (+ (point-min) 40)))))
144
145(defun vc-bzr-state-heuristic (file)
146 "Like `vc-bzr-state' but hopefully without running Bzr."
2793b89e 147 ;; `bzr status' was excrutiatingly slow with large histories and
82eb83ff
SM
148 ;; pending merges, so try to avoid using it until they fix their
149 ;; performance problems.
150 ;; This function tries first to parse Bzr internal file
151 ;; `checkout/dirstate', but it may fail if Bzr internal file format
152 ;; has changed. As a safeguard, the `checkout/dirstate' file is
153 ;; only parsed if it contains the string `#bazaar dirstate flat
154 ;; format 3' in the first line.
155 ;; If the `checkout/dirstate' file cannot be parsed, fall back to
156 ;; running `vc-bzr-state'."
fba500b6
SM
157 (lexical-let ((root (vc-bzr-root file)))
158 (when root ; Short cut.
159 ;; This looks at internal files. May break if they change
160 ;; their format.
161 (lexical-let ((dirstate (expand-file-name vc-bzr-admin-dirstate root)))
2793b89e
SM
162 (condition-case nil
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)))
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"
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 )
190 nil t)
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).
195 (cond
196 ((eq (char-after (match-beginning 1)) ?a) 'removed)
197 ((eq (char-after (match-beginning 3)) ?a) 'added)
198 ((and (eq (string-to-number (match-string 2))
199 (nth 7 (file-attributes file)))
200 (equal (match-string 4)
201 (vc-bzr-sha1 file)))
202 'up-to-date)
203 (t 'edited))
204 'unregistered))))
205 ;; Either the dirstate file can't be read, or the sha1
206 ;; executable is missing, or ...
207 ;; In either case, recent versions of Bzr aren't that slow
208 ;; any more.
209 (error (vc-bzr-state file)))))))
210
82eb83ff
SM
211
212(defun vc-bzr-registered (file)
213 "Return non-nil if FILE is registered with bzr."
214 (let ((state (vc-bzr-state-heuristic file)))
215 (not (memq state '(nil unregistered ignored)))))
77b5d458
SM
216
217(defconst vc-bzr-state-words
33e5d7d4 218 "added\\|ignored\\|kind changed\\|modified\\|removed\\|renamed\\|unknown"
77b5d458
SM
219 "Regexp matching file status words as reported in `bzr' output.")
220
b6e6e09a
SM
221(defun vc-bzr-file-name-relative (filename)
222 "Return file name FILENAME stripped of the initial Bzr repository path."
223 (lexical-let*
224 ((filename* (expand-file-name filename))
f4d0cf23 225 (rootdir (vc-bzr-root filename*)))
def61be2 226 (when rootdir
b6e6e09a
SM
227 (file-relative-name filename* rootdir))))
228
33e5d7d4
SM
229(defun vc-bzr-status (file)
230 "Return FILE status according to Bzr.
231Return value is a cons (STATUS . WARNING), where WARNING is a
fba500b6
SM
232string or nil, and STATUS is one of the symbols: `added',
233`ignored', `kindchanged', `modified', `removed', `renamed', `unknown',
33e5d7d4
SM
234which directly correspond to `bzr status' output, or 'unchanged
235for files whose copy in the working tree is identical to the one
236in the branch repository, or nil for files that are not
237registered with Bzr.
238
239If any error occurred in running `bzr status', then return nil."
77b5d458 240 (with-temp-buffer
fba500b6
SM
241 (let ((ret (condition-case nil
242 (vc-bzr-command "status" t 0 file)
243 (file-error nil))) ; vc-bzr-program not found.
244 (status 'unchanged))
245 ;; the only secure status indication in `bzr status' output
246 ;; is a couple of lines following the pattern::
247 ;; | <status>:
248 ;; | <file name>
249 ;; if the file is up-to-date, we get no status report from `bzr',
250 ;; so if the regexp search for the above pattern fails, we consider
251 ;; the file to be up-to-date.
252 (goto-char (point-min))
253 (when (re-search-forward
254 ;; bzr prints paths relative to the repository root.
255 (concat "^\\(" vc-bzr-state-words "\\):[ \t\n]+"
256 (regexp-quote (vc-bzr-file-name-relative file))
f4d0cf23
SM
257 ;; Bzr appends a '/' to directory names and
258 ;; '*' to executable files
259 (if (file-directory-p file) "/?" "\\*?")
fba500b6
SM
260 "[ \t\n]*$")
261 nil t)
6e98ad29 262 (lexical-let ((statusword (match-string 1)))
fba500b6
SM
263 ;; Erase the status text that matched.
264 (delete-region (match-beginning 0) (match-end 0))
33e5d7d4 265 (setq status
f4d0cf23 266 (intern (replace-regexp-in-string " " "" statusword)))))
fba500b6
SM
267 (when status
268 (goto-char (point-min))
269 (skip-chars-forward " \n\t") ;Throw away spaces.
270 (cons status
271 ;; "bzr" will output warnings and informational messages to
272 ;; stderr; due to Emacs' `vc-do-command' (and, it seems,
273 ;; `start-process' itself) limitations, we cannot catch stderr
274 ;; and stdout into different buffers. So, if there's anything
275 ;; left in the buffer after removing the above status
276 ;; keywords, let us just presume that any other message from
277 ;; "bzr" is a user warning, and display it.
278 (unless (eobp) (buffer-substring (point) (point-max))))))))
a0e5e075 279
33e5d7d4
SM
280(defun vc-bzr-state (file)
281 (lexical-let ((result (vc-bzr-status file)))
282 (when (consp result)
6efbb10c
DN
283 (when (cdr result)
284 (message "Warnings in `bzr' output: %s" (cdr result)))
33e5d7d4 285 (cdr (assq (car result)
6a3f9bb7 286 '((added . added)
fba500b6 287 (kindchanged . edited)
33e5d7d4
SM
288 (renamed . edited)
289 (modified . edited)
54bf3704 290 (removed . removed)
3702367b 291 (ignored . ignored)
54bf3704 292 (unknown . unregistered)
33e5d7d4 293 (unchanged . up-to-date)))))))
b6e0e86c 294
b0a08954
SM
295(defun vc-bzr-resolve-when-done ()
296 "Call \"bzr resolve\" if the conflict markers have been removed."
297 (save-excursion
298 (goto-char (point-min))
299 (unless (re-search-forward "^<<<<<<< " nil t)
300 (vc-bzr-command "resolve" nil 0 buffer-file-name)
301 ;; Remove the hook so that it is not called multiple times.
302 (remove-hook 'after-save-hook 'vc-bzr-resolve-when-done t))))
303
304(defun vc-bzr-find-file-hook ()
305 (when (and buffer-file-name
306 ;; FIXME: We should check that "bzr status" says "conflict".
307 (file-exists-p (concat buffer-file-name ".BASE"))
308 (file-exists-p (concat buffer-file-name ".OTHER"))
309 (file-exists-p (concat buffer-file-name ".THIS"))
310 ;; If "bzr status" says there's a conflict but there are no
311 ;; conflict markers, it's not clear what we should do.
312 (save-excursion
313 (goto-char (point-min))
314 (re-search-forward "^<<<<<<< " nil t)))
315 ;; TODO: the merge algorithm used in `bzr merge' is nicely configurable,
316 ;; but the one in `bzr pull' isn't, so it would be good to provide an
317 ;; elisp function to remerge from the .BASE/OTHER/THIS files.
318 (smerge-start-session)
319 (add-hook 'after-save-hook 'vc-bzr-resolve-when-done nil t)
320 (message "There are unresolved conflicts in this file")))
321
b6e0e86c 322(defun vc-bzr-workfile-unchanged-p (file)
33e5d7d4 323 (eq 'unchanged (car (vc-bzr-status file))))
b6e0e86c 324
ac3f4c6f 325(defun vc-bzr-working-revision (file)
82eb83ff
SM
326 ;; Together with the code in vc-state-heuristic, this makes it possible
327 ;; to get the initial VC state of a Bzr file even if Bzr is not installed.
a460c94c
SM
328 (lexical-let*
329 ((rootdir (vc-bzr-root file))
6e98ad29
SM
330 (branch-format-file (expand-file-name vc-bzr-admin-branch-format-file
331 rootdir))
332 (revhistory-file (expand-file-name vc-bzr-admin-revhistory rootdir))
333 (lastrev-file (expand-file-name vc-bzr-admin-lastrev rootdir)))
334 ;; This looks at internal files to avoid forking a bzr process.
335 ;; May break if they change their format.
be14a425
DN
336 (if (and (file-exists-p branch-format-file)
337 ;; For lightweight checkouts (obtained with bzr checkout --lightweight)
338 ;; the branch-format-file does not contain the revision
339 ;; information, we need to look up the branch-format-file
340 ;; in the place where the lightweight checkout comes
341 ;; from. We only do that if it's a local file.
342 (let ((location-fname (expand-file-name
343 (concat vc-bzr-admin-dirname
344 "/branch/location") rootdir)))
345 ;; The existence of this file is how we distinguish
346 ;; lightweight checkouts.
347 (if (file-exists-p location-fname)
348 (with-temp-buffer
349 (insert-file-contents location-fname)
350 (when (re-search-forward "file://\(.+\)" nil t)
351 (setq branch-format-file (match-string 1))
352 (file-exists-p branch-format-file)))
353 t)))
fba500b6 354 (with-temp-buffer
def61be2 355 (insert-file-contents branch-format-file)
a460c94c
SM
356 (goto-char (point-min))
357 (cond
358 ((or
359 (looking-at "Bazaar-NG branch, format 0.0.4")
360 (looking-at "Bazaar-NG branch format 5"))
361 ;; count lines in .bzr/branch/revision-history
def61be2 362 (insert-file-contents revhistory-file)
a460c94c 363 (number-to-string (count-lines (line-end-position) (point-max))))
65105010
DN
364 ((or
365 (looking-at "Bazaar Branch Format 6 (bzr 0.15)")
366 (looking-at "Bazaar Branch Format 7 (needs bzr 1.6)"))
a460c94c 367 ;; revno is the first number in .bzr/branch/last-revision
def61be2 368 (insert-file-contents lastrev-file)
65105010
DN
369 (when (re-search-forward "[0-9]+" nil t)
370 (buffer-substring (match-beginning 0) (match-end 0))))))
a460c94c 371 ;; fallback to calling "bzr revno"
b6e6e09a 372 (lexical-let*
a460c94c 373 ((result (vc-bzr-command-discarding-stderr
07c4b87c 374 vc-bzr-program "revno" (file-relative-name file)))
b6e6e09a
SM
375 (exitcode (car result))
376 (output (cdr result)))
377 (cond
378 ((eq exitcode 0) (substring output 0 -1))
379 (t nil))))))
b6e0e86c 380
a6ea7ffc 381(defun vc-bzr-create-repo ()
4211679b 382 "Create a new Bzr repository."
a6ea7ffc
DN
383 (vc-bzr-command "init" nil 0 nil))
384
25a4ea6d 385(defun vc-bzr-init-revision (&optional file)
f4d0cf23
SM
386 "Always return nil, as Bzr cannot register explicit versions."
387 nil)
388
882e82db
SM
389(defun vc-bzr-previous-revision (file rev)
390 (if (string-match "\\`[0-9]+\\'" rev)
391 (number-to-string (1- (string-to-number rev)))
392 (concat "before:" rev)))
393
394(defun vc-bzr-next-revision (file rev)
395 (if (string-match "\\`[0-9]+\\'" rev)
396 (number-to-string (1+ (string-to-number rev)))
397 (error "Don't know how to compute the next revision of %s" rev)))
398
8cdd17b4 399(defun vc-bzr-register (files &optional rev comment)
b6e0e86c
SM
400 "Register FILE under bzr.
401Signal an error unless REV is nil.
402COMMENT is ignored."
5b5afd50 403 (if rev (error "Can't register explicit revision with bzr"))
8cdd17b4 404 (vc-bzr-command "add" nil 0 files))
b6e0e86c
SM
405
406;; Could run `bzr status' in the directory and see if it succeeds, but
407;; that's relatively expensive.
b6e6e09a 408(defalias 'vc-bzr-responsible-p 'vc-bzr-root
b6e0e86c
SM
409 "Return non-nil if FILE is (potentially) controlled by bzr.
410The criterion is that there is a `.bzr' directory in the same
37320a58 411or a superior directory.")
b6e0e86c
SM
412
413(defun vc-bzr-could-register (file)
414 "Return non-nil if FILE could be registered under bzr."
415 (and (vc-bzr-responsible-p file) ; shortcut
416 (condition-case ()
417 (with-temp-buffer
418 (vc-bzr-command "add" t 0 file "--dry-run")
419 ;; The command succeeds with no output if file is
420 ;; registered (in bzr 0.8).
360cf7bc 421 (goto-char (point-min))
b6e0e86c
SM
422 (looking-at "added "))
423 (error))))
424
425(defun vc-bzr-unregister (file)
426 "Unregister FILE from bzr."
f4d0cf23 427 (vc-bzr-command "remove" nil 0 file "--keep"))
b6e0e86c 428
8cdd17b4 429(defun vc-bzr-checkin (files rev comment)
b6e0e86c
SM
430 "Check FILE in to bzr with log message COMMENT.
431REV non-nil gets an error."
5b5afd50 432 (if rev (error "Can't check in a specific revision with bzr"))
8cdd17b4 433 (vc-bzr-command "commit" nil 0 files "-m" comment))
b6e0e86c 434
d3c24c25
DN
435(defun vc-bzr-find-revision (file rev buffer)
436 "Fetch revision REV of file FILE and put it into BUFFER."
f4d0cf23
SM
437 (with-current-buffer buffer
438 (if (and rev (stringp rev) (not (string= rev "")))
439 (vc-bzr-command "cat" t 0 file "-r" rev)
440 (vc-bzr-command "cat" t 0 file))))
441
5a3b79c4
SM
442(defun vc-bzr-checkout (file &optional editable rev)
443 (if rev (error "Operation not supported")
444 ;; Else, there's nothing to do.
445 nil))
b6e0e86c
SM
446
447(defun vc-bzr-revert (file &optional contents-done)
448 (unless contents-done
33e5d7d4 449 (with-temp-buffer (vc-bzr-command "revert" t 0 file))))
b6e0e86c 450
37320a58
SM
451(defvar log-view-message-re)
452(defvar log-view-file-re)
453(defvar log-view-font-lock-keywords)
454(defvar log-view-current-tag-function)
def61be2 455(defvar log-view-per-file-logs)
32ba3abc 456(defvar vc-short-log)
37320a58
SM
457
458(define-derived-mode vc-bzr-log-view-mode log-view-mode "Bzr-Log-View"
459 (remove-hook 'log-view-mode-hook 'vc-bzr-log-view-mode) ;Deactivate the hack.
b6e0e86c 460 (require 'add-log)
6653c6b7 461 (set (make-local-variable 'log-view-per-file-logs) nil)
1c0f0c3b 462 (set (make-local-variable 'log-view-file-re) "\\`a\\`")
37320a58 463 (set (make-local-variable 'log-view-message-re)
32ba3abc
DN
464 (if vc-short-log
465 "^ +\\([0-9]+\\) \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?"
466 "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)"))
b6e0e86c 467 (set (make-local-variable 'log-view-font-lock-keywords)
37320a58
SM
468 ;; log-view-font-lock-keywords is careful to use the buffer-local
469 ;; value of log-view-message-re only since Emacs-23.
32ba3abc
DN
470 (if vc-short-log
471 (append `((,log-view-message-re
472 (1 'log-view-message-face)
473 (2 'change-log-name)
474 (3 'change-log-date)
475 (4 'change-log-list))))
476 (append `((,log-view-message-re . 'log-view-message-face))
477 ;; log-view-font-lock-keywords
478 '(("^ *committer: \
5ec05779 479\\([^<(]+?\\)[ ]*[(<]\\([[:alnum:]_.+-]+@[[:alnum:]_.-]+\\)[>)]"
32ba3abc
DN
480 (1 'change-log-name)
481 (2 'change-log-email))
482 ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face)))))))
b6e0e86c 483
6616006b 484(defun vc-bzr-print-log (files buffer &optional shortlog limit)
8cdd17b4 485 "Get bzr change log for FILES into specified BUFFER."
ac51b151
DN
486 ;; `vc-do-command' creates the buffer, but we need it before running
487 ;; the command.
488 (vc-setup-buffer buffer)
489 ;; If the buffer exists from a previous invocation it might be
490 ;; read-only.
5a3b79c4
SM
491 ;; FIXME: `vc-bzr-command' runs `bzr log' with `LC_MESSAGES=C', so
492 ;; the log display may not what the user wants - but I see no other
493 ;; way of getting the above regexps working.
1c0f0c3b
DN
494 (with-current-buffer buffer
495 (apply 'vc-bzr-command "log" buffer 'async files
3f6bd790
DN
496 (append
497 (when shortlog '("--short"))
498 (when limit (list "-l" (format "%s" limit)))
499 (if (stringp vc-bzr-log-switches)
500 (list vc-bzr-log-switches)
501 vc-bzr-log-switches)))))
b6e0e86c 502
5b5afd50
ER
503(defun vc-bzr-show-log-entry (revision)
504 "Find entry for patch name REVISION in bzr change log buffer."
b6e0e86c 505 (goto-char (point-min))
89d98000
DN
506 (when revision
507 (let (case-fold-search)
508 (if (re-search-forward
509 ;; "revno:" can appear either at the beginning of a line,
510 ;; or indented.
511 (concat "^[ ]*-+\n[ ]*revno: "
512 ;; The revision can contain ".", quote it so that it
513 ;; does not interfere with regexp matching.
514 (regexp-quote revision) "$") nil t)
515 (beginning-of-line 0)
516 (goto-char (point-min))))))
b6e0e86c 517
8cdd17b4 518(defun vc-bzr-diff (files &optional rev1 rev2 buffer)
b6e0e86c 519 "VC bzr backend for diff."
39f44442 520 ;; `bzr diff' exits with code 1 if diff is non-empty.
5a07b0f0 521 (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 'async files
def61be2 522 "--diff-options" (mapconcat 'identity
60aff924 523 (vc-switches 'bzr 'diff)
59ce725a 524 " ")
39f44442
SM
525 ;; This `when' is just an optimization because bzr-1.2 is *much*
526 ;; faster when the revision argument is not given.
527 (when (or rev1 rev2)
528 (list "-r" (format "%s..%s"
def61be2 529 (or rev1 "revno:-1")
39f44442 530 (or rev2 ""))))))
b6e0e86c 531
b6e0e86c 532
5b5afd50
ER
533;; FIXME: vc-{next,previous}-revision need fixing in vc.el to deal with
534;; straight integer revisions.
b6e0e86c
SM
535
536(defun vc-bzr-delete-file (file)
537 "Delete FILE and delete it in the bzr repository."
538 (condition-case ()
539 (delete-file file)
540 (file-error nil))
541 (vc-bzr-command "remove" nil 0 file))
542
543(defun vc-bzr-rename-file (old new)
544 "Rename file from OLD to NEW using `bzr mv'."
545 (vc-bzr-command "mv" nil 0 new old))
546
547(defvar vc-bzr-annotation-table nil
548 "Internal use.")
549(make-variable-buffer-local 'vc-bzr-annotation-table)
550
5b5afd50 551(defun vc-bzr-annotate-command (file buffer &optional revision)
b6e0e86c
SM
552 "Prepare BUFFER for `vc-annotate' on FILE.
553Each line is tagged with the revision number, which has a `help-echo'
554property containing author and date information."
62ccc42c 555 (apply #'vc-bzr-command "annotate" buffer 'async file "--long" "--all"
a6762235 556 (if revision (list "-r" revision)))
62ccc42c
SM
557 (lexical-let ((table (make-hash-table :test 'equal)))
558 (set-process-filter
559 (get-buffer-process buffer)
560 (lambda (proc string)
561 (when (process-buffer proc)
562 (with-current-buffer (process-buffer proc)
563 (setq string (concat (process-get proc :vc-left-over) string))
564 (while (string-match "^\\( *[0-9.]+ *\\) \\([^\n ]+\\) +\\([0-9]\\{8\\}\\)\\( |.*\n\\)" string)
565 (let* ((rev (match-string 1 string))
566 (author (match-string 2 string))
567 (date (match-string 3 string))
568 (key (substring string (match-beginning 0)
569 (match-beginning 4)))
570 (line (match-string 4 string))
571 (tag (gethash key table))
572 (inhibit-read-only t))
573 (setq string (substring string (match-end 0)))
2c6bb71a
CY
574 (unless tag
575 (setq tag
576 (propertize
2f2f5242
CY
577 (concat rev " " (substring (concat author " ")
578 0 7))
2c6bb71a
CY
579 'help-echo (format "Revision: %d, author: %s, date: %s"
580 (string-to-number rev)
581 author date)
582 'mouse-face 'highlight))
62ccc42c
SM
583 (puthash key tag table))
584 (goto-char (process-mark proc))
585 (insert tag line)
586 (move-marker (process-mark proc) (point))))
587 (process-put proc :vc-left-over string)))))))
b6e0e86c 588
f8bd9ac6
DN
589(declare-function vc-annotate-convert-time "vc-annotate" (time))
590
b6e0e86c 591(defun vc-bzr-annotate-time ()
2c6bb71a 592 (when (re-search-forward "^ *[0-9.]+ +[^\n ]* +|" nil t)
a6762235
DN
593 (let ((prop (get-text-property (line-beginning-position) 'help-echo)))
594 (string-match "[0-9]+\\'" prop)
f8381803 595 (let ((str (match-string-no-properties 0 prop)))
b6e0e86c
SM
596 (vc-annotate-convert-time
597 (encode-time 0 0 0
f8381803
SM
598 (string-to-number (substring str 6 8))
599 (string-to-number (substring str 4 6))
600 (string-to-number (substring str 0 4))))))))
b6e0e86c
SM
601
602(defun vc-bzr-annotate-extract-revision-at-line ()
603 "Return revision for current line of annoation buffer, or nil.
604Return nil if current line isn't annotated."
605 (save-excursion
606 (beginning-of-line)
2c6bb71a 607 (if (looking-at "^ *\\([0-9.]+\\) +[^\n ]* +|")
a6762235 608 (match-string-no-properties 1))))
b6e0e86c 609
a460c94c
SM
610(defun vc-bzr-command-discarding-stderr (command &rest args)
611 "Execute shell command COMMAND (with ARGS); return its output and exitcode.
b6e6e09a
SM
612Return value is a cons (EXITCODE . OUTPUT), where EXITCODE is
613the (numerical) exit code of the process, and OUTPUT is a string
614containing whatever the process sent to its standard output
615stream. Standard error output is discarded."
616 (with-temp-buffer
a460c94c 617 (cons
07c4b87c 618 (apply #'process-file command nil (list (current-buffer) nil) nil args)
b6e6e09a 619 (buffer-substring (point-min) (point-max)))))
b6e0e86c 620
a0c38937
DN
621(defstruct (vc-bzr-extra-fileinfo
622 (:copier nil)
623 (:constructor vc-bzr-create-extra-fileinfo (extra-name))
624 (:conc-name vc-bzr-extra-fileinfo->))
625 extra-name) ;; original name for rename targets, new name for
626
da4d4066 627(defun vc-bzr-dir-printer (info)
a0c38937
DN
628 "Pretty-printer for the vc-dir-fileinfo structure."
629 (let ((extra (vc-dir-fileinfo->extra info)))
da4d4066 630 (vc-default-dir-printer 'Bzr info)
a0c38937
DN
631 (when extra
632 (insert (propertize
633 (format " (renamed from %s)"
634 (vc-bzr-extra-fileinfo->extra-name extra))
635 'face 'font-lock-comment-face)))))
636
701d018c 637;; FIXME: this needs testing, it's probably incomplete.
c1b51374 638(defun vc-bzr-after-dir-status (update-function)
7ee8e7eb 639 (let ((status-str nil)
701d018c
DN
640 (translation '(("+N " . added)
641 ("-D " . removed)
642 (" M " . edited) ;; file text modified
643 (" *" . edited) ;; execute bit changed
644 (" M*" . edited) ;; text modified + execute bit changed
645 ;; FIXME: what about ignored files?
646 (" D " . missing)
f8381803 647 ;; For conflicts, should we list the .THIS/.BASE/.OTHER?
701d018c
DN
648 ("C " . conflict)
649 ("? " . unregistered)
a0c38937
DN
650 ("? " . unregistered)
651 ;; No such state, but we need to distinguish this case.
652 ("R " . renamed)
11b4001c
DN
653 ;; For a non existent file FOO, the output is:
654 ;; bzr: ERROR: Path(s) do not exist: FOO
655 ("bzr" . not-found)
be14a425
DN
656 ;; If the tree is not up to date, bzr will print this warning:
657 ;; working tree is out of date, run 'bzr update'
658 ;; ignore it.
659 ;; FIXME: maybe this warning can be put in the vc-dir header...
660 ("wor" . not-found)
f8381803
SM
661 ;; Ignore "P " and "P." for pending patches.
662 ))
7ee8e7eb
DN
663 (translated nil)
664 (result nil))
665 (goto-char (point-min))
666 (while (not (eobp))
667 (setq status-str
701d018c 668 (buffer-substring-no-properties (point) (+ (point) 3)))
21f7bc38 669 (setq translated (cdr (assoc status-str translation)))
a0c38937
DN
670 (cond
671 ((eq translated 'conflict)
672 ;; For conflicts the file appears twice in the listing: once
673 ;; with the M flag and once with the C flag, so take care
674 ;; not to add it twice to `result'. Ugly.
675 (let* ((file
676 (buffer-substring-no-properties
677 ;;For files with conflicts the format is:
678 ;;C Text conflict in FILENAME
679 ;; Bah.
680 (+ (point) 21) (line-end-position)))
681 (entry (assoc file result)))
682 (when entry
683 (setf (nth 1 entry) 'conflict))))
684 ((eq translated 'renamed)
685 (re-search-forward "R \\(.*\\) => \\(.*\\)$" (line-end-position) t)
686 (let ((new-name (match-string 2))
687 (old-name (match-string 1)))
688 (push (list new-name 'edited
689 (vc-bzr-create-extra-fileinfo old-name)) result)))
11b4001c
DN
690 ;; do nothing for non existent files
691 ((eq translated 'not-found))
a0c38937 692 (t
21f7bc38
DN
693 (push (list (buffer-substring-no-properties
694 (+ (point) 4)
def61be2 695 (line-end-position))
a0c38937 696 translated) result)))
7ee8e7eb 697 (forward-line))
c1b51374 698 (funcall update-function result)))
7ee8e7eb 699
c1b51374 700(defun vc-bzr-dir-status (dir update-function)
7ee8e7eb 701 "Return a list of conses (file . state) for DIR."
115c0061
DN
702 (vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S")
703 (vc-exec-after
c1b51374 704 `(vc-bzr-after-dir-status (quote ,update-function))))
7ee8e7eb 705
11b4001c
DN
706(defun vc-bzr-dir-status-files (dir files default-state update-function)
707 "Return a list of conses (file . state) for DIR."
708 (apply 'vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S" files)
709 (vc-exec-after
710 `(vc-bzr-after-dir-status (quote ,update-function))))
da4d4066 711
4dfb3b9c
DN
712(defvar vc-bzr-shelve-map
713 (let ((map (make-sparse-keymap)))
714 ;; Turn off vc-dir marking
715 (define-key map [mouse-2] 'ignore)
716
717 (define-key map [down-mouse-3] 'vc-bzr-shelve-menu)
718 (define-key map "\C-k" 'vc-bzr-shelve-delete-at-point)
719 ;; (define-key map "=" 'vc-bzr-shelve-show-at-point)
720 ;; (define-key map "\C-m" 'vc-bzr-shelve-show-at-point)
721 (define-key map "A" 'vc-bzr-shelve-apply-at-point)
722 map))
723
724(defvar vc-bzr-shelve-menu-map
725 (let ((map (make-sparse-keymap "Bzr Shelve")))
726 (define-key map [de]
727 '(menu-item "Delete shelf" vc-bzr-shelve-delete-at-point
728 :help "Delete the current shelf"))
729 (define-key map [ap]
730 '(menu-item "Apply shelf" vc-bzr-shelve-apply-at-point
731 :help "Apply the current shelf"))
732 ;; (define-key map [sh]
733 ;; '(menu-item "Show shelve" vc-bzr-shelve-show-at-point
734 ;; :help "Show the contents of the current shelve"))
735 map))
736
737(defvar vc-bzr-extra-menu-map
738 (let ((map (make-sparse-keymap)))
739 (define-key map [bzr-sh]
740 '(menu-item "Shelve..." vc-bzr-shelve
741 :help "Shelve changes"))
742 map))
743
744(defun vc-bzr-extra-menu () vc-bzr-extra-menu-map)
745
746(defun vc-bzr-extra-status-menu () vc-bzr-extra-menu-map)
747
da4d4066 748(defun vc-bzr-dir-extra-headers (dir)
be14a425
DN
749 (let*
750 ((str (with-temp-buffer
751 (vc-bzr-command "info" t 0 dir)
752 (buffer-string)))
4dfb3b9c
DN
753 (shelve (vc-bzr-shelve-list))
754 (shelve-help-echo "Use M-x vc-bzr-shelve to create shelves")
be14a425
DN
755 (light-checkout
756 (when (string-match ".+light checkout root: \\(.+\\)$" str)
757 (match-string 1 str)))
758 (light-checkout-branch
759 (when light-checkout
760 (when (string-match ".+checkout of branch: \\(.+\\)$" str)
761 (match-string 1 str)))))
da4d4066 762 (concat
be14a425
DN
763 (propertize "Parent branch : " 'face 'font-lock-type-face)
764 (propertize
da4d4066 765 (if (string-match "parent branch: \\(.+\\)$" str)
be14a425
DN
766 (match-string 1 str)
767 "None")
768 'face 'font-lock-variable-name-face)
769 "\n"
770 (when light-checkout
771 (concat
772 (propertize "Light checkout root: " 'face 'font-lock-type-face)
773 (propertize light-checkout 'face 'font-lock-variable-name-face)
774 "\n"))
775 (when light-checkout-branch
776 (concat
777 (propertize "Checkout of branch : " 'face 'font-lock-type-face)
778 (propertize light-checkout-branch 'face 'font-lock-variable-name-face)
a3abb176 779 "\n"))
4dfb3b9c
DN
780 (if shelve
781 (concat
782 (propertize "Shelves :\n" 'face 'font-lock-type-face
783 'help-echo shelve-help-echo)
784 (mapconcat
785 (lambda (x)
786 (propertize x
787 'face 'font-lock-variable-name-face
788 'mouse-face 'highlight
789 'help-echo "mouse-3: Show shelve menu\nA: Apply shelf\nC-k: Delete shelf"
790 'keymap vc-bzr-shelve-map))
791 shelve "\n"))
792 (concat
793 (propertize "Shelves : " 'face 'font-lock-type-face
794 'help-echo shelve-help-echo)
795 (propertize "No shelved changes"
796 'help-echo shelve-help-echo
797 'face 'font-lock-variable-name-face))))))
798
799(defun vc-bzr-shelve (name)
800 "Create a shelve."
801 (interactive "sShelf name: ")
802 (let ((root (vc-bzr-root default-directory)))
803 (when root
804 (vc-bzr-command "shelve" nil 0 nil "--all" "-m" name)
805 (vc-resynch-buffer root t t))))
806
807;; (defun vc-bzr-shelve-show (name)
808;; "Show the contents of shelve NAME."
809;; (interactive "sShelve name: ")
810;; (vc-setup-buffer "*vc-bzr-shelve*")
811;; ;; FIXME: how can you show the contents of a shelf?
812;; (vc-bzr-command "shelve" "*vc-bzr-shelve*" 'async nil name)
813;; (set-buffer "*vc-bzr-shelve*")
814;; (diff-mode)
815;; (setq buffer-read-only t)
816;; (pop-to-buffer (current-buffer)))
817
818(defun vc-bzr-shelve-apply (name)
819 "Apply shelve NAME."
820 (interactive "sApply shelf: ")
821 (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" name)
822 (vc-resynch-buffer (vc-bzr-root default-directory) t t))
823
824(defun vc-bzr-shelve-list ()
825 (with-temp-buffer
826 (vc-bzr-command "shelve" (current-buffer) 1 nil "--list" "-q")
827 (delete
828 ""
829 (split-string
830 (buffer-substring (point-min) (point-max))
831 "\n"))))
832
833(defun vc-bzr-shelve-get-at-point (point)
834 (save-excursion
835 (goto-char point)
836 (beginning-of-line)
837 (if (looking-at "^ +\\([0-9]+\\):")
838 (match-string 1)
839 (error "Cannot find shelf at point"))))
840
841(defun vc-bzr-shelve-delete-at-point ()
842 (interactive)
843 (let ((shelve (vc-bzr-shelve-get-at-point (point))))
844 (when (y-or-n-p (format "Remove shelf %s ?" shelve))
845 (vc-bzr-command "unshelve" nil 0 nil "--delete-only" shelve)
846 (vc-dir-refresh))))
847
848;; (defun vc-bzr-shelve-show-at-point ()
849;; (interactive)
850;; (vc-bzr-shelve-show (vc-bzr-shelve-get-at-point (point))))
851
852(defun vc-bzr-shelve-apply-at-point ()
853 (interactive)
854 (vc-bzr-shelve-apply (vc-bzr-shelve-get-at-point (point))))
855
856(defun vc-bzr-shelve-menu (e)
857 (interactive "e")
858 (vc-dir-at-event e (popup-menu vc-bzr-shelve-menu-map e)))
da4d4066 859
39f44442
SM
860;;; Revision completion
861
00f71f39
SM
862(eval-and-compile
863 (defconst vc-bzr-revision-keywords
864 '("revno" "revid" "last" "before"
865 "tag" "date" "ancestor" "branch" "submit")))
866
39f44442
SM
867(defun vc-bzr-revision-completion-table (files)
868 (lexical-let ((files files))
869 ;; What about using `files'?!? --Stef
870 (lambda (string pred action)
871 (cond
872 ((string-match "\\`\\(ancestor\\|branch\\|\\(revno:\\)?[-0-9]+:\\):"
873 string)
ec50e665 874 (completion-table-with-context (substring string 0 (match-end 0))
528c56e2 875 'completion-file-name-table
ec50e665 876 (substring string (match-end 0))
528c56e2
SM
877 ;; Dropping `pred' for no good reason.
878 'file-directory-p
ec50e665 879 action))
39f44442 880 ((string-match "\\`\\(before\\):" string)
ec50e665
SM
881 (completion-table-with-context (substring string 0 (match-end 0))
882 (vc-bzr-revision-completion-table files)
883 (substring string (match-end 0))
884 pred
885 action))
39f44442
SM
886 ((string-match "\\`\\(tag\\):" string)
887 (let ((prefix (substring string 0 (match-end 0)))
888 (tag (substring string (match-end 0)))
e82b1099
MA
889 (table nil)
890 process-file-side-effects)
39f44442
SM
891 (with-temp-buffer
892 ;; "bzr-1.2 tags" is much faster with --show-ids.
07c4b87c 893 (process-file vc-bzr-program nil '(t) nil "tags" "--show-ids")
39f44442
SM
894 ;; The output is ambiguous, unless we assume that revids do not
895 ;; contain spaces.
896 (goto-char (point-min))
897 (while (re-search-forward "^\\(.*[^ \n]\\) +[^ \n]*$" nil t)
898 (push (match-string-no-properties 1) table)))
ec50e665 899 (completion-table-with-context prefix table tag pred action)))
39f44442 900
00f71f39
SM
901 ((string-match "\\`\\([a-z]+\\):" string)
902 ;; no actual completion for the remaining keywords.
903 (completion-table-with-context (substring string 0 (match-end 0))
904 (if (member (match-string 1 string)
905 vc-bzr-revision-keywords)
906 ;; If it's a valid keyword,
907 ;; use a non-empty table to
908 ;; indicate it.
909 '("") nil)
910 (substring string (match-end 0))
911 pred
912 action))
39f44442 913 (t
f8381803
SM
914 ;; Could use completion-table-with-terminator, except that it
915 ;; currently doesn't work right w.r.t pcm and doesn't give
916 ;; the *Completions* output we want.
00f71f39
SM
917 (complete-with-action action (eval-when-compile
918 (mapcar (lambda (s) (concat s ":"))
919 vc-bzr-revision-keywords))
39f44442
SM
920 string pred))))))
921
b6e0e86c 922(eval-after-load "vc"
b6e6e09a 923 '(add-to-list 'vc-directory-exclusion-list vc-bzr-admin-dirname t))
b6e0e86c 924
b6e0e86c
SM
925(provide 'vc-bzr)
926;; arch-tag: 8101bad8-4e92-4e7d-85ae-d8e08b4e7c06
927;;; vc-bzr.el ends here