vc-bzr.el 47.7 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 68
  :group 'vc-bzr
  :type 'string)

(defcustom vc-bzr-diff-switches nil
69 70 71 72
  "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
73 74 75 76
                 (string :tag "Argument String")
                 (repeat :tag "Argument List" :value ("") string))
  :group 'vc-bzr)

77
(defcustom vc-bzr-log-switches nil
78
  "String or list of strings specifying switches for bzr log under VC."
79 80 81 82 83
  :type '(choice (const :tag "None" nil)
                 (string :tag "Argument String")
                 (repeat :tag "Argument List" :value ("") string))
  :group 'vc-bzr)

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

97 98 99 100 101 102
(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
103
\"*vc-bzr : ROOT*\".  Return this buffer."
104 105 106 107 108 109
  (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
110 111
	   vc-bzr-program bzr-command args)
    buffer))
112 113

;;;###autoload
114
(defconst vc-bzr-admin-dirname ".bzr"
115
  "Name of the directory containing Bzr repository status files.")
Glenn Morris's avatar
Glenn Morris committed
116
;; Used in the autoloaded vc-bzr-registered; see below.
117
;;;###autoload
118 119
(defconst vc-bzr-admin-checkout-format-file
  (concat vc-bzr-admin-dirname "/checkout/format"))
120
(defconst vc-bzr-admin-dirstate
121 122 123
  (concat vc-bzr-admin-dirname "/checkout/dirstate"))
(defconst vc-bzr-admin-branch-format-file
  (concat vc-bzr-admin-dirname "/branch/format"))
124
(defconst vc-bzr-admin-revhistory
125
  (concat vc-bzr-admin-dirname "/branch/revision-history"))
126 127
(defconst vc-bzr-admin-lastrev
  (concat vc-bzr-admin-dirname "/branch/last-revision"))
128 129
(defconst vc-bzr-admin-branchconf
  (concat vc-bzr-admin-dirname "/branch/branch.conf"))
130 131

;;;###autoload (defun vc-bzr-registered (file)
132
;;;###autoload   (if (vc-find-root file vc-bzr-admin-checkout-format-file)
133 134 135
;;;###autoload       (progn
;;;###autoload         (load "vc-bzr")
;;;###autoload         (vc-bzr-registered file))))
Stefan Monnier's avatar
Stefan Monnier committed
136

