vc-bzr.el 51.2 KB
Newer Older
Stefan Monnier's avatar
Stefan Monnier committed
1 2
;;; vc-bzr.el --- VC backend for the bzr revision control system

3
;; Copyright (C) 2006-2011  Free Software Foundation, Inc.
Stefan Monnier's avatar
Stefan Monnier committed
4

5 6
;; Author: Dave Love <fx@gnu.org>
;; 	   Riccardo Murri <riccardo.murri@gmail.com>
Glenn Morris's avatar
Glenn Morris committed
7
;; Maintainer: FSF
8
;; Keywords: vc tools
Stefan Monnier's avatar
Stefan Monnier committed
9
;; Created: Sept 2006
10
;; Package: vc
Stefan Monnier's avatar
Stefan Monnier committed
11

12 13 14
;; This file is part of GNU Emacs.

;; GNU Emacs is free software: you can redistribute it and/or modify
Stefan Monnier's avatar
Stefan Monnier committed
15
;; it under the terms of the GNU General Public License as published by
16 17
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
Stefan Monnier's avatar
Stefan Monnier committed
18

19
;; GNU Emacs is distributed in the hope that it will be useful,
Stefan Monnier's avatar
Stefan Monnier committed
20 21 22 23 24
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
25
;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
Stefan Monnier's avatar
Stefan Monnier committed
26 27 28

;;; Commentary:

Glenn Morris's avatar
Glenn Morris committed
29
;; See <URL:http://bazaar.canonical.com/> concerning bzr.
Stefan Monnier's avatar
Stefan Monnier committed
30

Glenn Morris's avatar
Glenn Morris committed
31
;; This library provides bzr support in VC.
32 33 34 35

;; Known bugs
;; ==========

36
;; When editing a symlink and *both* the symlink and its target
37 38
;; are bzr-versioned, `vc-bzr` presently runs `bzr status` on the
;; symlink, thereby not detecting whether the actual contents
39
;; (that is, the target contents) are changed.
40 41
;; See https://bugs.launchpad.net/vc-bzr/+bug/116607

42 43 44 45
;;; Properties of the backend

