lisp/vc-bzr.el

   1 ;;; vc-bzr.el --- VC backend for the bzr revision control system
   2
   3 ;; Copyright (C) 2006, 2007  Free Software Foundation, Inc.
   4
   5 ;; Author: Dave Love <fx@gnu.org>, Riccardo Murri <riccardo.murri@gmail.com>
   6 ;; Keywords: tools
   7 ;; Created: Sept 2006
   8 ;; Version: 2007-09-05
   9 ;; URL: http://launchpad.net/vc-bzr
  10
  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.
  15
  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.
  20
  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.
  25
  26
  27 ;;; Commentary:
  28
  29 ;; See <URL:http://bazaar-vcs.org/> concerning bzr.
  30
  31 ;; Load this library to register bzr support in VC.  It covers basic VC
  32 ;; functionality, but was only lightly exercised with a few Emacs/bzr
  33 ;; version combinations, namely those current on the authors' PCs.
  34 ;; See various Fixmes below.
  35
  36
  37 ;; Known bugs
  38 ;; ==========
  39
  40 ;; When edititing a symlink and *both* the symlink and its target
  41 ;; are bzr-versioned, `vc-bzr` presently runs `bzr status` on the
  42 ;; symlink, thereby not detecting whether the actual contents
  43 ;; (that is, the target contents) are changed.
  44 ;; See https://bugs.launchpad.net/vc-bzr/+bug/116607
  45
  46 ;; For an up-to-date list of bugs, please see:
  47 ;;   https://bugs.launchpad.net/vc-bzr/+bugs
  48
  49
  50 ;;; Code:
  51
  52 (eval-when-compile
  53   (require 'cl)
  54   (require 'vc))                        ; for vc-exec-after
  55
  56 ;; Clear up the cache to force vc-call to check again and discover
  57 ;; new functions when we reload this file.
  58 (put 'Bzr 'vc-functions nil)
  59
  60 (defgroup vc-bzr nil
  61   "VC bzr backend."
  62   :version "22.2"
  63   :group 'vc)
  64
  65 (defcustom vc-bzr-program "bzr"
  66   "Name of the bzr command (excluding any arguments)."
  67   :group 'vc-bzr
  68   :type 'string)
  69
  70 ;; Fixme: there's probably no call for this.
  71 (defcustom vc-bzr-program-args nil
  72   "List of global arguments to pass to `vc-bzr-program'."
  73   :group 'vc-bzr
  74   :type '(repeat string))
  75
  76 (defcustom vc-bzr-diff-switches nil
  77   "String/list of strings specifying extra switches for bzr diff under VC."
  78   :type '(choice (const :tag "None" nil)
  79                  (string :tag "Argument String")
  80                  (repeat :tag "Argument List" :value ("") string))
  81   :group 'vc-bzr)
  82
  83 ;; since v0.9, bzr supports removing the progress indicators
  84 ;; by setting environment variable BZR_PROGRESS_BAR to "none".
  85 (defun vc-bzr-command (bzr-command buffer okstatus file-or-list &rest args)
  86   "Wrapper round `vc-do-command' using `vc-bzr-program' as COMMAND.
  87 Invoke the bzr command adding `BZR_PROGRESS_BAR=none' to the environment."
  88   (let ((process-environment
  89          (list* "BZR_PROGRESS_BAR=none" ; Suppress progress output (bzr >=0.9)
  90                 "LC_ALL=C"              ; Force English output
  91                 process-environment)))
  92     (apply 'vc-do-command buffer okstatus vc-bzr-program
  93            file-or-list bzr-command (append vc-bzr-program-args args))))
  94
  95
  96 ;;;###autoload
  97 (defconst vc-bzr-admin-dirname ".bzr"    ; FIXME: "_bzr" on w32?
  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"))
 110
 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))))
 116
 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       (vc-file-setprop
 122        file 'bzr-root
 123        (vc-find-root file vc-bzr-admin-checkout-format-file))))
 124
 125 (defun vc-bzr-registered (file)
 126   "Return non-nil if FILE is registered with bzr.
 127
 128 For speed, this function tries first to parse Bzr internal file
 129 `checkout/dirstate', but it may fail if Bzr internal file format
 130 has changed.  As a safeguard, the `checkout/dirstate' file is
 131 only parsed if it contains the string `#bazaar dirstate flat
 132 format 3' in the first line.
 133
 134 If the `checkout/dirstate' file cannot be parsed, fall back to
 135 running `vc-bzr-state'."
 136   (lexical-let ((root (vc-bzr-root file)))
 137     (when root    ; Short cut.
 138       ;; This looks at internal files.  May break if they change
 139       ;; their format.
 140       (lexical-let ((dirstate (expand-file-name vc-bzr-admin-dirstate root)))
 141         (if (not (file-readable-p dirstate))
 142             (vc-bzr-state file)         ; Expensive.
 143           (with-temp-buffer
 144             (insert-file-contents dirstate)
 145             (goto-char (point-min))
 146             (if (not (looking-at "#bazaar dirstate flat format 3"))
 147                 (vc-bzr-state file)     ; Some other unknown format?
 148               (let* ((relfile (file-relative-name file root))
 149                      (reldir (file-name-directory relfile)))
 150                 (re-search-forward
 151                  (concat "^\0"
 152                          (if reldir (regexp-quote (directory-file-name reldir)))
 153                          "\0"
 154                          (regexp-quote (file-name-nondirectory relfile))
 155                          "\0")
 156                  nil t)))))))))
 157
 158 (defconst vc-bzr-state-words
 159   "added\\|ignored\\|kind changed\\|modified\\|removed\\|renamed\\|unknown"
 160   "Regexp matching file status words as reported in `bzr' output.")
 161
 162 (defun vc-bzr-file-name-relative (filename)
 163   "Return file name FILENAME stripped of the initial Bzr repository path."
 164   (lexical-let*
 165       ((filename* (expand-file-name filename))
 166        (rootdir (vc-bzr-root (file-name-directory filename*))))
 167     (when rootdir
 168          (file-relative-name filename* rootdir))))
 169
 170 ;; FIXME:  Also get this in a non-registered sub-directory.
 171 ;; It already works for me. -- Riccardo
 172 (defun vc-bzr-status (file)
 173   "Return FILE status according to Bzr.
 174 Return value is a cons (STATUS . WARNING), where WARNING is a
 175 string or nil, and STATUS is one of the symbols: `added',
 176 `ignored', `kindchanged', `modified', `removed', `renamed', `unknown',
 177 which directly correspond to `bzr status' output, or 'unchanged
 178 for files whose copy in the working tree is identical to the one
 179 in the branch repository, or nil for files that are not
 180 registered with Bzr.
 181
 182 If any error occurred in running `bzr status', then return nil."
 183   (with-temp-buffer
 184     (let ((ret (condition-case nil
 185                    (vc-bzr-command "status" t 0 file)
 186                  (file-error nil)))     ; vc-bzr-program not found.
 187           (status 'unchanged))
 188           ;; the only secure status indication in `bzr status' output
 189           ;; is a couple of lines following the pattern::
 190           ;;   | <status>:
 191           ;;   |   <file name>
 192           ;; if the file is up-to-date, we get no status report from `bzr',
 193           ;; so if the regexp search for the above pattern fails, we consider
 194           ;; the file to be up-to-date.
 195           (goto-char (point-min))
 196           (when (re-search-forward
 197                  ;; bzr prints paths relative to the repository root.
 198                  (concat "^\\(" vc-bzr-state-words "\\):[ \t\n]+"
 199                          (regexp-quote (vc-bzr-file-name-relative file))
 200                          (if (file-directory-p file) "/?" "")
 201                          "[ \t\n]*$")
 202                  nil t)
 203             (lexical-let ((statusword (match-string 1)))
 204               ;; Erase the status text that matched.
 205               (delete-region (match-beginning 0) (match-end 0))
 206               (setq status
 207                     (and (equal ret 0) ; Seems redundant.  --Stef
 208                          (intern (replace-regexp-in-string " " ""
 209                                                          statusword))))))
 210           (when status
 211             (goto-char (point-min))
 212             (skip-chars-forward " \n\t") ;Throw away spaces.
 213             (cons status
 214                   ;; "bzr" will output warnings and informational messages to
 215                   ;; stderr; due to Emacs' `vc-do-command' (and, it seems,
 216                   ;; `start-process' itself) limitations, we cannot catch stderr
 217                   ;; and stdout into different buffers.  So, if there's anything
 218                   ;; left in the buffer after removing the above status
 219                   ;; keywords, let us just presume that any other message from
 220                   ;; "bzr" is a user warning, and display it.
 221                   (unless (eobp) (buffer-substring (point) (point-max))))))))
 222
 223 (defun vc-bzr-state (file)
 224   (lexical-let ((result (vc-bzr-status file)))
 225     (when (consp result)
 226       (if (cdr result)
 227           (message "Warnings in `bzr' output: %s" (cdr result)))
 228       (cdr (assq (car result)
 229                  '((added . edited)
 230                    (kindchanged . edited)
 231                    (renamed . edited)
 232                    (modified . edited)
 233                    (removed . edited)
 234                    (ignored . nil)
 235                    (unknown . nil)
 236                    (unchanged . up-to-date)))))))
 237
 238 (defun vc-bzr-workfile-unchanged-p (file)
 239   (eq 'unchanged (car (vc-bzr-status file))))
 240
 241 (defun vc-bzr-working-revision (file)
 242   (lexical-let*
 243       ((rootdir (vc-bzr-root file))
 244        (branch-format-file (expand-file-name vc-bzr-admin-branch-format-file
 245                                              rootdir))
 246        (revhistory-file (expand-file-name vc-bzr-admin-revhistory rootdir))
 247        (lastrev-file (expand-file-name vc-bzr-admin-lastrev rootdir)))
 248     ;; This looks at internal files to avoid forking a bzr process.
 249     ;; May break if they change their format.
 250     (if (file-exists-p branch-format-file)
 251         (with-temp-buffer
 252           (insert-file-contents branch-format-file)
 253           (goto-char (point-min))
 254           (cond
 255            ((or
 256              (looking-at "Bazaar-NG branch, format 0.0.4")
 257              (looking-at "Bazaar-NG branch format 5"))
 258             ;; count lines in .bzr/branch/revision-history
 259             (insert-file-contents revhistory-file)
 260             (number-to-string (count-lines (line-end-position) (point-max))))
 261            ((looking-at "Bazaar Branch Format 6 (bzr 0.15)")
 262             ;; revno is the first number in .bzr/branch/last-revision
 263             (insert-file-contents lastrev-file)
 264             (if (re-search-forward "[0-9]+" nil t)
 265                 (buffer-substring (match-beginning 0) (match-end 0))))))
 266       ;; fallback to calling "bzr revno"
 267       (lexical-let*
 268           ((result (vc-bzr-command-discarding-stderr
 269                     vc-bzr-program "revno" file))
 270            (exitcode (car result))
 271            (output (cdr result)))
 272         (cond
 273          ((eq exitcode 0) (substring output 0 -1))
 274          (t nil))))))
 275
 276 (defun vc-bzr-checkout-model (file)
 277   'implicit)
 278
 279 (defun vc-bzr-create-repo ()
 280   "Create a new Bzr repository."
 281   (vc-bzr-command "init" nil 0 nil))
 282
 283 (defun vc-bzr-register (files &optional rev comment)
 284   "Register FILE under bzr.
 285 Signal an error unless REV is nil.
 286 COMMENT is ignored."
 287   (if rev (error "Can't register explicit revision with bzr"))
 288   (vc-bzr-command "add" nil 0 files))
 289
 290 ;; Could run `bzr status' in the directory and see if it succeeds, but
 291 ;; that's relatively expensive.
 292 (defalias 'vc-bzr-responsible-p 'vc-bzr-root
 293   "Return non-nil if FILE is (potentially) controlled by bzr.
 294 The criterion is that there is a `.bzr' directory in the same
 295 or a superior directory.")
 296
 297 (defun vc-bzr-could-register (file)
 298   "Return non-nil if FILE could be registered under bzr."
 299   (and (vc-bzr-responsible-p file)      ; shortcut
 300        (condition-case ()
 301            (with-temp-buffer
 302              (vc-bzr-command "add" t 0 file "--dry-run")
 303              ;; The command succeeds with no output if file is
 304              ;; registered (in bzr 0.8).
 305              (goto-char (point-min))
 306              (looking-at "added "))
 307          (error))))
 308
 309 (defun vc-bzr-unregister (file)
 310   "Unregister FILE from bzr."
 311   (vc-bzr-command "remove" nil 0 file))
 312
 313 (defun vc-bzr-checkin (files rev comment)
 314   "Check FILE in to bzr with log message COMMENT.
 315 REV non-nil gets an error."
 316   (if rev (error "Can't check in a specific revision with bzr"))
 317   (vc-bzr-command "commit" nil 0 files "-m" comment))
 318
 319 (defun vc-bzr-checkout (file &optional editable rev destfile)
 320   "Checkout revision REV of FILE from bzr to DESTFILE.
 321 EDITABLE is ignored."
 322   (unless destfile
 323     (setq destfile (vc-version-backup-file-name file rev)))
 324   (let ((coding-system-for-read 'binary)
 325         (coding-system-for-write 'binary))
 326     (with-temp-file destfile
 327       (if rev
 328           (vc-bzr-command "cat" t 0 file "-r" rev)
 329         (vc-bzr-command "cat" t 0 file)))))
 330
 331 (defun vc-bzr-revert (file &optional contents-done)
 332   (unless contents-done
 333     (with-temp-buffer (vc-bzr-command "revert" t 0 file))))
 334
 335 (defvar log-view-message-re)
 336 (defvar log-view-file-re)
 337 (defvar log-view-font-lock-keywords)
 338 (defvar log-view-current-tag-function)
 339
 340 (define-derived-mode vc-bzr-log-view-mode log-view-mode "Bzr-Log-View"
 341   (remove-hook 'log-view-mode-hook 'vc-bzr-log-view-mode) ;Deactivate the hack.
 342   (require 'add-log)
 343   ;; Don't have file markers, so use impossible regexp.
 344   (set (make-local-variable 'log-view-file-re) "\\'\\`")
 345   (set (make-local-variable 'log-view-message-re)
 346        "^ *-+\n *\\(?:revno: \\([0-9]+\\)\\|merged: .+\\)")
 347   (set (make-local-variable 'log-view-font-lock-keywords)
 348        ;; log-view-font-lock-keywords is careful to use the buffer-local
 349        ;; value of log-view-message-re only since Emacs-23.
 350        (append `((,log-view-message-re . 'log-view-message-face))
 351                ;; log-view-font-lock-keywords
 352                '(("^ *committer: \
 353 \\([^<(]+?\\)[  ]*[(<]\\([[:alnum:]_.+-]+@[[:alnum:]_.-]+\\)[>)]"
 354                   (1 'change-log-name)
 355                   (2 'change-log-email))
 356                  ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face))))))
 357
 358 (defun vc-bzr-print-log (files &optional buffer) ; get buffer arg in Emacs 22
 359   "Get bzr change log for FILES into specified BUFFER."
 360   ;; Fixme: This might need the locale fixing up if things like `revno'
 361   ;; got localized, but certainly it shouldn't use LC_ALL=C.
 362   (vc-bzr-command "log" buffer 0 files)
 363   ;; FIXME: Until Emacs-23, VC was missing a hook to sort out the mode for
 364   ;; the buffer, or at least set the regexps right.
 365   (unless (fboundp 'vc-default-log-view-mode)
 366     (add-hook 'log-view-mode-hook 'vc-bzr-log-view-mode)))
 367
 368 (defun vc-bzr-show-log-entry (revision)
 369   "Find entry for patch name REVISION in bzr change log buffer."
 370   (goto-char (point-min))
 371   (let (case-fold-search)
 372     (if (re-search-forward (concat "^-+\nrevno: " revision "$") nil t)
 373         (beginning-of-line 0)
 374       (goto-char (point-min)))))
 375
 376 (autoload 'vc-diff-switches-list "vc" nil nil t)
 377
 378 (defun vc-bzr-diff (files &optional rev1 rev2 buffer)
 379   "VC bzr backend for diff."
 380   (let ((working (vc-working-revision (if (consp files) (car files) files))))
 381     (if (and (equal rev1 working) (not rev2))
 382         (setq rev1 nil))
 383     (if (and (not rev1) rev2)
 384         (setq rev1 working))
 385     ;; bzr diff produces condition code 1 for some reason.
 386     (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 1 files
 387            "--diff-options" (mapconcat 'identity (vc-diff-switches-list bzr)
 388                                        " ")
 389            (when rev1
 390              (if rev2
 391                  (list "-r" (format "%s..%s" rev1 rev2))
 392                (list "-r" rev1))))))
 393
 394
 395
 396 ;; FIXME: vc-{next,previous}-revision need fixing in vc.el to deal with
 397 ;; straight integer revisions.
 398
 399 (defun vc-bzr-delete-file (file)
 400   "Delete FILE and delete it in the bzr repository."
 401   (condition-case ()
 402       (delete-file file)
 403     (file-error nil))
 404   (vc-bzr-command "remove" nil 0 file))
 405
 406 (defun vc-bzr-rename-file (old new)
 407   "Rename file from OLD to NEW using `bzr mv'."
 408   (vc-bzr-command "mv" nil 0 new old))
 409
 410 (defvar vc-bzr-annotation-table nil
 411   "Internal use.")
 412 (make-variable-buffer-local 'vc-bzr-annotation-table)
 413
 414 (defun vc-bzr-annotate-command (file buffer &optional revision)
 415   "Prepare BUFFER for `vc-annotate' on FILE.
 416 Each line is tagged with the revision number, which has a `help-echo'
 417 property containing author and date information."
 418   (apply #'vc-bzr-command "annotate" buffer 0 file "--long" "--all"
 419          (if revision (list "-r" revision)))
 420   (with-current-buffer buffer
 421     ;; Store the tags for the annotated source lines in a hash table
 422     ;; to allow saving space by sharing the text properties.
 423     (setq vc-bzr-annotation-table (make-hash-table :test 'equal))
 424     (goto-char (point-min))
 425     (while (re-search-forward "^\\( *[0-9]+\\) +\\(.+\\) +\\([0-9]\\{8\\}\\) |"
 426                               nil t)
 427       (let* ((rev (match-string 1))
 428              (author (match-string 2))
 429              (date (match-string 3))
 430              (key (match-string 0))
 431              (tag (gethash key vc-bzr-annotation-table)))
 432         (unless tag
 433           (setq tag (propertize rev 'help-echo (concat "Author: " author
 434                                                        ", date: " date)
 435                                 'mouse-face 'highlight))
 436           (puthash key tag vc-bzr-annotation-table))
 437         (replace-match "")
 438         (insert tag " |")))))
 439
 440 ;; Definition from Emacs 22
 441 (unless (fboundp 'vc-annotate-convert-time)
 442   (defun vc-annotate-convert-time (time)
 443     "Convert a time value to a floating-point number of days.
 444 The argument TIME is a list as returned by `current-time' or
 445 `encode-time', only the first two elements of that list are considered."
 446     (/ (+ (* (float (car time)) (lsh 1 16)) (cadr time)) 24 3600)))
 447
 448 (defun vc-bzr-annotate-time ()
 449   (when (re-search-forward "^ *[0-9]+ |" nil t)
 450     (let ((prop (get-text-property (line-beginning-position) 'help-echo)))
 451       (string-match "[0-9]+\\'" prop)
 452       (vc-annotate-convert-time
 453        (encode-time 0 0 0
 454                     (string-to-number (substring (match-string 0 prop) 6 8))
 455                     (string-to-number (substring (match-string 0 prop) 4 6))
 456                     (string-to-number (substring (match-string 0 prop) 0 4))
 457                     )))))
 458
 459 (defun vc-bzr-annotate-extract-revision-at-line ()
 460   "Return revision for current line of annoation buffer, or nil.
 461 Return nil if current line isn't annotated."
 462   (save-excursion
 463     (beginning-of-line)
 464     (if (looking-at " *\\([0-9]+\\) | ")
 465         (match-string-no-properties 1))))
 466
 467 ;; Not needed for Emacs 22
 468 (defun vc-bzr-annotate-difference (point)
 469   (let ((next-time (vc-bzr-annotate-time)))
 470     (if next-time
 471         (- (vc-annotate-convert-time (current-time)) next-time))))
 472
 473 (defun vc-bzr-command-discarding-stderr (command &rest args)
 474   "Execute shell command COMMAND (with ARGS); return its output and exitcode.
 475 Return value is a cons (EXITCODE . OUTPUT), where EXITCODE is
 476 the (numerical) exit code of the process, and OUTPUT is a string
 477 containing whatever the process sent to its standard output
 478 stream.  Standard error output is discarded."
 479   (with-temp-buffer
 480     (cons
 481      (apply #'call-process command nil (list (current-buffer) nil) nil args)
 482      (buffer-substring (point-min) (point-max)))))
 483
 484 ;; TODO: it would be nice to mark the conflicted files in  VC Dired,
 485 ;; and implement a command to run ediff and `bzr resolve' once the
 486 ;; changes have been merged.
 487 (defun vc-bzr-dir-state (dir &optional localp)
 488   "Find the VC state of all files in DIR.
 489 Optional argument LOCALP is always ignored."
 490   (let ((bzr-root-directory (vc-bzr-root dir))
 491         (at-start t)
 492         current-bzr-state current-vc-state)
 493     ;; Check that DIR is a bzr repository.
 494     (unless (file-name-absolute-p bzr-root-directory)
 495       (error "Cannot find bzr repository for directory `%s'" dir))
 496     ;; `bzr ls --versioned' lists all versioned files;
 497     ;; assume they are up-to-date, unless we are given
 498     ;; evidence of the contrary.
 499     (setq at-start t)
 500     (with-temp-buffer
 501       (vc-bzr-command "ls" t 0 nil "--versioned" "--non-recursive")
 502       (goto-char (point-min))
 503       (while (or at-start
 504                  (eq 0 (forward-line)))
 505         (setq at-start nil)
 506         (let ((file (expand-file-name
 507                      (buffer-substring-no-properties
 508                       (line-beginning-position) (line-end-position))
 509                      bzr-root-directory)))
 510           (vc-file-setprop file 'vc-state 'up-to-date)
 511           ;; XXX: is this correct? what happens if one
 512           ;; mixes different SCMs in the same dir?
 513           (vc-file-setprop file 'vc-backend 'Bzr))))
 514     ;; `bzr status' reports on added/modified/renamed and unknown/ignored files
 515     (setq at-start t)
 516     (with-temp-buffer
 517       (vc-bzr-command "status" t 0 nil)
 518       (goto-char (point-min))
 519       (while (or at-start
 520                  (eq 0 (forward-line)))
 521         (setq at-start nil)
 522         (cond
 523          ((looking-at "^added")
 524           (setq current-vc-state 'edited)
 525           (setq current-bzr-state 'added))
 526          ((looking-at "^kind changed")
 527           (setq current-vc-state 'edited)
 528           (setq current-bzr-state 'kindchanged))
 529          ((looking-at "^modified")
 530           (setq current-vc-state 'edited)
 531           (setq current-bzr-state 'modified))
 532          ((looking-at "^renamed")
 533           (setq current-vc-state 'edited)
 534           (setq current-bzr-state 'renamed))
 535          ((looking-at "^\\(unknown\\|ignored\\)")
 536           (setq current-vc-state nil)
 537           (setq current-bzr-state 'not-versioned))
 538          ((looking-at "  ")
 539           ;; file names are indented by two spaces
 540           (when current-vc-state
 541             (let ((file (expand-file-name
 542                          (buffer-substring-no-properties
 543                           (match-end 0) (line-end-position))
 544                          bzr-root-directory)))
 545               (vc-file-setprop file 'vc-state current-vc-state)
 546               (vc-file-setprop file 'vc-bzr-state current-bzr-state)
 547               (when (eq 'added current-bzr-state)
 548                 (vc-file-setprop file 'vc-working-revision "0"))))
 549           (when (eq 'not-versioned current-bzr-state)
 550             (let ((file (expand-file-name
 551                          (buffer-substring-no-properties
 552                           (match-end 0) (line-end-position))
 553                          bzr-root-directory)))
 554               (vc-file-setprop file 'vc-backend 'none)
 555               (vc-file-setprop file 'vc-state nil))))
 556          (t
 557           ;; skip this part of `bzr status' output
 558           (setq current-vc-state nil)
 559           (setq current-bzr-state nil)))))))
 560
 561 (defun vc-bzr-dired-state-info (file)
 562   "Bzr-specific version of `vc-dired-state-info'."
 563   (if (eq 'edited (vc-state file))
 564       (let ((bzr-state (vc-file-getprop file 'vc-bzr-state)))
 565         (if bzr-state
 566             (concat "(" (symbol-name bzr-state) ")")
 567           ;; else fall back to default vc representation
 568           (vc-default-dired-state-info 'Bzr file)))))
 569
 570 (eval-after-load "vc"
 571   '(add-to-list 'vc-directory-exclusion-list vc-bzr-admin-dirname t))
 572
 573 (provide 'vc-bzr)
 574 ;; arch-tag: 8101bad8-4e92-4e7d-85ae-d8e08b4e7c06
 575 ;;; vc-bzr.el ends here