137 138 139 140
(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)
141 142
      (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
143

144 145 146 147 148 149 150
(defun vc-bzr--branch-conf (file)
  "Return the Bzr branch config for file FILE, as a string."
  (with-temp-buffer
    (insert-file-contents
     (expand-file-name vc-bzr-admin-branchconf (vc-bzr-root file)))
    (buffer-string)))

Stefan Monnier's avatar
Stefan Monnier committed
151
(require 'sha1)                         ;For sha1-program
152

Stefan Monnier's avatar
Stefan Monnier committed
153 154 155 156
(defun vc-bzr-sha1 (file)
  (with-temp-buffer
    (set-buffer-multibyte nil)
    (let ((prog sha1-program)
157 158
          (args nil)
	  process-file-side-effects)
Stefan Monnier's avatar
Stefan Monnier committed
159 160 161
      (when (consp prog)
	(setq args (cdr prog))
        (setq prog (car prog)))
162
      (apply 'process-file prog (file-relative-name file) t nil args)
Stefan Monnier's avatar
Stefan Monnier committed
163 164 165 166
      (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
167
  ;; `bzr status' was excruciatingly slow with large histories and
Stefan Monnier's avatar
Stefan Monnier committed
168 169 170 171 172 173 174 175 176
  ;; 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'."
177 178 179 180 181
  (lexical-let ((root (vc-bzr-root file)))
    (when root    ; Short cut.
      ;; This looks at internal files.  May break if they change
      ;; their format.
      (lexical-let ((dirstate (expand-file-name vc-bzr-admin-dirstate root)))
182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198
        (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?
199 200
                               "\\([^\0]*\\)\0" ;sha1 (empty if conflicted)?
                               "\\([^\0]*\\)\0" ;size?p
Glenn Morris's avatar
Glenn Morris committed
201 202 203
                               ;; y/n.  Whether or not the current copy
                               ;; was executable the last time bzr checked?
                               "[^\0]*\0"
204 205 206
                               "[^\0]*\0"       ;?
                               "\\([^\0]*\\)\0" ;"a/f/d" a=added?
                               "\\([^\0]*\\)\0" ;sha1 again?
207
                               "\\([^\0]*\\)\0" ;size again?
Glenn Morris's avatar
Glenn Morris committed
208 209 210
                               ;; y/n.  Whether or not the repo thinks
                               ;; the file should be executable?
                               "\\([^\0]*\\)\0"
211 212 213 214 215 216 217 218 219 220
                               "[^\0]*\0" ;last revid?
                               ;; 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)
221 222
                       ((eq (char-after (match-beginning 4)) ?a) 'added)
                       ((or (and (eq (string-to-number (match-string 3))
223
                                 (nth 7 (file-attributes file)))
Glenn Morris's avatar
Glenn Morris committed
224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239
                                 (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)))))
240 241 242 243 244 245 246 247 248
			    (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))))
249 250 251 252 253 254 255 256 257
                        '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
258 259 260 261 262

(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)))))
263 264

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

268 269 270
;; History of Bzr commands.
(defvar vc-bzr-history nil)

271 272 273 274
(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))
275
       (rootdir (vc-bzr-root filename*)))
276
    (when rootdir
277 278
         (file-relative-name filename* rootdir))))

279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295
(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)
	 (branch-conf (vc-bzr--branch-conf default-directory))
	 ;; Check whether the branch is bound.
	 (bound (string-match "^bound\\s-*=\\s-*True" branch-conf))
	 ;; If we need to do a "bzr pull", check for a parent.  If it
	 ;; does not exist, bzr will need a pull location.
	 (parent (unless bound
		   (string-match
		    "^parent_location\\s-*=\\s-*[^\n[:space:]]+"
		    branch-conf)))
	 (command (if bound "update" "pull"))
296
	 args)
297 298 299 300
    ;; If necessary, prompt for the exact command.
    (when (or prompt (not (or bound parent)))
      (setq args (split-string
		  (read-shell-command
301
		   "Bzr pull command: "
302 303 304 305 306 307
		   (concat vc-bzr-program " " command)
		   'vc-bzr-history)
		  " " t))
      (setq vc-bzr-program (car  args)
	    command        (cadr args)
	    args           (cddr args)))
308 309
    (vc-set-async-update
     (apply 'vc-bzr-async-command command args))))
310

311
(defun vc-bzr-merge-branch ()
312
  "Merge another Bzr branch into the current one.
313 314 315 316 317
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."
  (let* ((branch-conf (vc-bzr--branch-conf default-directory))
	 ;; "bzr merge" without an argument defaults to submit_branch,
318 319
	 ;; then parent_location.  Extract the specific location and
	 ;; add it explicitly to the command line.
320 321 322 323 324 325 326 327 328 329 330 331 332
	 (location
	  (cond
	   ((string-match
	     "^submit_branch\\s-*=\\s-*\\(?:file://\\)?\\([^\n[:space:]]+\\)$"
	     branch-conf)
	    (match-string 1 branch-conf))
	   ((string-match
	     "^parent_location\\s-*=\\s-*\\(?:file://\\)?\\([^\n[:space:]]+\\)$"
	     branch-conf)
	    (match-string 1 branch-conf))))
	 (cmd
	  (split-string
	   (read-shell-command
333
	    "Bzr merge command: "
334 335 336 337 338 339 340
	    (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)))
341 342
    (vc-set-async-update
     (apply 'vc-bzr-async-command command args))))
343

344 345 346
(defun vc-bzr-status (file)
  "Return FILE status according to Bzr.
Return value is a cons (STATUS . WARNING), where WARNING is a
347 348
string or nil, and STATUS is one of the symbols: `added',
`ignored', `kindchanged', `modified', `removed', `renamed', `unknown',
349 350 351 352 353 354
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."
355
  (with-temp-buffer
356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371
    (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))
372 373 374
                         ;; Bzr appends a '/' to directory names and
                         ;; '*' to executable files
                         (if (file-directory-p file) "/?" "\\*?")
375 376
                         "[ \t\n]*$")
                 nil t)
377
            (lexical-let ((statusword (match-string 1)))
378 379
              ;; Erase the status text that matched.
              (delete-region (match-beginning 0) (match-end 0))
380
              (setq status
381
                    (intern (replace-regexp-in-string " " "" statusword)))))
382 383 384 385 386 387 388 389 390 391 392 393
          (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))))))))