(defun vc-bzr-revision-granularity () 'repository)
(defun vc-bzr-checkout-model (files) 'implicit)
Stefan Monnier's avatar
Stefan Monnier committed
46 47 48 49

;;; Code:

(eval-when-compile
50
  (require 'cl)
51 52
  (require 'vc)  ;; for vc-exec-after
  (require 'vc-dir))
Stefan Monnier's avatar
Stefan Monnier committed
53

54 55
;; Clear up the cache to force vc-call to check again and discover
;; new functions when we reload this file.
56
(put 'Bzr 'vc-functions nil)
57

Stefan Monnier's avatar
Stefan Monnier committed
58 59
(defgroup vc-bzr nil
  "VC bzr backend."
60
  :version "22.2"
Stefan Monnier's avatar
Stefan Monnier committed
61 62 63
  :group 'vc)

(defcustom vc-bzr-program "bzr"
64
  "Name of the bzr command (excluding any arguments)."
Stefan Monnier's avatar
Stefan Monnier committed
65 66 67
  :group 'vc-bzr
  :type 'string)

68 69 70 71 72 73 74 75
(defcustom vc-bzr-sha1-program '("sha1sum")
  "Name of program to compute SHA1.
It must be a string \(program name\) or list of strings \(name and its args\)."
  :type '(repeat string)
  :group 'vc-bzr)

(define-obsolete-variable-alias 'sha1-program 'vc-bzr-sha1-program "24.1")

Stefan Monnier's avatar
Stefan Monnier committed
76
(defcustom vc-bzr-diff-switches nil
77 78 79 80
  "String or list of strings specifying switches for bzr diff under VC.
If nil, use the value of `vc-diff-switches'.  If t, use no switches."
  :type '(choice (const :tag "Unspecified" nil)
                 (const :tag "None" t)
Stefan Monnier's avatar
Stefan Monnier committed
81 82 83 84
                 (string :tag "Argument String")
                 (repeat :tag "Argument List" :value ("") string))
  :group 'vc-bzr)

85
(defcustom vc-bzr-log-switches nil
86
  "String or list of strings specifying switches for bzr log under VC."
87 88 89 90 91
  :type '(choice (const :tag "None" nil)
                 (string :tag "Argument String")
                 (repeat :tag "Argument List" :value ("") string))
  :group 'vc-bzr)

92 93
;; since v0.9, bzr supports removing the progress indicators
;; by setting environment variable BZR_PROGRESS_BAR to "none".
94
(defun vc-bzr-command (bzr-command buffer okstatus file-or-list &rest args)
95
  "Wrapper round `vc-do-command' using `vc-bzr-program' as COMMAND.
96 97
Invoke the bzr command adding `BZR_PROGRESS_BAR=none' and
`LC_MESSAGES=C' to the environment."
98 99
  (let ((process-environment
         (list* "BZR_PROGRESS_BAR=none" ; Suppress progress output (bzr >=0.9)
100
                "LC_MESSAGES=C"         ; Force English output
101
                process-environment)))
102
    (apply 'vc-do-command (or buffer "*vc*") okstatus vc-bzr-program
103
           file-or-list bzr-command args)))
Stefan Monnier's avatar
Stefan Monnier committed
104

105 106 107 108 109 110
(defun vc-bzr-async-command (bzr-command &rest args)
  "Wrapper round `vc-do-async-command' using `vc-bzr-program' as COMMAND.
Invoke the bzr command adding `BZR_PROGRESS_BAR=none' and
`LC_MESSAGES=C' to the environment.
Use the current Bzr root directory as the ROOT argument to
`vc-do-async-command', and specify an output buffer named
111
\"*vc-bzr : ROOT*\".  Return this buffer."
112 113 114 115 116 117
  (let* ((process-environment
	  (list* "BZR_PROGRESS_BAR=none" "LC_MESSAGES=C"
		 process-environment))
	 (root (vc-bzr-root default-directory))
	 (buffer (format "*vc-bzr : %s*" (expand-file-name root))))
    (apply 'vc-do-async-command buffer root
118 119
	   vc-bzr-program bzr-command args)
    buffer))
120 121

;;;###autoload
122
(defconst vc-bzr-admin-dirname ".bzr"
123
  "Name of the directory containing Bzr repository status files.")
Glenn Morris's avatar
Glenn Morris committed
124
;; Used in the autoloaded vc-bzr-registered; see below.
125
;;;###autoload
126 127
(defconst vc-bzr-admin-checkout-format-file
  (concat vc-bzr-admin-dirname "/checkout/format"))
128
(defconst vc-bzr-admin-dirstate
129 130 131
  (concat vc-bzr-admin-dirname "/checkout/dirstate"))
(defconst vc-bzr-admin-branch-format-file
  (concat vc-bzr-admin-dirname "/branch/format"))
132
(defconst vc-bzr-admin-revhistory
133
  (concat vc-bzr-admin-dirname "/branch/revision-history"))
134 135
(defconst vc-bzr-admin-lastrev
  (concat vc-bzr-admin-dirname "/branch/last-revision"))
136 137
(defconst vc-bzr-admin-branchconf
  (concat vc-bzr-admin-dirname "/branch/branch.conf"))
138 139

;;;###autoload (defun vc-bzr-registered (file)
140
;;;###autoload   (if (vc-find-root file vc-bzr-admin-checkout-format-file)
141 142 143
;;;###autoload       (progn
;;;###autoload         (load "vc-bzr")
;;;###autoload         (vc-bzr-registered file))))
Stefan Monnier's avatar
Stefan Monnier committed
144

145 146 147 148
(defun vc-bzr-root (file)
  "Return the root directory of the bzr repository containing FILE."
  ;; Cache technique copied from vc-arch.el.
  (or (vc-file-getprop file 'bzr-root)
149 150
      (let ((root (vc-find-root file vc-bzr-admin-checkout-format-file)))
	(when root (vc-file-setprop file 'bzr-root root)))))
Stefan Monnier's avatar
Stefan Monnier committed
151

152 153 154 155 156 157 158 159 160 161 162 163 164 165
(defun vc-bzr-branch-conf (file)
  "Return the Bazaar branch settings for file FILE, as an alist.
Each element of the returned alist has the form (NAME . VALUE),
which are the name and value of a Bazaar setting, as strings.

The settings are read from the file \".bzr/branch/branch.conf\"
in the repository root directory of FILE."
  (let (settings)
    (with-temp-buffer
      (insert-file-contents
       (expand-file-name vc-bzr-admin-branchconf (vc-bzr-root file)))
      (while (re-search-forward "^\\([^#=][^=]*?\\) *= *\\(.*\\)$" nil t)
	(push (cons (match-string 1) (match-string 2)) settings)))
    settings))
166

Stefan Monnier's avatar
Stefan Monnier committed
167 168 169
(defun vc-bzr-sha1 (file)
  (with-temp-buffer
    (set-buffer-multibyte nil)
170
    (let ((prog vc-bzr-sha1-program)
171 172
          (args nil)
	  process-file-side-effects)
Stefan Monnier's avatar
Stefan Monnier committed
173 174 175
      (when (consp prog)
	(setq args (cdr prog))
        (setq prog (car prog)))
176
      (apply 'process-file prog (file-relative-name file) t nil args)
Stefan Monnier's avatar
Stefan Monnier committed
177 178 179 180
      (buffer-substring (point-min) (+ (point-min) 40)))))

(defun vc-bzr-state-heuristic (file)
  "Like `vc-bzr-state' but hopefully without running Bzr."
Glenn Morris's avatar
Glenn Morris committed
181
  ;; `bzr status' was excruciatingly slow with large histories and
Stefan Monnier's avatar
Stefan Monnier committed
182 183 184 185 186 187 188 189 190
  ;; pending merges, so try to avoid using it until they fix their
  ;; performance problems.
  ;; This function tries first to parse Bzr internal file
  ;; `checkout/dirstate', but it may fail if Bzr internal file format
  ;; has changed.  As a safeguard, the `checkout/dirstate' file is
  ;; only parsed if it contains the string `#bazaar dirstate flat
  ;; format 3' in the first line.
  ;; If the `checkout/dirstate' file cannot be parsed, fall back to
  ;; running `vc-bzr-state'."
Glenn Morris's avatar
Glenn Morris committed
191 192 193 194 195 196 197 198 199 200 201
  ;;
  ;; The format of the dirstate file is explained in bzrlib/dirstate.py
  ;; in the bzr distribution.  Basically:
  ;; header-line giving the version of the file format in use.
  ;; a few lines of stuff
  ;; entries, one per line, with null-separated fields.  Each line:
  ;; entry_key = dirname (may be empty), basename, file-id
  ;; current = common ( = kind, fingerprint, size, executable )
  ;;           + working ( = packed_stat )
  ;; parent = common ( as above ) + history ( = rev_id )
  ;; kinds = (r)elocated, (a)bsent, (d)irectory, (f)ile, (l)ink
202 203 204
  (lexical-let ((root (vc-bzr-root file)))
    (when root    ; Short cut.
      (lexical-let ((dirstate (expand-file-name vc-bzr-admin-dirstate root)))
205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221
        (condition-case nil
            (with-temp-buffer
              (insert-file-contents dirstate)
              (goto-char (point-min))
              (if (not (looking-at "#bazaar dirstate flat format 3"))
                  (vc-bzr-state file)   ; Some other unknown format?
                (let* ((relfile (file-relative-name file root))
                       (reldir (file-name-directory relfile)))
                  (if (re-search-forward
                       (concat "^\0"
                               (if reldir (regexp-quote
                                           (directory-file-name reldir)))
                               "\0"
                               (regexp-quote (file-name-nondirectory relfile))
                               "\0"
                               "[^\0]*\0"     ;id?
                               "\\([^\0]*\\)\0" ;"a/f/d", a=removed?
222 223
                               "\\([^\0]*\\)\0" ;sha1 (empty if conflicted)?
                               "\\([^\0]*\\)\0" ;size?p
Glenn Morris's avatar
Glenn Morris committed
224 225 226
                               ;; y/n.  Whether or not the current copy
                               ;; was executable the last time bzr checked?
                               "[^\0]*\0"
227
                               "[^\0]*\0"       ;?
Glenn Morris's avatar
Glenn Morris committed
228 229
                               ;; Parent information.  Absent in a new repo.
                               "\\(?:\\([^\0]*\\)\0" ;"a/f/d" a=added?
230
                               "\\([^\0]*\\)\0" ;sha1 again?
231
                               "\\([^\0]*\\)\0" ;size again?
Glenn Morris's avatar
Glenn Morris committed
232 233 234
                               ;; y/n.  Whether or not the repo thinks
                               ;; the file should be executable?
                               "\\([^\0]*\\)\0"
Glenn Morris's avatar
Glenn Morris committed
235
                               "[^\0]*\0\\)?" ;last revid?
236 237 238 239 240 241 242 243 244
                               ;; There are more fields when merges are pending.
                               )
                       nil t)
                      ;; Apparently the second sha1 is the one we want: when
                      ;; there's a conflict, the first sha1 is absent (and the
                      ;; first size seems to correspond to the file with
                      ;; conflict markers).
                      (cond
                       ((eq (char-after (match-beginning 1)) ?a) 'removed)
Glenn Morris's avatar
Glenn Morris committed
245 246 247 248
                       ;; If there is no parent, this must be a new repo.
                       ;; If file is in dirstate, can only be added (b#8025).
                       ((or (not (match-beginning 4))
                            (eq (char-after (match-beginning 4)) ?a)) 'added)
249
                       ((or (and (eq (string-to-number (match-string 3))
250
                                 (nth 7 (file-attributes file)))
Glenn Morris's avatar
Glenn Morris committed
251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266
                                 (equal (match-string 5)
                                        (vc-bzr-sha1 file))
                                 ;; For a file, does the executable state match?
                                 ;; (Bug#7544)
                                 (or (not
                                      (eq (char-after (match-beginning 1)) ?f))
                                     (let ((exe
                                            (memq
                                             ?x
                                             (mapcar
                                              'identity
                                              (nth 8 (file-attributes file))))))
                                       (if (eq (char-after (match-beginning 7))
                                               ?y)
                                           exe
                                         (not exe)))))
267 268 269 270 271 272 273 274 275
			    (and
			     ;; It looks like for lightweight
			     ;; checkouts \2 is empty and we need to
			     ;; look for size in \6.
			     (eq (match-beginning 2) (match-end 2))
			     (eq (string-to-number (match-string 6))
				 (nth 7 (file-attributes file)))
			     (equal (match-string 5)
				    (vc-bzr-sha1 file))))
276 277 278 279 280 281 282 283 284
                        'up-to-date)
                       (t 'edited))
                    'unregistered))))
          ;; Either the dirstate file can't be read, or the sha1
          ;; executable is missing, or ...
          ;; In either case, recent versions of Bzr aren't that slow
          ;; any more.
          (error (vc-bzr-state file)))))))

Stefan Monnier's avatar
Stefan Monnier committed
285 286 287 288 289

(defun vc-bzr-registered (file)
  "Return non-nil if FILE is registered with bzr."
  (let ((state (vc-bzr-state-heuristic file)))
    (not (memq state '(nil unregistered ignored)))))
290 291

(defconst vc-bzr-state-words
292
  "added\\|ignored\\|kind changed\\|modified\\|removed\\|renamed\\|unknown"
293 294
  "Regexp matching file status words as reported in `bzr' output.")

295 296 297
;; History of Bzr commands.
(defvar vc-bzr-history nil)

298 299 300 301
(defun vc-bzr-file-name-relative (filename)
  "Return file name FILENAME stripped of the initial Bzr repository path."
  (lexical-let*
      ((filename* (expand-file-name filename))
302
       (rootdir (vc-bzr-root filename*)))
303
    (when rootdir
304 305
         (file-relative-name filename* rootdir))))

306 307 308 309 310 311 312
(defvar vc-bzr-error-regex-alist
  '(("^\\( M[* ]\\|+N \\|-D \\|\\|  \\*\\|R[M ] \\) \\(.+\\)" 2 nil nil 1)
    ("^C  \\(.+\\)" 2)
    ("^Text conflict in \\(.+\\)" 1 nil nil 2)
    ("^Using saved parent location: \\(.+\\)" 1 nil nil 0))
  "Value of `compilation-error-regexp-alist' in *vc-bzr* buffers.")

313 314 315 316 317 318 319
(defun vc-bzr-pull (prompt)
  "Pull changes into the current Bzr branch.
Normally, this runs \"bzr pull\".  However, if the branch is a
bound branch, run \"bzr update\" instead.  If there is no default
location from which to pull or update, or if PROMPT is non-nil,
prompt for the Bzr command to run."
  (let* ((vc-bzr-program vc-bzr-program)
320
	 (branch-conf (vc-bzr-branch-conf default-directory))
321
	 ;; Check whether the branch is bound.
322 323
	 (bound (assoc "bound" branch-conf))
	 (bound (and bound (equal "true" (downcase (cdr bound)))))
324 325
	 ;; If we need to do a "bzr pull", check for a parent.  If it
	 ;; does not exist, bzr will need a pull location.
326 327
	 (has-parent (unless bound
		       (assoc "parent_location" branch-conf)))
328
	 (command (if bound "update" "pull"))
329
	 args)
330
    ;; If necessary, prompt for the exact command.
331
    (when (or prompt (not (or bound has-parent)))
332 333
      (setq args (split-string
		  (read-shell-command
334
		   "Bzr pull command: "
335 336 337 338 339 340
		   (concat vc-bzr-program " " command)
		   'vc-bzr-history)
		  " " t))
      (setq vc-bzr-program (car  args)
	    command        (cadr args)
	    args           (cddr args)))
341 342 343 344 345 346 347 348 349 350
    (let ((buf (apply 'vc-bzr-async-command command args)))
      (with-current-buffer buf
	(vc-exec-after
	 `(progn
	    (let ((compilation-error-regexp-alist
		   vc-bzr-error-regex-alist))
	      (compilation-mode))
	    (set (make-local-variable 'compilation-error-regexp-alist)
		 vc-bzr-error-regex-alist))))
      (vc-set-async-update buf))))
351

352
(defun vc-bzr-merge-branch ()
353
  "Merge another Bzr branch into the current one.
354 355 356
Prompt for the Bzr command to run, providing a pre-defined merge
source (an upstream branch or a previous merge source) as a
default if it is available."
357
  (let* ((branch-conf (vc-bzr-branch-conf default-directory))
358
	 ;; "bzr merge" without an argument defaults to submit_branch,
359 360
	 ;; then parent_location.  Extract the specific location and
	 ;; add it explicitly to the command line.
361
	 (setting nil)
362 363
	 (location
	  (cond
364 365 366 367
	   ((setq setting (assoc "submit_branch" branch-conf))
	    (cdr setting))
	   ((setq setting (assoc "parent_location" branch-conf))
	    (cdr setting))))
368 369 370
	 (cmd
	  (split-string
	   (read-shell-command
371
	    "Bzr merge command: "
372 373 374 375 376 377 378
	    (concat vc-bzr-program " merge --pull"
		    (if location (concat " " location) ""))
	    'vc-bzr-history)
	   " " t))
	 (vc-bzr-program (car  cmd))
	 (command        (cadr cmd))
	 (args           (cddr cmd)))
379 380 381 382 383 384 385 386 387 388
    (let ((buf (apply 'vc-bzr-async-command command args)))
      (with-current-buffer buf
	(vc-exec-after
	 `(progn
	    (let ((compilation-error-regexp-alist
		   vc-bzr-error-regex-alist))
	      (compilation-mode))
	    (set (make-local-variable 'compilation-error-regexp-alist)
		 vc-bzr-error-regex-alist))))
      (vc-set-async-update buf))))
389

390 391 392
(defun vc-bzr-status (file)
  "Return FILE status according to Bzr.
Return value is a cons (STATUS . WARNING), where WARNING is a
393 394
string or nil, and STATUS is one of the symbols: `added',
`ignored', `kindchanged', `modified', `removed', `renamed', `unknown',
395 396 397 398 399 400
which directly correspond to `bzr status' output, or 'unchanged
for files whose copy in the working tree is identical to the one
in the branch repository, or nil for files that are not
registered with Bzr.

If any error occurred in running `bzr status', then return nil."
401
  (with-temp-buffer
402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417
    (let ((ret (condition-case nil
                   (vc-bzr-command "status" t 0 file)
                 (file-error nil)))     ; vc-bzr-program not found.
          (status 'unchanged))
          ;; the only secure status indication in `bzr status' output
          ;; is a couple of lines following the pattern::
          ;;   | <status>:
          ;;   |   <file name>
          ;; if the file is up-to-date, we get no status report from `bzr',
          ;; so if the regexp search for the above pattern fails, we consider
          ;; the file to be up-to-date.
          (goto-char (point-min))
          (when (re-search-forward
                 ;; bzr prints paths relative to the repository root.
                 (concat "^\\(" vc-bzr-state-words "\\):[ \t\n]+"
                         (regexp-quote (vc-bzr-file-name-relative file))
418 419 420
                         ;; Bzr appends a '/' to directory names and
                         ;; '*' to executable files
                         (if (file-directory-p file) "/?" "\\*?")
421 422
                         "[ \t\n]*$")
                 nil t)
423
            (lexical-let ((statusword (match-string 1)))
424 425
              ;; Erase the status text that matched.
              (delete-region (match-beginning 0) (match-end 0))
426
              (setq status
427
                    (intern (replace-regexp-in-string " " "" statusword)))))
428 429 430 431 432 433 434 435 436 437 438 439
          (when status
            (goto-char (point-min))
            (skip-chars-forward " \n\t") ;Throw away spaces.
            (cons status
                  ;; "bzr" will output warnings and informational messages to
                  ;; stderr; due to Emacs' `vc-do-command' (and, it seems,
                  ;; `start-process' itself) limitations, we cannot catch stderr
                  ;; and stdout into different buffers.  So, if there's anything
                  ;; left in the buffer after removing the above status
                  ;; keywords, let us just presume that any other message from
                  ;; "bzr" is a user warning, and display it.
                  (unless (eobp) (buffer-substring (point) (point-max))))))))
440

441 442 443
(defun vc-bzr-state (file)
  (lexical-let ((result (vc-bzr-status file)))
    (when (consp result)
444 445 446 447 448 449 450
      (let ((warnings (cdr result)))
        (when warnings
          ;; bzr 2.3.0 returns info about shelves, which is not really a warning
          (when (string-match "[1-9]+ shel\\(f\\|ves\\) exists?\\..*?\n" warnings)
            (setq warnings (replace-match "" nil nil warnings)))
          (unless (string= warnings "")
            (message "Warnings in `bzr' output: %s" warnings))))
451
      (cdr (assq (car result)
Dan Nicolaescu's avatar
Dan Nicolaescu committed
452
                 '((added . added)
453
                   (kindchanged . edited)
454 455
                   (renamed . edited)
                   (modified . edited)
456
                   (removed . removed)
457
                   (ignored . ignored)
458
                   (unknown . unregistered)
459
                   (unchanged . up-to-date)))))))
Stefan Monnier's avatar
Stefan Monnier committed
460

461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487
(defun vc-bzr-resolve-when-done ()
  "Call \"bzr resolve\" if the conflict markers have been removed."
  (save-excursion
    (goto-char (point-min))
    (unless (re-search-forward "^<<<<<<< " nil t)
      (vc-bzr-command "resolve" nil 0 buffer-file-name)
      ;; Remove the hook so that it is not called multiple times.
      (remove-hook 'after-save-hook 'vc-bzr-resolve-when-done t))))

(defun vc-bzr-find-file-hook ()
  (when (and buffer-file-name
             ;; FIXME: We should check that "bzr status" says "conflict".
             (file-exists-p (concat buffer-file-name ".BASE"))
             (file-exists-p (concat buffer-file-name ".OTHER"))
             (file-exists-p (concat buffer-file-name ".THIS"))
             ;; If "bzr status" says there's a conflict but there are no
             ;; conflict markers, it's not clear what we should do.
             (save-excursion
               (goto-char (point-min))
               (re-search-forward "^<<<<<<< " nil t)))
    ;; TODO: the merge algorithm used in `bzr merge' is nicely configurable,
    ;; but the one in `bzr pull' isn't, so it would be good to provide an
    ;; elisp function to remerge from the .BASE/OTHER/THIS files.
    (smerge-start-session)
    (add-hook 'after-save-hook 'vc-bzr-resolve-when-done nil t)
    (message "There are unresolved conflicts in this file")))

Stefan Monnier's avatar
Stefan Monnier committed
488
(defun vc-bzr-workfile-unchanged-p (file)
489
  (eq 'unchanged (car (vc-bzr-status file))))
Stefan Monnier's avatar
Stefan Monnier committed
490

Eric S. Raymond's avatar
Eric S. Raymond committed
491
(defun vc-bzr-working-revision (file)
Stefan Monnier's avatar
Stefan Monnier committed
492 493
  ;; Together with the code in vc-state-heuristic, this makes it possible
  ;; to get the initial VC state of a Bzr file even if Bzr is not installed.
494 495
  (lexical-let*
      ((rootdir (vc-bzr-root file))
496 497 498 499 500 501
       (branch-format-file (expand-file-name vc-bzr-admin-branch-format-file
                                             rootdir))
       (revhistory-file (expand-file-name vc-bzr-admin-revhistory rootdir))
       (lastrev-file (expand-file-name vc-bzr-admin-lastrev rootdir)))
    ;; This looks at internal files to avoid forking a bzr process.
    ;; May break if they change their format.
502 503 504 505 506 507 508 509 510 511 512 513 514 515
    (if (and (file-exists-p branch-format-file)
	     ;; For lightweight checkouts (obtained with bzr checkout --lightweight)
	     ;; the branch-format-file does not contain the revision
	     ;; information, we need to look up the branch-format-file
	     ;; in the place where the lightweight checkout comes
	     ;; from.  We only do that if it's a local file.
	     (let ((location-fname (expand-file-name
				    (concat vc-bzr-admin-dirname
					    "/branch/location") rootdir)))
	       ;; The existence of this file is how we distinguish
	       ;; lightweight checkouts.
	       (if (file-exists-p location-fname)
		   (with-temp-buffer
		     (insert-file-contents location-fname)
516 517 518 519 520
		     ;; If the lightweight checkout points to a
		     ;; location in the local file system, then we can
		     ;; look there for the version information.
		     (when (re-search-forward "file://\\(.+\\)" nil t)
		       (let ((l-c-parent-dir (match-string 1)))
521 522
			 (when (and (memq system-type '(ms-dos windows-nt))
				    (string-match-p "^/[[:alpha:]]:" l-c-parent-dir))
Juanma Barranquero's avatar
Juanma Barranquero committed
523 524 525
			   ;;; The non-Windows code takes a shortcut by using the host/path
			   ;;; separator slash as the start of the absolute path.  That
			   ;;; does not work on Windows, so we must remove it (bug#5345)
526
			   (setq l-c-parent-dir (substring l-c-parent-dir 1)))
527 528 529 530 531 532 533 534
			 (setq branch-format-file
			       (expand-file-name vc-bzr-admin-branch-format-file
						 l-c-parent-dir))
			 (setq lastrev-file
			       (expand-file-name vc-bzr-admin-lastrev l-c-parent-dir))
			 ;; FIXME: maybe it's overkill to check if both these files exist.
			 (and (file-exists-p branch-format-file)
			      (file-exists-p lastrev-file)))))
535
		 t)))
536
        (with-temp-buffer
537
          (insert-file-contents branch-format-file)
538 539 540 541 542 543
          (goto-char (point-min))
          (cond
           ((or
             (looking-at "Bazaar-NG branch, format 0.0.4")
             (looking-at "Bazaar-NG branch format 5"))
            ;; count lines in .bzr/branch/revision-history
544
            (insert-file-contents revhistory-file)
545
            (number-to-string (count-lines (line-end-position) (point-max))))
546 547 548
           ((or
	     (looking-at "Bazaar Branch Format 6 (bzr 0.15)")
	     (looking-at "Bazaar Branch Format 7 (needs bzr 1.6)"))
549
            ;; revno is the first number in .bzr/branch/last-revision
550
            (insert-file-contents lastrev-file)
551 552
            (when (re-search-forward "[0-9]+" nil t)
	      (buffer-substring (match-beginning 0) (match-end 0))))))
553
      ;; fallback to calling "bzr revno"
554
      (lexical-let*
555
          ((result (vc-bzr-command-discarding-stderr
556
                    vc-bzr-program "revno" (file-relative-name file)))
557 558 559 560 561
           (exitcode (car result))
           (output (cdr result)))
        (cond
         ((eq exitcode 0) (substring output 0 -1))
         (t nil))))))
Stefan Monnier's avatar
Stefan Monnier committed
562

563
(defun vc-bzr-create-repo ()
564
  "Create a new Bzr repository."
565 566
  (vc-bzr-command "init" nil 0 nil))

567
(defun vc-bzr-init-revision (&optional file)
568 569 570
  "Always return nil, as Bzr cannot register explicit versions."
  nil)

571 572 573 574 575 576 577 578 579 580
(defun vc-bzr-previous-revision (file rev)
  (if (string-match "\\`[0-9]+\\'" rev)
      (number-to-string (1- (string-to-number rev)))
    (concat "before:" rev)))

(defun vc-bzr-next-revision (file rev)
  (if (string-match "\\`[0-9]+\\'" rev)
      (number-to-string (1+ (string-to-number rev)))
    (error "Don't know how to compute the next revision of %s" rev)))

581
(defun vc-bzr-register (files &optional rev comment)
Glenn Morris's avatar
Glenn Morris committed
582
  "Register FILES under bzr.
Stefan Monnier's avatar
Stefan Monnier committed
583 584
Signal an error unless REV is nil.
COMMENT is ignored."
585
  (if rev (error "Can't register explicit revision with bzr"))
586
  (vc-bzr-command "add" nil 0 files))
Stefan Monnier's avatar
Stefan Monnier committed
587 588 589

;; Could run `bzr status' in the directory and see if it succeeds, but
;; that's relatively expensive.
590
(defalias 'vc-bzr-responsible-p 'vc-bzr-root
Stefan Monnier's avatar
Stefan Monnier committed
591 592
  "Return non-nil if FILE is (potentially) controlled by bzr.
The criterion is that there is a `.bzr' directory in the same
593
or a superior directory.")
Stefan Monnier's avatar
Stefan Monnier committed
594 595 596 597 598 599 600 601 602

(defun vc-bzr-could-register (file)
  "Return non-nil if FILE could be registered under bzr."
  (and (vc-bzr-responsible-p file)      ; shortcut
       (condition-case ()
           (with-temp-buffer
             (vc-bzr-command "add" t 0 file "--dry-run")
             ;; The command succeeds with no output if file is
             ;; registered (in bzr 0.8).
603
             (goto-char (point-min))
Stefan Monnier's avatar
Stefan Monnier committed
604 605 606 607 608
             (looking-at "added "))
         (error))))

(defun vc-bzr-unregister (file)
  "Unregister FILE from bzr."
609
  (vc-bzr-command "remove" nil 0 file "--keep"))
Stefan Monnier's avatar
Stefan Monnier committed
610

611 612 613
(declare-function log-edit-extract-headers "log-edit" (headers string))

(defun vc-bzr-checkin (files rev comment)
Glenn Morris's avatar
Glenn Morris committed
614
  "Check FILES in to bzr with log message COMMENT.
Stefan Monnier's avatar
Stefan Monnier committed
615
REV non-nil gets an error."
616
  (if rev (error "Can't check in a specific revision with bzr"))
617
  (apply 'vc-bzr-command "commit" nil 0
618
         files (cons "-m" (log-edit-extract-headers '(("Author" . "--author")
619
						      ("Date" . "--commit-time")
620 621
                                                      ("Fixes" . "--fixes"))
                                                    comment))))
Stefan Monnier's avatar
Stefan Monnier committed
622

623 624
(defun vc-bzr-find-revision (file rev buffer)
  "Fetch revision REV of file FILE and put it into BUFFER."
625 626 627 628 629
    (with-current-buffer buffer
      (if (and rev (stringp rev) (not (string= rev "")))
          (vc-bzr-command "cat" t 0 file "-r" rev)
        (vc-bzr-command "cat" t 0 file))))

Stefan Monnier's avatar
Stefan Monnier committed
630 631 632 633
(defun vc-bzr-checkout (file &optional editable rev)
  (if rev (error "Operation not supported")
    ;; Else, there's nothing to do.
    nil))
Stefan Monnier's avatar
Stefan Monnier committed
634 635 636

(defun vc-bzr-revert (file &optional contents-done)
  (unless contents-done
637
    (with-temp-buffer (vc-bzr-command "revert" t 0 file))))
Stefan Monnier's avatar
Stefan Monnier committed
638

639 640 641 642
(defvar log-view-message-re)
(defvar log-view-file-re)
(defvar log-view-font-lock-keywords)
(defvar log-view-current-tag-function)
643
(defvar log-view-per-file-logs)
644
(defvar log-view-expanded-log-entry-function)
645 646 647

(define-derived-mode vc-bzr-log-view-mode log-view-mode "Bzr-Log-View"
  (remove-hook 'log-view-mode-hook 'vc-bzr-log-view-mode) ;Deactivate the hack.
Stefan Monnier's avatar
Stefan Monnier committed
648
  (require 'add-log)
649
  (set (make-local-variable 'log-view-per-file-logs) nil)
650
  (set (make-local-variable 'log-view-file-re) "\\`a\\`")
651
  (set (make-local-variable 'log-view-message-re)
652
       (if (eq vc-log-view-type 'short)
653
	   "^ *\\([0-9.]+\\): \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?"
654
	 "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)"))
655 656
  ;; Allow expanding short log entries
  (when (eq vc-log-view-type 'short)
657
    (setq truncate-lines t)
658 659
    (set (make-local-variable 'log-view-expanded-log-entry-function)
	 'vc-bzr-expanded-log-entry))
Stefan Monnier's avatar
Stefan Monnier committed
660
  (set (make-local-variable 'log-view-font-lock-keywords)
661 662
       ;; log-view-font-lock-keywords is careful to use the buffer-local
       ;; value of log-view-message-re only since Emacs-23.
663
       (if (eq vc-log-view-type 'short)
664 665 666 667
	 (append `((,log-view-message-re
		    (1 'log-view-message-face)
		    (2 'change-log-name)
		    (3 'change-log-date)
668
		    (4 'change-log-list nil lax))))
669 670
	 (append `((,log-view-message-re . 'log-view-message-face))
		 ;; log-view-font-lock-keywords
671
		 '(("^ *\\(?:committer\\|author\\): \
672
\\([^<(]+?\\)[  ]*[(<]\\([[:alnum:]_.+-]+@[[:alnum:]_.-]+\\)[>)]"
673 674 675
		    (1 'change-log-name)
		    (2 'change-log-email))
		   ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face)))))))
Stefan Monnier's avatar
Stefan Monnier committed
676

677
(defun vc-bzr-print-log (files buffer &optional shortlog start-revision limit)
678
  "Get bzr change log for FILES into specified BUFFER."
679 680 681 682 683
  ;; `vc-do-command' creates the buffer, but we need it before running
  ;; the command.
  (vc-setup-buffer buffer)
  ;; If the buffer exists from a previous invocation it might be
  ;; read-only.
Stefan Monnier's avatar
Stefan Monnier committed
684 685 686
  ;; FIXME: `vc-bzr-command' runs `bzr log' with `LC_MESSAGES=C', so
  ;; the log display may not what the user wants - but I see no other
  ;; way of getting the above regexps working.
687 688
  (with-current-buffer buffer
    (apply 'vc-bzr-command "log" buffer 'async files
689
	   (append
690
	    (when shortlog '("--line"))
691
	    (when start-revision (list (format "-r..%s" start-revision)))
692 693 694 695
	    (when limit (list "-l" (format "%s" limit)))
	    (if (stringp vc-bzr-log-switches)
		(list vc-bzr-log-switches)
	      vc-bzr-log-switches)))))
Stefan Monnier's avatar
Stefan Monnier committed
696

697 698 699 700 701 702 703 704 705 706
(defun vc-bzr-expanded-log-entry (revision)
  (with-temp-buffer
    (apply 'vc-bzr-command "log" t nil nil
	   (list (format "-r%s" revision)))
    (goto-char (point-min))
    (when (looking-at "^-+\n")
      ;; Indent the expanded log entry.
      (indent-region (match-end 0) (point-max) 2)
      (buffer-substring (match-end 0) (point-max)))))

707 708 709 710 711 712 713 714
(defun vc-bzr-log-incoming (buffer remote-location)
  (apply 'vc-bzr-command "missing" buffer 'async nil
	 (list "--theirs-only" (unless (string= remote-location "") remote-location))))

(defun vc-bzr-log-outgoing (buffer remote-location)
  (apply 'vc-bzr-command "missing" buffer 'async nil
	 (list "--mine-only" (unless (string= remote-location "") remote-location))))

715 716
(defun vc-bzr-show-log-entry (revision)
  "Find entry for patch name REVISION in bzr change log buffer."
Stefan Monnier's avatar
Stefan Monnier committed
717
  (goto-char (point-min))
718
  (when revision
719 720
    (let (case-fold-search
	  found)
721 722 723 724 725 726 727
      (if (re-search-forward
	   ;; "revno:" can appear either at the beginning of a line,
	   ;; or indented.
	   (concat "^[ ]*-+\n[ ]*revno: "
		   ;; The revision can contain ".", quote it so that it
		   ;; does not interfere with regexp matching.
		   (regexp-quote revision) "$") nil t)
728 729 730 731 732
	  (progn
	    (beginning-of-line 0)
	    (setq found t))
	(goto-char (point-min)))
      found)))
Stefan Monnier's avatar
Stefan Monnier committed
733

734
(defun vc-bzr-diff (files &optional rev1 rev2 buffer)
Stefan Monnier's avatar
Stefan Monnier committed
735
  "VC bzr backend for diff."
736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751
  (let* ((switches (vc-switches 'bzr 'diff))
         (args
          (append
           ;; Only add --diff-options if there are any diff switches.
           (unless (zerop (length switches))
             (list "--diff-options" (mapconcat 'identity switches " ")))
           ;; This `when' is just an optimization because bzr-1.2 is *much*
           ;; faster when the revision argument is not given.
           (when (or rev1 rev2)
             (list "-r" (format "%s..%s"
                                (or rev1 "revno:-1")
                                (or rev2 "")))))))
    ;; `bzr diff' exits with code 1 if diff is non-empty.
    (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*")
           (if vc-disable-async-diff 1 'async) files
           args)))
Stefan Monnier's avatar
Stefan Monnier committed
752 753


754 755
;; FIXME: vc-{next,previous}-revision need fixing in vc.el to deal with
;; straight integer revisions.
Stefan Monnier's avatar
Stefan Monnier committed
756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771

(defun vc-bzr-delete-file (file)
  "Delete FILE and delete it in the bzr repository."
  (condition-case ()
      (delete-file file)
    (file-error nil))
  (vc-bzr-command "remove" nil 0 file))

(defun vc-bzr-rename-file (old new)
  "Rename file from OLD to NEW using `bzr mv'."
  (vc-bzr-command "mv" nil 0 new old))

(defvar vc-bzr-annotation-table nil
  "Internal use.")
(make-variable-buffer-local 'vc-bzr-annotation-table)

772
(defun vc-bzr-annotate-command (file buffer &optional revision)
Stefan Monnier's avatar
Stefan Monnier committed
773 774 775
  "Prepare BUFFER for `vc-annotate' on FILE.
Each line is tagged with the revision number, which has a `help-echo'
property containing author and date information."
776
  (apply #'vc-bzr-command "annotate" buffer 'async file "--long" "--all"
Dan Nicolaescu's avatar
Dan Nicolaescu committed
777
         (if revision (list "-r" revision)))
778 779 780 781 782 783 784
  (lexical-let ((table (make-hash-table :test 'equal)))
    (set-process-filter
     (get-buffer-process buffer)
     (lambda (proc string)
       (when (process-buffer proc)
         (with-current-buffer (process-buffer proc)
           (setq string (concat (process-get proc :vc-left-over) string))
Glenn Morris's avatar
Glenn Morris committed
785 786 787 788 789
           ;; Eg: 102020      Gnus developers          20101020 | regexp."
           ;; As of bzr 2.2.2, no email address in whoami (which can
           ;; lead to spaces in the author field) is allowed but discouraged.
           ;; See bug#7792.
           (while (string-match "^\\( *[0-9.]+ *\\) \\(.+?\\) +\\([0-9]\\{8\\}\\)\\( |.*\n\\)" string)
790 791 792 793 794 795 796 797 798
             (let* ((rev (match-string 1 string))
                    (author (match-string 2 string))
                    (date (match-string 3 string))
                    (key (substring string (match-beginning 0)
                                    (match-beginning 4)))
                    (line (match-string 4 string))
                    (tag (gethash key table))
                    (inhibit-read-only t))
               (setq string (substring string (match-end 0)))
799 800 801
	       (unless tag
		 (setq tag
		       (propertize
802
			(format "%s %-7.7s" rev author)
803 804 805 806
			'help-echo (format "Revision: %d, author: %s, date: %s"
					   (string-to-number rev)
					   author date)
			'mouse-face 'highlight))
807 808 809 810 811
                 (puthash key tag table))
               (goto-char (process-mark proc))
               (insert tag line)
               (move-marker (process-mark proc) (point))))
           (process-put proc :vc-left-over string)))))))
Stefan Monnier's avatar
Stefan Monnier committed
812

813 814
(declare-function vc-annotate-convert-time "vc-annotate" (time))

Stefan Monnier's avatar
Stefan Monnier committed
815
(defun vc-bzr-annotate-time ()
Glenn Morris's avatar
Glenn Morris committed
816
  (when (re-search-forward "^ *[0-9.]+ +.+? +|" nil t)
Dan Nicolaescu's avatar
Dan Nicolaescu committed
817 818
    (let ((prop (get-text-property (line-beginning-position) 'help-echo)))
      (string-match "[0-9]+\\'" prop)
819
      (let ((str (match-string-no-properties 0 prop)))
Stefan Monnier's avatar
Stefan Monnier committed
820 821
      (vc-annotate-convert-time
       (encode-time 0 0 0
822 823 824
                      (string-to-number (substring str 6 8))
                      (string-to-number (substring str 4 6))
                      (string-to-number (substring str 0 4))))))))
Stefan Monnier's avatar
Stefan Monnier committed
825 826

(defun vc-bzr-annotate-extract-revision-at-line ()
Glenn Morris's avatar
Glenn Morris committed
827
  "Return revision for current line of annotation buffer, or nil.
Stefan Monnier's avatar
Stefan Monnier committed
828 829 830
Return nil if current line isn't annotated."
  (save-excursion
    (beginning-of-line)
Glenn Morris's avatar
Glenn Morris committed
831
    (if (looking-at "^ *\\([0-9.]+\\) +.* +|")
Dan Nicolaescu's avatar
Dan Nicolaescu committed
832
        (match-string-no-properties 1))))
Stefan Monnier's avatar
Stefan Monnier committed
833

834 835
(defun vc-bzr-command-discarding-stderr (command &rest args)
  "Execute shell command COMMAND (with ARGS); return its output and exitcode.
836 837 838 839 840
Return value is a cons (EXITCODE . OUTPUT), where EXITCODE is
the (numerical) exit code of the process, and OUTPUT is a string
containing whatever the process sent to its standard output
stream.  Standard error output is discarded."
  (with-temp-buffer
841
    (cons
842
     (apply #'process-file command nil (list (current-buffer) nil) nil args)
843
     (buffer-substring (point-min) (point-max)))))
Stefan Monnier's avatar
Stefan Monnier committed
844

845 846 847 848 849 850
(defstruct (vc-bzr-extra-fileinfo
            (:copier nil)
            (:constructor vc-bzr-create-extra-fileinfo (extra-name))
            (:conc-name vc-bzr-extra-fileinfo->))
  extra-name)         ;; original name for rename targets, new name for

851
(defun vc-bzr-dir-printer (info)
852 853
  "Pretty-printer for the vc-dir-fileinfo structure."
  (let ((extra (vc-dir-fileinfo->extra info)))
854
    (vc-default-dir-printer 'Bzr info)
855 856 857 858 859 860
    (when extra
      (insert (propertize
	       (format "   (renamed from %s)"
		       (vc-bzr-extra-fileinfo->extra-name extra))
	       'face 'font-lock-comment-face)))))

861
;; FIXME: this needs testing, it's probably incomplete.
862
(defun vc-bzr-after-dir-status (update-function relative-dir)
863
  (let ((status-str nil)
864 865 866 867 868
	(translation '(("+N " . added)
		       ("-D " . removed)
		       (" M " . edited) ;; file text modified
		       ("  *" . edited) ;; execute bit changed
		       (" M*" . edited) ;; text modified + execute bit changed
869
		       ("I  " . ignored)
870
		       (" D " . missing)
871
                       ;; For conflicts, should we list the .THIS/.BASE/.OTHER?
872 873
		       ("C  " . conflict)
		       ("?  " . unregistered)
874 875
		       ;; No such state, but we need to distinguish this case.
		       ("R  " . renamed)
876
		       ("RM " . renamed)
877 878 879
		       ;; For a non existent file FOO, the output is:
		       ;; bzr: ERROR: Path(s) do not exist: FOO
		       ("bzr" . not-found)
880 881 882 883 884
		       ;; If the tree is not up to date, bzr will print this warning:
		       ;; working tree is out of date, run 'bzr update'
		       ;; ignore it.
		       ;; FIXME: maybe this warning can be put in the vc-dir header...
		       ("wor" . not-found)
885
                       ;; Ignore "P " and "P." for pending patches.
886 887
		       ("P  " . not-found)
		       ("P. " . not-found)
888
                       ))
889 890 891 892
	(translated nil)
	(result nil))
      (goto-char (point-min))
      (while (not (eobp))
893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918
        ;; Bzr 2.3.0 added this if there are shelves.  (Bug#8170)
        (unless (looking-at "[1-9]+ shel\\(f\\|ves\\) exists?\\.")
          (setq status-str
                (buffer-substring-no-properties (point) (+ (point) 3)))
          (setq translated (cdr (assoc status-str translation)))
          (cond
           ((eq translated 'conflict)
            ;; For conflicts the file appears twice in the listing: once
            ;; with the M flag and once with the C flag, so take care
            ;; not to add it twice to `result'.  Ugly.
            (let* ((file
                    (buffer-substring-no-properties
                     ;;For files with conflicts the format is:
                     ;;C   Text conflict in FILENAME
                     ;; Bah.
                     (+ (point) 21) (line-end-position)))
                   (entry (assoc file result)))
              (when entry
                (setf (nth 1 entry) 'conflict))))
           ((eq translated 'renamed)
            (re-search-forward "R[ M]  \\(.*\\) => \\(.*\\)$" (line-end-position) t)
            (let ((new-name (file-relative-name (match-string 2) relative-dir))
                  (old-name (file-relative-name (match-string 1) relative-dir)))
              (push (list new-name 'edited
                          (vc-bzr-create-extra-fileinfo old-name)) result)))
           ;; do nothing for non existent files
919
           ((memq translated '(not-found ignored)))
920 921 922 923 924 925 926
           (t
            (push (list (file-relative-name
                         (buffer-substring-no-properties
                          (+ (point) 4)
                          (line-end-position)) relative-dir)
                        translated) result))))
        (forward-line))
927
      (funcall update-function result)))
928

929
(defun vc-bzr-dir-status (dir update-function)
930
  "Return a list of conses (file . state) for DIR."
931 932
  (vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S")
  (vc-exec-after
933 934 935 936 937 938 939 940 941
   `(vc-bzr-after-dir-status (quote ,update-function)
			     ;; "bzr status" results are relative to
			     ;; the bzr root directory, NOT to the
			     ;; directory "bzr status" was invoked in.
			     ;; Ugh.
			     ;; We pass the relative directory here so
			     ;; that `vc-bzr-after-dir-status' can
			     ;; frob the results accordingly.
			     (file-relative-name ,dir (vc-bzr-root ,dir)))))
942

943 944 945 946
(defun vc-bzr-dir-status-files (dir files default-state update-function)
  "Return a list of conses (file . state) for DIR."
  (apply 'vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S" files)
  (vc-exec-after
947 948
   `(vc-bzr-after-dir-status (quote ,update-function)
			     (file-relative-name ,dir (vc-bzr-root ,dir)))))
949

950 951 952 953 954 955 956
(defvar vc-bzr-shelve-map
  (let ((map (make-sparse-keymap)))
    ;; Turn off vc-dir marking
    (define-key map [mouse-2] 'ignore)

    (define-key map [down-mouse-3] 'vc-bzr-shelve-menu)
    (define-key map "\C-k" 'vc-bzr-shelve-delete-at-point)
957 958 959
    (define-key map "=" 'vc-bzr-shelve-show-at-point)
    (define-key map "\C-m" 'vc-bzr-shelve-show-at-point)
    (define-key map "A" 'vc-bzr-shelve-apply-and-keep-at-point)
960
    (define-key map "P" 'vc-bzr-shelve-apply-at-point)
961
    (define-key map "S" 'vc-bzr-shelve-snapshot)
962 963 964 965 966
    map))

(defvar vc-bzr-shelve-menu-map
  (let ((map (make-sparse-keymap "Bzr Shelve")))
    (define-key map [de]
967
      '(menu-item "Delete Shelf" vc-bzr-shelve-delete-at-point
968
		  :help "Delete the current shelf"))
969
    (define-key map [ap]
970
      '(menu-item "Apply and Keep Shelf" vc-bzr-shelve-apply-and-keep-at-point
971
		  :help "Apply the current shelf and keep it"))
972
    (define-key map [po]
973
      '(menu-item "Apply and Remove Shelf (Pop)" vc-bzr-shelve-apply-at-point
974
		  :help "Apply the current shelf and remove it"))
975
    (define-key map [sh]
976
      '(menu-item "