Unquote lambda functions. Add autoload cookies to functions formerly
[emacs.git] / lisp / vc-bzr.el
blobe126296d77913ec9817035b52b5b39d448f22ae2
1 ;;; vc-bzr.el --- VC backend for the bzr revision control system
3 ;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
5 ;; Author: Dave Love <fx@gnu.org>, Riccardo Murri <riccardo.murri@gmail.com>
6 ;; Keywords: tools
7 ;; Created: Sept 2006
8 ;; Version: 2008-01-04 (Bzr revno 25)
9 ;; URL: http://launchpad.net/vc-bzr
11 ;; This file is free software; you can redistribute it and/or modify
12 ;; it under the terms of the GNU General Public License as published by
13 ;; the Free Software Foundation; either version 3, or (at your option)
14 ;; any later version.
16 ;; This file is distributed in the hope that it will be useful,
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 ;; GNU General Public License for more details.
21 ;; You should have received a copy of the GNU General Public License
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the
23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
24 ;; Boston, MA 02110-1301, USA.
27 ;;; Commentary:
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'.
33 ;; Load this library to register bzr support in VC.
35 ;; Known bugs
36 ;; ==========
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
41 ;; (that is, the target contents) are changed.
42 ;; See https://bugs.launchpad.net/vc-bzr/+bug/116607
44 ;; For an up-to-date list of bugs, please see:
45 ;; https://bugs.launchpad.net/vc-bzr/+bugs
48 ;;; Code:
50 (eval-when-compile
51 (require 'cl)
52 (require 'vc)) ; for vc-exec-after
54 ;; Clear up the cache to force vc-call to check again and discover
55 ;; new functions when we reload this file.
56 (put 'Bzr 'vc-functions nil)
58 (defgroup vc-bzr nil
59 "VC bzr backend."
60 :version "22.2"
61 :group 'vc)
63 (defcustom vc-bzr-program "bzr"
64 "Name of the bzr command (excluding any arguments)."
65 :group 'vc-bzr
66 :type 'string)
68 (defcustom vc-bzr-diff-switches nil
69 "String/list of strings specifying extra switches for bzr diff under VC."
70 :type '(choice (const :tag "None" nil)
71 (string :tag "Argument String")
72 (repeat :tag "Argument List" :value ("") string))
73 :group 'vc-bzr)
75 (defcustom vc-bzr-log-switches nil
76 "String/list of strings specifying extra switches for `bzr log' under VC."
77 :type '(choice (const :tag "None" nil)
78 (string :tag "Argument String")
79 (repeat :tag "Argument List" :value ("") string))
80 :group 'vc-bzr)
82 ;; since v0.9, bzr supports removing the progress indicators
83 ;; by setting environment variable BZR_PROGRESS_BAR to "none".
84 (defun vc-bzr-command (bzr-command buffer okstatus file-or-list &rest args)
85 "Wrapper round `vc-do-command' using `vc-bzr-program' as COMMAND.
86 Invoke the bzr command adding `BZR_PROGRESS_BAR=none' and
87 `LC_MESSAGES=C' to the environment."
88 (let ((process-environment
89 (list* "BZR_PROGRESS_BAR=none" ; Suppress progress output (bzr >=0.9)
90 "LC_MESSAGES=C" ; Force English output
91 process-environment)))
92 (apply 'vc-do-command buffer okstatus vc-bzr-program
93 file-or-list bzr-command args)))
96 ;;;###autoload
97 (defconst vc-bzr-admin-dirname ".bzr"
98 "Name of the directory containing Bzr repository status files.")
99 ;;;###autoload
100 (defconst vc-bzr-admin-checkout-format-file
101 (concat vc-bzr-admin-dirname "/checkout/format"))
102 (defconst vc-bzr-admin-dirstate
103 (concat vc-bzr-admin-dirname "/checkout/dirstate"))
104 (defconst vc-bzr-admin-branch-format-file
105 (concat vc-bzr-admin-dirname "/branch/format"))
106 (defconst vc-bzr-admin-revhistory
107 (concat vc-bzr-admin-dirname "/branch/revision-history"))
108 (defconst vc-bzr-admin-lastrev
109 (concat vc-bzr-admin-dirname "/branch/last-revision"))
111 ;;;###autoload (defun vc-bzr-registered (file)
112 ;;;###autoload (if (vc-find-root file vc-bzr-admin-checkout-format-file)
113 ;;;###autoload (progn
114 ;;;###autoload (load "vc-bzr")
115 ;;;###autoload (vc-bzr-registered file))))
117 (defun vc-bzr-root (file)
118 "Return the root directory of the bzr repository containing FILE."
119 ;; Cache technique copied from vc-arch.el.
120 (or (vc-file-getprop file 'bzr-root)
121 (let ((root (vc-find-root file vc-bzr-admin-checkout-format-file)))
122 (when root (vc-file-setprop file 'bzr-root root)))))
124 (defun vc-bzr-registered (file)
125 "Return non-nil if FILE is registered with bzr.
127 For speed, this function tries first to parse Bzr internal file
128 `checkout/dirstate', but it may fail if Bzr internal file format
129 has changed. As a safeguard, the `checkout/dirstate' file is
130 only parsed if it contains the string `#bazaar dirstate flat
131 format 3' in the first line.
133 If the `checkout/dirstate' file cannot be parsed, fall back to
134 running `vc-bzr-state'."
135 (lexical-let ((root (vc-bzr-root file)))
136 (when root ; Short cut.
137 ;; This looks at internal files. May break if they change
138 ;; their format.
139 (lexical-let ((dirstate (expand-file-name vc-bzr-admin-dirstate root)))
140 (if (not (file-readable-p dirstate))
141 (vc-bzr-state file) ; Expensive.
142 (with-temp-buffer
143 (insert-file-contents dirstate)
144 (goto-char (point-min))
145 (if (not (looking-at "#bazaar dirstate flat format 3"))
146 (vc-bzr-state file) ; Some other unknown format?
147 (let* ((relfile (file-relative-name file root))
148 (reldir (file-name-directory relfile)))
149 (re-search-forward
150 (concat "^\0"
151 (if reldir (regexp-quote (directory-file-name reldir)))
152 "\0"
153 (regexp-quote (file-name-nondirectory relfile))
154 "\0")
155 nil t)))))))))
157 (defconst vc-bzr-state-words
158 "added\\|ignored\\|kind changed\\|modified\\|removed\\|renamed\\|unknown"
159 "Regexp matching file status words as reported in `bzr' output.")
161 (defun vc-bzr-file-name-relative (filename)
162 "Return file name FILENAME stripped of the initial Bzr repository path."
163 (lexical-let*
164 ((filename* (expand-file-name filename))
165 (rootdir (vc-bzr-root filename*)))
166 (when rootdir
167 (file-relative-name filename* rootdir))))
169 (defun vc-bzr-status (file)
170 "Return FILE status according to Bzr.
171 Return value is a cons (STATUS . WARNING), where WARNING is a
172 string or nil, and STATUS is one of the symbols: `added',
173 `ignored', `kindchanged', `modified', `removed', `renamed', `unknown',
174 which directly correspond to `bzr status' output, or 'unchanged
175 for files whose copy in the working tree is identical to the one
176 in the branch repository, or nil for files that are not
177 registered with Bzr.
179 If any error occurred in running `bzr status', then return nil."
180 (with-temp-buffer
181 (let ((ret (condition-case nil
182 (vc-bzr-command "status" t 0 file)
183 (file-error nil))) ; vc-bzr-program not found.
184 (status 'unchanged))
185 ;; the only secure status indication in `bzr status' output
186 ;; is a couple of lines following the pattern::
187 ;; | <status>:
188 ;; | <file name>
189 ;; if the file is up-to-date, we get no status report from `bzr',
190 ;; so if the regexp search for the above pattern fails, we consider
191 ;; the file to be up-to-date.
192 (goto-char (point-min))
193 (when (re-search-forward
194 ;; bzr prints paths relative to the repository root.
195 (concat "^\\(" vc-bzr-state-words "\\):[ \t\n]+"
196 (regexp-quote (vc-bzr-file-name-relative file))
197 ;; Bzr appends a '/' to directory names and
198 ;; '*' to executable files
199 (if (file-directory-p file) "/?" "\\*?")
200 "[ \t\n]*$")
201 nil t)
202 (lexical-let ((statusword (match-string 1)))
203 ;; Erase the status text that matched.
204 (delete-region (match-beginning 0) (match-end 0))
205 (setq status
206 (intern (replace-regexp-in-string " " "" statusword)))))
207 (when status
208 (goto-char (point-min))
209 (skip-chars-forward " \n\t") ;Throw away spaces.
210 (cons status
211 ;; "bzr" will output warnings and informational messages to
212 ;; stderr; due to Emacs' `vc-do-command' (and, it seems,
213 ;; `start-process' itself) limitations, we cannot catch stderr
214 ;; and stdout into different buffers. So, if there's anything
215 ;; left in the buffer after removing the above status
216 ;; keywords, let us just presume that any other message from
217 ;; "bzr" is a user warning, and display it.
218 (unless (eobp) (buffer-substring (point) (point-max))))))))
220 (defun vc-bzr-state (file)
221 (lexical-let ((result (vc-bzr-status file)))
222 (when (consp result)
223 (if (cdr result)
224 (message "Warnings in `bzr' output: %s" (cdr result)))
225 (cdr (assq (car result)
226 '((added . edited)
227 (kindchanged . edited)
228 (renamed . edited)
229 (modified . edited)
230 (removed . edited)
231 (ignored . nil)
232 (unknown . nil)
233 (unchanged . up-to-date)))))))
235 (defun vc-bzr-resolve-when-done ()
236 "Call \"bzr resolve\" if the conflict markers have been removed."
237 (save-excursion
238 (goto-char (point-min))
239 (unless (re-search-forward "^<<<<<<< " nil t)
240 (vc-bzr-command "resolve" nil 0 buffer-file-name)
241 ;; Remove the hook so that it is not called multiple times.
242 (remove-hook 'after-save-hook 'vc-bzr-resolve-when-done t))))
244 (defun vc-bzr-find-file-hook ()
245 (when (and buffer-file-name
246 ;; FIXME: We should check that "bzr status" says "conflict".
247 (file-exists-p (concat buffer-file-name ".BASE"))
248 (file-exists-p (concat buffer-file-name ".OTHER"))
249 (file-exists-p (concat buffer-file-name ".THIS"))
250 ;; If "bzr status" says there's a conflict but there are no
251 ;; conflict markers, it's not clear what we should do.
252 (save-excursion
253 (goto-char (point-min))
254 (re-search-forward "^<<<<<<< " nil t)))
255 ;; TODO: the merge algorithm used in `bzr merge' is nicely configurable,
256 ;; but the one in `bzr pull' isn't, so it would be good to provide an
257 ;; elisp function to remerge from the .BASE/OTHER/THIS files.
258 (smerge-start-session)
259 (add-hook 'after-save-hook 'vc-bzr-resolve-when-done nil t)
260 (message "There are unresolved conflicts in this file")))
262 (defun vc-bzr-workfile-unchanged-p (file)
263 (eq 'unchanged (car (vc-bzr-status file))))
265 (defun vc-bzr-working-revision (file)
266 (lexical-let*
267 ((rootdir (vc-bzr-root file))
268 (branch-format-file (expand-file-name vc-bzr-admin-branch-format-file
269 rootdir))
270 (revhistory-file (expand-file-name vc-bzr-admin-revhistory rootdir))
271 (lastrev-file (expand-file-name vc-bzr-admin-lastrev rootdir)))
272 ;; This looks at internal files to avoid forking a bzr process.
273 ;; May break if they change their format.
274 (if (file-exists-p branch-format-file)
275 (with-temp-buffer
276 (insert-file-contents branch-format-file)
277 (goto-char (point-min))
278 (cond
279 ((or
280 (looking-at "Bazaar-NG branch, format 0.0.4")
281 (looking-at "Bazaar-NG branch format 5"))
282 ;; count lines in .bzr/branch/revision-history
283 (insert-file-contents revhistory-file)
284 (number-to-string (count-lines (line-end-position) (point-max))))
285 ((looking-at "Bazaar Branch Format 6 (bzr 0.15)")
286 ;; revno is the first number in .bzr/branch/last-revision
287 (insert-file-contents lastrev-file)
288 (if (re-search-forward "[0-9]+" nil t)
289 (buffer-substring (match-beginning 0) (match-end 0))))))
290 ;; fallback to calling "bzr revno"
291 (lexical-let*
292 ((result (vc-bzr-command-discarding-stderr
293 vc-bzr-program "revno" file))
294 (exitcode (car result))
295 (output (cdr result)))
296 (cond
297 ((eq exitcode 0) (substring output 0 -1))
298 (t nil))))))
300 (defun vc-bzr-checkout-model (file)
301 'implicit)
303 (defun vc-bzr-create-repo ()
304 "Create a new Bzr repository."
305 (vc-bzr-command "init" nil 0 nil))
307 (defun vc-bzr-init-revision (&optional file)
308 "Always return nil, as Bzr cannot register explicit versions."
309 nil)
311 (defun vc-bzr-register (files &optional rev comment)
312 "Register FILE under bzr.
313 Signal an error unless REV is nil.
314 COMMENT is ignored."
315 (if rev (error "Can't register explicit revision with bzr"))
316 (vc-bzr-command "add" nil 0 files))
318 ;; Could run `bzr status' in the directory and see if it succeeds, but
319 ;; that's relatively expensive.
320 (defalias 'vc-bzr-responsible-p 'vc-bzr-root
321 "Return non-nil if FILE is (potentially) controlled by bzr.
322 The criterion is that there is a `.bzr' directory in the same
323 or a superior directory.")
325 (defun vc-bzr-could-register (file)
326 "Return non-nil if FILE could be registered under bzr."
327 (and (vc-bzr-responsible-p file) ; shortcut
328 (condition-case ()
329 (with-temp-buffer
330 (vc-bzr-command "add" t 0 file "--dry-run")
331 ;; The command succeeds with no output if file is
332 ;; registered (in bzr 0.8).
333 (goto-char (point-min))
334 (looking-at "added "))
335 (error))))
337 (defun vc-bzr-unregister (file)
338 "Unregister FILE from bzr."
339 (vc-bzr-command "remove" nil 0 file "--keep"))
341 (defun vc-bzr-checkin (files rev comment)
342 "Check FILE in to bzr with log message COMMENT.
343 REV non-nil gets an error."
344 (if rev (error "Can't check in a specific revision with bzr"))
345 (vc-bzr-command "commit" nil 0 files "-m" comment))
347 (defun vc-bzr-find-version (file rev buffer)
348 "Fetch version REV of file FILE and put it into BUFFER."
349 (with-current-buffer buffer
350 (if (and rev (stringp rev) (not (string= rev "")))
351 (vc-bzr-command "cat" t 0 file "-r" rev)
352 (vc-bzr-command "cat" t 0 file))))
354 (defun vc-bzr-checkout (file &optional editable rev destfile)
355 "Checkout revision REV of FILE from bzr to DESTFILE.
356 EDITABLE is ignored."
357 (unless destfile
358 (setq destfile (vc-version-backup-file-name file rev)))
359 (let ((coding-system-for-read 'binary)
360 (coding-system-for-write 'binary))
361 (with-temp-file destfile
362 (if (and rev (stringp rev) (not (string= rev "")))
363 (vc-bzr-command "cat" t 0 file "-r" rev)
364 (vc-bzr-command "cat" t 0 file)))))
366 (defun vc-bzr-revert (file &optional contents-done)
367 (unless contents-done
368 (with-temp-buffer (vc-bzr-command "revert" t 0 file))))
370 (defvar log-view-message-re)
371 (defvar log-view-file-re)
372 (defvar log-view-font-lock-keywords)
373 (defvar log-view-current-tag-function)
375 (define-derived-mode vc-bzr-log-view-mode log-view-mode "Bzr-Log-View"
376 (remove-hook 'log-view-mode-hook 'vc-bzr-log-view-mode) ;Deactivate the hack.
377 (require 'add-log)
378 ;; Don't have file markers, so use impossible regexp.
379 (set (make-local-variable 'log-view-file-re) "\\'\\`")
380 (set (make-local-variable 'log-view-message-re)
381 "^ *-+\n *\\(?:revno: \\([0-9]+\\)\\|merged: .+\\)")
382 (set (make-local-variable 'log-view-font-lock-keywords)
383 ;; log-view-font-lock-keywords is careful to use the buffer-local
384 ;; value of log-view-message-re only since Emacs-23.
385 (append `((,log-view-message-re . 'log-view-message-face))
386 ;; log-view-font-lock-keywords
387 '(("^ *committer: \
388 \\([^<(]+?\\)[ ]*[(<]\\([[:alnum:]_.+-]+@[[:alnum:]_.-]+\\)[>)]"
389 (1 'change-log-name)
390 (2 'change-log-email))
391 ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face))))))
393 (defun vc-bzr-print-log (files &optional buffer) ; get buffer arg in Emacs 22
394 "Get bzr change log for FILES into specified BUFFER."
395 ;; FIXME: `vc-bzr-command' runs `bzr log' with `LC_MESSAGES=C', so
396 ;; the log display may not what the user wants - but I see no other
397 ;; way of getting the above regexps working.
398 (apply 'vc-bzr-command "log" buffer 0 files
399 (if (stringp vc-bzr-log-switches)
400 (list vc-bzr-log-switches)
401 vc-bzr-log-switches))
402 ;; FIXME: Until Emacs-23, VC was missing a hook to sort out the mode for
403 ;; the buffer, or at least set the regexps right.
404 (unless (fboundp 'vc-default-log-view-mode)
405 (add-hook 'log-view-mode-hook 'vc-bzr-log-view-mode)))
407 (defun vc-bzr-show-log-entry (revision)
408 "Find entry for patch name REVISION in bzr change log buffer."
409 (goto-char (point-min))
410 (let (case-fold-search)
411 (if (re-search-forward (concat "^-+\nrevno: " revision "$") nil t)
412 (beginning-of-line 0)
413 (goto-char (point-min)))))
415 (autoload 'vc-diff-switches-list "vc" nil nil t)
417 (defun vc-bzr-diff (files &optional rev1 rev2 buffer)
418 "VC bzr backend for diff."
419 ;; `bzr diff' exits with code 1 if diff is non-empty
420 (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 1 files
421 "--diff-options" (mapconcat 'identity
422 (vc-diff-switches-list bzr)
423 " ")
424 (list "-r" (format "%s..%s"
425 (or rev1 "revno:-1")
426 (or rev2 "")))))
429 ;; FIXME: vc-{next,previous}-revision need fixing in vc.el to deal with
430 ;; straight integer revisions.
432 (defun vc-bzr-delete-file (file)
433 "Delete FILE and delete it in the bzr repository."
434 (condition-case ()
435 (delete-file file)
436 (file-error nil))
437 (vc-bzr-command "remove" nil 0 file))
439 (defun vc-bzr-rename-file (old new)
440 "Rename file from OLD to NEW using `bzr mv'."
441 (vc-bzr-command "mv" nil 0 new old))
443 (defvar vc-bzr-annotation-table nil
444 "Internal use.")
445 (make-variable-buffer-local 'vc-bzr-annotation-table)
447 (defun vc-bzr-annotate-command (file buffer &optional revision)
448 "Prepare BUFFER for `vc-annotate' on FILE.
449 Each line is tagged with the revision number, which has a `help-echo'
450 property containing author and date information."
451 (apply #'vc-bzr-command "annotate" buffer 0 file "--long" "--all"
452 (if revision (list "-r" revision)))
453 (with-current-buffer buffer
454 ;; Store the tags for the annotated source lines in a hash table
455 ;; to allow saving space by sharing the text properties.
456 (setq vc-bzr-annotation-table (make-hash-table :test 'equal))
457 (goto-char (point-min))
458 (while (re-search-forward "^\\( *[0-9]+\\) +\\(.+\\) +\\([0-9]\\{8\\}\\) |"
459 nil t)
460 (let* ((rev (match-string 1))
461 (author (match-string 2))
462 (date (match-string 3))
463 (key (match-string 0))
464 (tag (gethash key vc-bzr-annotation-table)))
465 (unless tag
466 (setq tag (propertize rev 'help-echo (concat "Author: " author
467 ", date: " date)
468 'mouse-face 'highlight))
469 (puthash key tag vc-bzr-annotation-table))
470 (replace-match "")
471 (insert tag " |")))))
473 (defun vc-bzr-annotate-time ()
474 (when (re-search-forward "^ *[0-9]+ |" nil t)
475 (let ((prop (get-text-property (line-beginning-position) 'help-echo)))
476 (string-match "[0-9]+\\'" prop)
477 (vc-annotate-convert-time
478 (encode-time 0 0 0
479 (string-to-number (substring (match-string 0 prop) 6 8))
480 (string-to-number (substring (match-string 0 prop) 4 6))
481 (string-to-number (substring (match-string 0 prop) 0 4))
482 )))))
484 (defun vc-bzr-annotate-extract-revision-at-line ()
485 "Return revision for current line of annoation buffer, or nil.
486 Return nil if current line isn't annotated."
487 (save-excursion
488 (beginning-of-line)
489 (if (looking-at " *\\([0-9]+\\) | ")
490 (match-string-no-properties 1))))
492 (defun vc-bzr-command-discarding-stderr (command &rest args)
493 "Execute shell command COMMAND (with ARGS); return its output and exitcode.
494 Return value is a cons (EXITCODE . OUTPUT), where EXITCODE is
495 the (numerical) exit code of the process, and OUTPUT is a string
496 containing whatever the process sent to its standard output
497 stream. Standard error output is discarded."
498 (with-temp-buffer
499 (cons
500 (apply #'call-process command nil (list (current-buffer) nil) nil args)
501 (buffer-substring (point-min) (point-max)))))
503 ;; TODO: it would be nice to mark the conflicted files in VC Dired,
504 ;; and implement a command to run ediff and `bzr resolve' once the
505 ;; changes have been merged.
506 (defun vc-bzr-dir-state (dir &optional localp)
507 "Find the VC state of all files in DIR and its subdirectories.
508 Optional argument LOCALP is always ignored."
509 (let ((bzr-root-directory (vc-bzr-root dir))
510 (at-start t)
511 current-bzr-state current-vc-state)
512 ;; Check that DIR is a bzr repository.
513 (unless (file-name-absolute-p bzr-root-directory)
514 (error "Cannot find bzr repository for directory `%s'" dir))
515 ;; `bzr ls --versioned' lists all versioned files;
516 ;; assume they are up-to-date, unless we are given
517 ;; evidence of the contrary.
518 (setq at-start t)
519 (with-temp-buffer
520 (buffer-disable-undo) ;; Because these buffers can get huge
521 (vc-bzr-command "ls" t 0 nil "--versioned")
522 (goto-char (point-min))
523 (while (or at-start
524 (eq 0 (forward-line)))
525 (setq at-start nil)
526 (let ((file (expand-file-name
527 (buffer-substring-no-properties
528 (line-beginning-position) (line-end-position))
529 bzr-root-directory)))
530 ;; files are up-to-date unless they appear in the `bzr
531 ;; status' output below
532 (vc-file-setprop file 'vc-state 'up-to-date)
533 ;; XXX: is this correct? what happens if one
534 ;; mixes different SCMs in the same dir?
535 ;; Anyway, we're looking at the output of `bzr ls --versioned',
536 ;; so we know these files are registered with Bzr.
537 (vc-file-setprop file 'vc-backend 'Bzr))))
538 ;; `bzr status' reports on added/modified/renamed and unknown/ignored files
539 (setq at-start t)
540 (with-temp-buffer
541 (vc-bzr-command "status" t 0 nil)
542 (goto-char (point-min))
543 (while (or at-start
544 (eq 0 (forward-line)))
545 (setq at-start nil)
546 (cond
547 ((looking-at "^added")
548 (setq current-vc-state 'added)
549 (setq current-bzr-state 'added))
550 ((looking-at "^kind changed")
551 (setq current-vc-state 'edited)
552 (setq current-bzr-state 'kindchanged))
553 ((looking-at "^modified")
554 (setq current-vc-state 'edited)
555 (setq current-bzr-state 'modified))
556 ((looking-at "^renamed")
557 (setq current-vc-state 'edited)
558 (setq current-bzr-state 'renamed))
559 ((looking-at "^ignored")
560 (setq current-vc-state 'ignored)
561 (setq current-bzr-state 'not-versioned))
562 ((looking-at "^unknown")
563 (setq current-vc-state 'unregistered)
564 (setq current-bzr-state 'not-versioned))
565 ((looking-at " ")
566 ;; file names are indented by two spaces
567 (when current-vc-state
568 (let ((file (expand-file-name
569 (buffer-substring-no-properties
570 (match-end 0) (line-end-position))
571 bzr-root-directory)))
572 (vc-file-setprop file 'vc-state current-vc-state)
573 (vc-file-setprop file 'vc-bzr-state current-bzr-state)
574 (when (eq 'added current-bzr-state)
575 (vc-file-setprop file 'vc-working-revision "0"))))
576 (when (eq 'not-versioned current-bzr-state)
577 (let ((file (expand-file-name
578 (buffer-substring-no-properties
579 (match-end 0) (line-end-position))
580 bzr-root-directory)))
581 (vc-file-setprop file 'vc-backend 'none)
582 (vc-file-setprop file 'vc-state nil))))
584 ;; skip this part of `bzr status' output
585 (setq current-vc-state nil)
586 (setq current-bzr-state nil)))))))
588 (defun vc-bzr-dired-state-info (file)
589 "Bzr-specific version of `vc-dired-state-info'."
590 (if (eq 'edited (vc-state file))
591 (concat "(" (symbol-name (or (vc-file-getprop file 'vc-bzr-state)
592 'edited)) ")")
593 ;; else fall back to default vc.el representation
594 (vc-default-dired-state-info 'Bzr file)))
596 (eval-after-load "vc"
597 '(add-to-list 'vc-directory-exclusion-list vc-bzr-admin-dirname t))
599 (provide 'vc-bzr)
600 ;; arch-tag: 8101bad8-4e92-4e7d-85ae-d8e08b4e7c06
601 ;;; vc-bzr.el ends here