394

395 396 397
(defun vc-bzr-state (file)
  (lexical-let ((result (vc-bzr-status file)))
    (when (consp result)
398 399
      (when (cdr result)
	(message "Warnings in `bzr' output: %s" (cdr result)))
400
      (cdr (assq (car result)
Dan Nicolaescu's avatar
Dan Nicolaescu committed
401
                 '((added . added)
402
                   (kindchanged . edited)
403 404
                   (renamed . edited)
                   (modified . edited)
405
                   (removed . removed)
406
                   (ignored . ignored)
407
                   (unknown . unregistered)
408
                   (unchanged . up-to-date)))))))
Stefan Monnier's avatar
Stefan Monnier committed
409

410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436
(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
437
(defun vc-bzr-workfile-unchanged-p (file)
438
  (eq 'unchanged (car (vc-bzr-status file))))
Stefan Monnier's avatar
Stefan Monnier committed
439

Eric S. Raymond's avatar
Eric S. Raymond committed
440
(defun vc-bzr-working-revision (file)
Stefan Monnier's avatar
Stefan Monnier committed
441 442
  ;; 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.
443 444
  (lexical-let*
      ((rootdir (vc-bzr-root file))
445 446 447 448 449 450
       (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.
451 452 453 454 455 456 457 458 459 460 461 462 463 464
    (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)
465 466 467 468 469
		     ;; 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)))
470 471
			 (when (and (memq system-type '(ms-dos windows-nt))
				    (string-match-p "^/[[:alpha:]]:" l-c-parent-dir))
Juanma Barranquero's avatar
Juanma Barranquero committed
472 473 474
			   ;;; 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)
475
			   (setq l-c-parent-dir (substring l-c-parent-dir 1)))
476 477 478 479 480 481 482 483
			 (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)))))
484
		 t)))
485
        (with-temp-buffer
486
          (insert-file-contents branch-format-file)
487 488 489 490 491 492
          (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
493
            (insert-file-contents revhistory-file)
494
            (number-to-string (count-lines (line-end-position) (point-max))))
495 496 497
           ((or
	     (looking-at "Bazaar Branch Format 6 (bzr 0.15)")
	     (looking-at "Bazaar Branch Format 7 (needs bzr 1.6)"))
498
            ;; revno is the first number in .bzr/branch/last-revision
499
            (insert-file-contents lastrev-file)
500 501
            (when (re-search-forward "[0-9]+" nil t)
	      (buffer-substring (match-beginning 0) (match-end 0))))))
502
      ;; fallback to calling "bzr revno"
503
      (lexical-let*
504
          ((result (vc-bzr-command-discarding-stderr
505
                    vc-bzr-program "revno" (file-relative-name file)))
506 507 508 509 510
           (exitcode (car result))
           (output (cdr result)))
        (cond
         ((eq exitcode 0) (substring output 0 -1))
         (t nil))))))
Stefan Monnier's avatar
Stefan Monnier committed
511

512
(defun vc-bzr-create-repo ()
513
  "Create a new Bzr repository."
514 515
  (vc-bzr-command "init" nil 0 nil))

516
(defun vc-bzr-init-revision (&optional file)
517 518 519
  "Always return nil, as Bzr cannot register explicit versions."
  nil)

520 521 522 523 524 525 526 527 528 529
(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)))

530
(defun vc-bzr-register (files &optional rev comment)
Glenn Morris's avatar
Glenn Morris committed
531
  "Register FILES under bzr.
Stefan Monnier's avatar
Stefan Monnier committed
532 533
Signal an error unless REV is nil.
COMMENT is ignored."
534
  (if rev (error "Can't register explicit revision with bzr"))
535
  (vc-bzr-command "add" nil 0 files))
Stefan Monnier's avatar
Stefan Monnier committed
536 537 538

;; Could run `bzr status' in the directory and see if it succeeds, but
;; that's relatively expensive.
539
(defalias 'vc-bzr-responsible-p 'vc-bzr-root
Stefan Monnier's avatar
Stefan Monnier committed
540 541
  "Return non-nil if FILE is (potentially) controlled by bzr.
The criterion is that there is a `.bzr' directory in the same
542
or a superior directory.")
Stefan Monnier's avatar
Stefan Monnier committed
543 544 545 546 547 548 549 550 551

(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).
552
             (goto-char (point-min))
Stefan Monnier's avatar
Stefan Monnier committed
553 554 555 556 557
             (looking-at "added "))
         (error))))

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

560 561 562
(declare-function log-edit-extract-headers "log-edit" (headers string))

(defun vc-bzr-checkin (files rev comment)
Glenn Morris's avatar
Glenn Morris committed
563
  "Check FILES in to bzr with log message COMMENT.
Stefan Monnier's avatar
Stefan Monnier committed
564
REV non-nil gets an error."
565
  (if rev (error "Can't check in a specific revision with bzr"))
566
  (apply 'vc-bzr-command "commit" nil 0
567
         files (cons "-m" (log-edit-extract-headers '(("Author" . "--author")
568
						      ("Date" . "--commit-time")
569 570
                                                      ("Fixes" . "--fixes"))
                                                    comment))))
Stefan Monnier's avatar
Stefan Monnier committed
571

572 573
(defun vc-bzr-find-revision (file rev buffer)
  "Fetch revision REV of file FILE and put it into BUFFER."
574 575 576 577 578
    (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
579 580 581 582
(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
583 584 585

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

588 589 590 591
(defvar log-view-message-re)
(defvar log-view-file-re)
(defvar log-view-font-lock-keywords)
(defvar log-view-current-tag-function)
592
(defvar log-view-per-file-logs)
593
(defvar log-view-expanded-log-entry-function)
594 595 596

(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
597
  (require 'add-log)
598
  (set (make-local-variable 'log-view-per-file-logs) nil)
599
  (set (make-local-variable 'log-view-file-re) "\\`a\\`")
600
  (set (make-local-variable 'log-view-message-re)
601
       (if (eq vc-log-view-type 'short)
602
	   "^ *\\([0-9.]+\\): \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?"
603
	 "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)"))
604 605 606 607
  ;; Allow expanding short log entries
  (when (eq vc-log-view-type 'short)
    (set (make-local-variable 'log-view-expanded-log-entry-function)
	 'vc-bzr-expanded-log-entry))
Stefan Monnier's avatar
Stefan Monnier committed
608
  (set (make-local-variable 'log-view-font-lock-keywords)
609 610
       ;; log-view-font-lock-keywords is careful to use the buffer-local
       ;; value of log-view-message-re only since Emacs-23.
611
       (if (eq vc-log-view-type 'short)
612 613 614 615
	 (append `((,log-view-message-re
		    (1 'log-view-message-face)
		    (2 'change-log-name)
		    (3 'change-log-date)
616
		    (4 'change-log-list nil lax))))
617 618
	 (append `((,log-view-message-re . 'log-view-message-face))
		 ;; log-view-font-lock-keywords
619
		 '(("^ *\\(?:committer\\|author\\): \
620
\\([^<(]+?\\)[  ]*[(<]\\([[:alnum:]_.+-]+@[[:alnum:]_.-]+\\)[>)]"
621 622 623
		    (1 'change-log-name)
		    (2 'change-log-email))
		   ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face)))))))
Stefan Monnier's avatar
Stefan Monnier committed
624

625
(defun vc-bzr-print-log (files buffer &optional shortlog start-revision limit)
626
  "Get bzr change log for FILES into specified BUFFER."
627 628 629 630 631
  ;; `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
632 633 634
  ;; 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.
635 636
  (with-current-buffer buffer
    (apply 'vc-bzr-command "log" buffer 'async files
637
	   (append
638
	    (when shortlog '("--line"))
639
	    (when start-revision (list (format "-r..%s" start-revision)))
640 641 642 643
	    (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
644

645 646 647 648 649 650 651 652 653 654
(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)))))

655 656 657 658 659 660 661 662
(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))))

663 664
(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
665
  (goto-char (point-min))
666
  (when revision
667 668
    (let (case-fold-search
	  found)
669 670 671 672 673 674 675
      (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)
676 677 678 679 680
	  (progn
	    (beginning-of-line 0)
	    (setq found t))
	(goto-char (point-min)))
      found)))
Stefan Monnier's avatar
Stefan Monnier committed
681

682
(defun vc-bzr-diff (files &optional rev1 rev2 buffer)
Stefan Monnier's avatar
Stefan Monnier committed
683
  "VC bzr backend for diff."
684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699
  (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
700 701


702 703
;; FIXME: vc-{next,previous}-revision need fixing in vc.el to deal with
;; straight integer revisions.
Stefan Monnier's avatar
Stefan Monnier committed
704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719

(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)

720
(defun vc-bzr-annotate-command (file buffer &optional revision)
Stefan Monnier's avatar
Stefan Monnier committed
721 722 723
  "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."
724
  (apply #'vc-bzr-command "annotate" buffer 'async file "--long" "--all"
Dan Nicolaescu's avatar
Dan Nicolaescu committed
725
         (if revision (list "-r" revision)))
726 727 728 729 730 731 732
  (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
733 734 735 736 737
           ;; 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)
738 739 740 741 742 743 744 745 746
             (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)))
747 748 749
	       (unless tag
		 (setq tag
		       (propertize
750
			(format "%s %-7.7s" rev author)
751 752 753 754
			'help-echo (format "Revision: %d, author: %s, date: %s"
					   (string-to-number rev)
					   author date)
			'mouse-face 'highlight))
755 756 757 758 759
                 (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
760

761 762
(declare-function vc-annotate-convert-time "vc-annotate" (time))

Stefan Monnier's avatar
Stefan Monnier committed
763
(defun vc-bzr-annotate-time ()
Glenn Morris's avatar
Glenn Morris committed
764
  (when (re-search-forward "^ *[0-9.]+ +.+? +|" nil t)
Dan Nicolaescu's avatar
Dan Nicolaescu committed
765 766
    (let ((prop (get-text-property (line-beginning-position) 'help-echo)))
      (string-match "[0-9]+\\'" prop)
767
      (let ((str (match-string-no-properties 0 prop)))
Stefan Monnier's avatar
Stefan Monnier committed
768 769
      (vc-annotate-convert-time
       (encode-time 0 0 0
770 771 772
                      (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
773 774

(defun vc-bzr-annotate-extract-revision-at-line ()
Glenn Morris's avatar
Glenn Morris committed
775
  "Return revision for current line of annotation buffer, or nil.
Stefan Monnier's avatar
Stefan Monnier committed
776 777 778
Return nil if current line isn't annotated."
  (save-excursion
    (beginning-of-line)
Glenn Morris's avatar
Glenn Morris committed
779
    (if (looking-at "^ *\\([0-9.]+\\) +.* +|")
Dan Nicolaescu's avatar
Dan Nicolaescu committed
780
        (match-string-no-properties 1))))
Stefan Monnier's avatar
Stefan Monnier committed
781

782 783
(defun vc-bzr-command-discarding-stderr (command &rest args)
  "Execute shell command COMMAND (with ARGS); return its output and exitcode.
784 785 786 787 788
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
789
    (cons
790
     (apply #'process-file command nil (list (current-buffer) nil) nil args)
791
     (buffer-substring (point-min) (point-max)))))
Stefan Monnier's avatar
Stefan Monnier committed
792

793 794 795 796 797 798
(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

799
(defun vc-bzr-dir-printer (info)
800 801
  "Pretty-printer for the vc-dir-fileinfo structure."
  (let ((extra (vc-dir-fileinfo->extra info)))
802
    (vc-default-dir-printer 'Bzr info)
803 804 805 806 807 808
    (when extra
      (insert (propertize
	       (format "   (renamed from %s)"
		       (vc-bzr-extra-fileinfo->extra-name extra))
	       'face 'font-lock-comment-face)))))

809
;; FIXME: this needs testing, it's probably incomplete.
810
(defun vc-bzr-after-dir-status (update-function relative-dir)
811
  (let ((status-str nil)
812 813 814 815 816 817 818
	(translation '(("+N " . added)
		       ("-D " . removed)
		       (" M " . edited) ;; file text modified
		       ("  *" . edited) ;; execute bit changed
		       (" M*" . edited) ;; text modified + execute bit changed
		       ;; FIXME: what about ignored files?
		       (" D " . missing)
819
                       ;; For conflicts, should we list the .THIS/.BASE/.OTHER?
820 821
		       ("C  " . conflict)
		       ("?  " . unregistered)
822 823
		       ;; No such state, but we need to distinguish this case.
		       ("R  " . renamed)
824
		       ("RM " . renamed)
825 826 827
		       ;; For a non existent file FOO, the output is:
		       ;; bzr: ERROR: Path(s) do not exist: FOO
		       ("bzr" . not-found)
828 829 830 831 832
		       ;; 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)
833
                       ;; Ignore "P " and "P." for pending patches.
834 835
		       ("P  " . not-found)
		       ("P. " . not-found)
836
                       ))
837 838 839 840 841
	(translated nil)
	(result nil))
      (goto-char (point-min))
      (while (not (eobp))
	(setq status-str
842
	      (buffer-substring-no-properties (point) (+ (point) 3)))
843
	(setq translated (cdr (assoc status-str translation)))
844 845 846 847 848 849 850 851 852 853 854 855 856 857 858
	(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)
859
	  (re-search-forward "R[ M]  \\(.*\\) => \\(.*\\)$" (line-end-position) t)
860 861
	  (let ((new-name (file-relative-name (match-string 2) relative-dir))
		(old-name (file-relative-name (match-string 1) relative-dir)))
862 863
	    (push (list new-name 'edited
		      (vc-bzr-create-extra-fileinfo old-name)) result)))
864 865
	 ;; do nothing for non existent files
	 ((eq translated 'not-found))
866
	 (t
867 868 869 870
	  (push (list (file-relative-name
		       (buffer-substring-no-properties
			(+ (point) 4)
			(line-end-position)) relative-dir)
871
		      translated) result)))
872
	(forward-line))
873
      (funcall update-function result)))
874

875
(defun vc-bzr-dir-status (dir update-function)
876
  "Return a list of conses (file . state) for DIR."
877 878
  (vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S")
  (vc-exec-after
879 880 881 882 883 884 885 886 887
   `(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)))))
888

889 890 891 892
(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
893 894
   `(vc-bzr-after-dir-status (quote ,update-function)
			     (file-relative-name ,dir (vc-bzr-root ,dir)))))
895

896 897 898 899 900 901 902
(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)
903 904 905
    (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)
906
    (define-key map "P" 'vc-bzr-shelve-apply-at-point)
907
    (define-key map "S" 'vc-bzr-shelve-snapshot)
908 909 910 911 912 913 914
    map))

(defvar vc-bzr-shelve-menu-map
  (let ((map (make-sparse-keymap "Bzr Shelve")))
    (define-key map [de]
      '(menu-item "Delete shelf" vc-bzr-shelve-delete-at-point
		  :help "Delete the current shelf"))
915 916 917
    (define-key map [ap]
      '(menu-item "Apply and keep shelf" vc-bzr-shelve-apply-and-keep-at-point
		  :help "Apply the current shelf and keep it"))
918 919 920
    (define-key map [po]
      '(menu-item "Apply and remove shelf (pop)" vc-bzr-shelve-apply-at-point
		  :help "Apply the current shelf and remove it"))
921 922 923
    (define-key map [sh]
      '(menu-item "Show shelve" vc-bzr-shelve-show-at-point
    		  :help "Show the contents of the current shelve"))
924 925 926 927
    map))

(defvar vc-bzr-extra-menu-map
  (let ((map (make-sparse-keymap)))
928 929 930
    (define-key map [bzr-sn]
      '(menu-item "Shelve a snapshot" vc-bzr-shelve-snapshot
		  :help "Shelve the current state of the tree and keep the current state"))
931 932 933 934 935 936 937 938 939
    (define-key map [bzr-sh]
      '(menu-item "Shelve..." vc-bzr-shelve
		  :help "Shelve changes"))
    map))

(defun vc-bzr-extra-menu () vc-bzr-extra-menu-map)

(defun vc-bzr-extra-status-menu () vc-bzr-extra-menu-map)

940
(defun vc-bzr-dir-extra-headers (dir)
941 942 943 944
  (let*
      ((str (with-temp-buffer
	      (vc-bzr-command "info" t 0 dir)
	      (buffer-string)))
945 946
       (shelve (vc-bzr-shelve-list))
       (shelve-help-echo "Use M-x vc-bzr-shelve to create shelves")
947 948
       (root-dir (vc-bzr-root dir))
       (pending-merge
949 950 951 952 953 954
	;; FIXME: looking for .bzr/checkout/merge-hashes is not a
	;; reliable method to detect pending merges, disable this
	;; until a proper solution is implemented.
	(and nil
	 (file-exists-p
	 (expand-file-name ".bzr/checkout/merge-hashes" root-dir))))
955 956
       (pending-merge-help-echo
	(format "A merge has been performed.\nA commit from the top-level directory (%s)\nis required before being able to check in anything else" root-dir))
957 958 959 960 961 962 963
       (light-checkout
	(when (string-match ".+light checkout root: \\(.+\\)$" str)
	  (match-string 1 str)))
       (light-checkout-branch
	(when light-checkout
	  (when (string-match ".+checkout of branch: \\(.+\\)$" str)
	    (match-string 1 str)))))
964
    (concat
965 966
     (propertize "Parent branch      : " 'face 'font-lock-type-face)
     (propertize
967
      (if (string-match "parent branch: \\(.+\\)$" str)
968 969 970 971 972 973 974 975 976 977 978 979 980
 	  (match-string 1 str)
 	"None")
       'face 'font-lock-variable-name-face)
     "\n"
      (when light-checkout
	(concat
	 (propertize "Light checkout root: " 'face 'font-lock-type-face)
	 (propertize light-checkout 'face 'font-lock-variable-name-face)
	 "\n"))
      (when light-checkout-branch
	(concat
	 (propertize "Checkout of branch : " 'face 'font-lock-type-face)
	 (propertize light-checkout-branch 'face 'font-lock-variable-name-face)
981
	 "\n"))
982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007
      (when pending-merge
	(concat
	 (propertize "Warning            : " 'face 'font-lock-warning-face
		     'help-echo pending-merge-help-echo)
	 (propertize "Pending merges, commit recommended before any other action"
		     'help-echo pending-merge-help-echo
		     'face 'font-lock-warning-face)
	 "\n"))
      (if shelve
	  (concat
	   (propertize "Shelves            :\n" 'face 'font-lock-type-face
		       'help-echo shelve-help-echo)
	   (mapconcat
	    (lambda (x)
	      (propertize x
			  'face 'font-lock-variable-name-face
			  'mouse-face 'highlight
			  'help-echo "mouse-3: Show shelve menu\nA: Apply and keep shelf\nP: Apply and remove shelf (pop)\nS: Snapshot to a shelf\nC-k: Delete shelf"
			  'keymap vc-bzr-shelve-map))
	    shelve "\n"))
	(concat
	 (propertize "Shelves            : " 'face 'font-lock-type-face
		     'help-echo shelve-help-echo)
	 (propertize "No shelved changes"
		     'help-echo shelve-help-echo
		     'face 'font-lock-variable-name-face))))))
1008 1009 1010 1011 1012 1013 1014 1015 1016

(defun vc-bzr-shelve (name)
  "Create a shelve."
  (interactive "sShelf name: ")
  (let ((root (vc-bzr-root default-directory)))
    (when root
      (vc-bzr-command "shelve" nil 0 nil "--all" "-m" name)
      (vc-resynch-buffer root t t))))

1017 1018 1019
(defun vc-bzr-shelve-show (name)