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

Glenn Morris's avatar
Glenn Morris committed
3
;; Copyright (C) 2006, 2007, 2008, 2009, 2010  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>
7
;; Keywords: vc tools
Stefan Monnier's avatar
Stefan Monnier committed
8
;; Created: Sept 2006
9
;; Version: 2008-01-04
Stefan Monnier's avatar
Stefan Monnier committed
10
;; URL: http://launchpad.net/vc-bzr
11
;; Package: vc
Stefan Monnier's avatar
Stefan Monnier committed
12

13 14 15
;; 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
16
;; it under the terms of the GNU General Public License as published by
17 18
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
Stefan Monnier's avatar
Stefan Monnier committed
19

20
;; GNU Emacs is distributed in the hope that it will be useful,
Stefan Monnier's avatar
Stefan Monnier committed
21 22 23 24 25
;; 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
26
;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
Stefan Monnier's avatar
Stefan Monnier committed
27 28 29

;;; Commentary:

30 31 32
;; See <URL:http://bazaar-vcs.org/> concerning bzr.  See
;; <URL:http://launchpad.net/vc-bzr> for alternate development
;; branches of `vc-bzr'.
Stefan Monnier's avatar
Stefan Monnier committed
33

34
;; Load this library to register bzr support in VC.
35 36 37 38

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

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

;; For an up-to-date list of bugs, please see:
;;   https://bugs.launchpad.net/vc-bzr/+bugs
Stefan Monnier's avatar
Stefan Monnier committed
47

48 49 50 51
;;; Properties of the backend

(defun vc-bzr-revision-granularity () 'repository)
(defun vc-bzr-checkout-model (files) 'implicit)
Stefan Monnier's avatar
Stefan Monnier committed
52 53 54 55

;;; Code:

(eval-when-compile
56
  (require 'cl)
57 58
  (require 'vc)  ;; for vc-exec-after
  (require 'vc-dir))
Stefan Monnier's avatar
Stefan Monnier committed
59

60 61
;; Clear up the cache to force vc-call to check again and discover
;; new functions when we reload this file.
62
(put 'Bzr 'vc-functions nil)
63

Stefan Monnier's avatar
Stefan Monnier committed
64 65
(defgroup vc-bzr nil
  "VC bzr backend."
66
  :version "22.2"
Stefan Monnier's avatar
Stefan Monnier committed
67 68 69
  :group 'vc)

(defcustom vc-bzr-program "bzr"
70
  "Name of the bzr command (excluding any arguments)."
Stefan Monnier's avatar
Stefan Monnier committed
71 72 73 74
  :group 'vc-bzr
  :type 'string)

(defcustom vc-bzr-diff-switches nil
75 76 77 78
  "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
79 80 81 82
                 (string :tag "Argument String")
                 (repeat :tag "Argument List" :value ("") string))
  :group 'vc-bzr)

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

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

103 104

;;;###autoload
105
(defconst vc-bzr-admin-dirname ".bzr"
106
  "Name of the directory containing Bzr repository status files.")
107
;;;###autoload
108 109
(defconst vc-bzr-admin-checkout-format-file
  (concat vc-bzr-admin-dirname "/checkout/format"))
110
(defconst vc-bzr-admin-dirstate
111 112 113
  (concat vc-bzr-admin-dirname "/checkout/dirstate"))
(defconst vc-bzr-admin-branch-format-file
  (concat vc-bzr-admin-dirname "/branch/format"))
114
(defconst vc-bzr-admin-revhistory
115
  (concat vc-bzr-admin-dirname "/branch/revision-history"))
116 117
(defconst vc-bzr-admin-lastrev
  (concat vc-bzr-admin-dirname "/branch/last-revision"))
118 119

;;;###autoload (defun vc-bzr-registered (file)
120
;;;###autoload   (if (vc-find-root file vc-bzr-admin-checkout-format-file)
121 122 123
;;;###autoload       (progn
;;;###autoload         (load "vc-bzr")
;;;###autoload         (vc-bzr-registered file))))
Stefan Monnier's avatar
Stefan Monnier committed
124

125 126 127 128
(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)
129 130
      (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
131

Stefan Monnier's avatar
Stefan Monnier committed
132
(require 'sha1)                         ;For sha1-program
133

Stefan Monnier's avatar
Stefan Monnier committed
134 135 136 137
(defun vc-bzr-sha1 (file)
  (with-temp-buffer
    (set-buffer-multibyte nil)
    (let ((prog sha1-program)
138 139
          (args nil)
	  process-file-side-effects)
Stefan Monnier's avatar
Stefan Monnier committed
140 141 142
      (when (consp prog)
	(setq args (cdr prog))
        (setq prog (car prog)))
143
      (apply 'process-file prog (file-relative-name file) t nil args)
Stefan Monnier's avatar
Stefan Monnier committed
144 145 146 147
      (buffer-substring (point-min) (+ (point-min) 40)))))

(defun vc-bzr-state-heuristic (file)
  "Like `vc-bzr-state' but hopefully without running Bzr."
148
  ;; `bzr status' was excrutiatingly slow with large histories and
Stefan Monnier's avatar
Stefan Monnier committed
149 150 151 152 153 154 155 156 157
  ;; 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'."
158 159 160 161 162
  (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)))
163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179
        (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?
180 181
                               "\\([^\0]*\\)\0" ;sha1 (empty if conflicted)?
                               "\\([^\0]*\\)\0" ;size?p
182 183 184 185
                               "[^\0]*\0"       ;"y/n", executable?
                               "[^\0]*\0"       ;?
                               "\\([^\0]*\\)\0" ;"a/f/d" a=added?
                               "\\([^\0]*\\)\0" ;sha1 again?
186
                               "\\([^\0]*\\)\0" ;size again?
187 188 189 190 191 192 193 194 195 196 197
                               "[^\0]*\0" ;"y/n", executable again?
                               "[^\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)
198 199
                       ((eq (char-after (match-beginning 4)) ?a) 'added)
                       ((or (and (eq (string-to-number (match-string 3))
200
                                 (nth 7 (file-attributes file)))
201
                             (equal (match-string 5)
202
                                    (vc-bzr-sha1 file)))
203 204 205 206 207 208 209 210 211
			    (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))))
212 213 214 215 216 217 218 219 220
                        '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
221 222 223 224 225

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

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

231 232 233 234
(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))
235
       (rootdir (vc-bzr-root filename*)))
236
    (when rootdir
237 238
         (file-relative-name filename* rootdir))))

239 240 241
(defun vc-bzr-status (file)
  "Return FILE status according to Bzr.
Return value is a cons (STATUS . WARNING), where WARNING is a
242 243
string or nil, and STATUS is one of the symbols: `added',
`ignored', `kindchanged', `modified', `removed', `renamed', `unknown',
244 245 246 247 248 249
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."
250
  (with-temp-buffer
251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266
    (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))
267 268 269
                         ;; Bzr appends a '/' to directory names and
                         ;; '*' to executable files
                         (if (file-directory-p file) "/?" "\\*?")
270 271
                         "[ \t\n]*$")
                 nil t)
272
            (lexical-let ((statusword (match-string 1)))
273 274
              ;; Erase the status text that matched.
              (delete-region (match-beginning 0) (match-end 0))
275
              (setq status
276
                    (intern (replace-regexp-in-string " " "" statusword)))))
277 278 279 280 281 282 283 284 285 286 287 288
          (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))))))))
289

290 291 292
(defun vc-bzr-state (file)
  (lexical-let ((result (vc-bzr-status file)))
    (when (consp result)
293 294
      (when (cdr result)
	(message "Warnings in `bzr' output: %s" (cdr result)))
295
      (cdr (assq (car result)
Dan Nicolaescu's avatar
Dan Nicolaescu committed
296
                 '((added . added)
297
                   (kindchanged . edited)
298 299
                   (renamed . edited)
                   (modified . edited)
300
                   (removed . removed)
301
                   (ignored . ignored)
302
                   (unknown . unregistered)
303
                   (unchanged . up-to-date)))))))
Stefan Monnier's avatar
Stefan Monnier committed
304

305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331
(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
332
(defun vc-bzr-workfile-unchanged-p (file)
333
  (eq 'unchanged (car (vc-bzr-status file))))
Stefan Monnier's avatar
Stefan Monnier committed
334

Eric S. Raymond's avatar
Eric S. Raymond committed
335
(defun vc-bzr-working-revision (file)
Stefan Monnier's avatar
Stefan Monnier committed
336 337
  ;; 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.
338 339
  (lexical-let*
      ((rootdir (vc-bzr-root file))
340 341 342 343 344 345
       (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.
346 347 348 349 350 351 352 353 354 355 356 357 358 359
    (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)
360 361 362 363 364
		     ;; 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)))
365 366
			 (when (and (memq system-type '(ms-dos windows-nt))
				    (string-match-p "^/[[:alpha:]]:" l-c-parent-dir))
Juanma Barranquero's avatar
Juanma Barranquero committed
367 368 369
			   ;;; 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)
370
			   (setq l-c-parent-dir (substring l-c-parent-dir 1)))
371 372 373 374 375 376 377 378
			 (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)))))
379
		 t)))
380
        (with-temp-buffer
381
          (insert-file-contents branch-format-file)
382 383 384 385 386 387
          (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
388
            (insert-file-contents revhistory-file)
389
            (number-to-string (count-lines (line-end-position) (point-max))))
390 391 392
           ((or
	     (looking-at "Bazaar Branch Format 6 (bzr 0.15)")
	     (looking-at "Bazaar Branch Format 7 (needs bzr 1.6)"))
393
            ;; revno is the first number in .bzr/branch/last-revision
394
            (insert-file-contents lastrev-file)
395 396
            (when (re-search-forward "[0-9]+" nil t)
	      (buffer-substring (match-beginning 0) (match-end 0))))))
397
      ;; fallback to calling "bzr revno"
398
      (lexical-let*
399
          ((result (vc-bzr-command-discarding-stderr
400
                    vc-bzr-program "revno" (file-relative-name file)))
401 402 403 404 405
           (exitcode (car result))
           (output (cdr result)))
        (cond
         ((eq exitcode 0) (substring output 0 -1))
         (t nil))))))
Stefan Monnier's avatar
Stefan Monnier committed
406

407
(defun vc-bzr-create-repo ()
408
  "Create a new Bzr repository."
409 410
  (vc-bzr-command "init" nil 0 nil))

411
(defun vc-bzr-init-revision (&optional file)
412 413 414
  "Always return nil, as Bzr cannot register explicit versions."
  nil)

415 416 417 418 419 420 421 422 423 424
(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)))

425
(defun vc-bzr-register (files &optional rev comment)
Stefan Monnier's avatar
Stefan Monnier committed
426 427 428
  "Register FILE under bzr.
Signal an error unless REV is nil.
COMMENT is ignored."
429
  (if rev (error "Can't register explicit revision with bzr"))
430
  (vc-bzr-command "add" nil 0 files))
Stefan Monnier's avatar
Stefan Monnier committed
431 432 433

;; Could run `bzr status' in the directory and see if it succeeds, but
;; that's relatively expensive.
434
(defalias 'vc-bzr-responsible-p 'vc-bzr-root
Stefan Monnier's avatar
Stefan Monnier committed
435 436
  "Return non-nil if FILE is (potentially) controlled by bzr.
The criterion is that there is a `.bzr' directory in the same
437
or a superior directory.")
Stefan Monnier's avatar
Stefan Monnier committed
438 439 440 441 442 443 444 445 446

(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).
447
             (goto-char (point-min))
Stefan Monnier's avatar
Stefan Monnier committed
448 449 450 451 452
             (looking-at "added "))
         (error))))

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

455 456 457
(declare-function log-edit-extract-headers "log-edit" (headers string))

(defun vc-bzr-checkin (files rev comment)
Stefan Monnier's avatar
Stefan Monnier committed
458 459
  "Check FILE in to bzr with log message COMMENT.
REV non-nil gets an error."
460
  (if rev (error "Can't check in a specific revision with bzr"))
461
  (apply 'vc-bzr-command "commit" nil 0
462
         files (cons "-m" (log-edit-extract-headers '(("Author" . "--author")
463
						      ("Date" . "--commit-time")
464 465
                                                      ("Fixes" . "--fixes"))
                                                    comment))))
Stefan Monnier's avatar
Stefan Monnier committed
466

467 468
(defun vc-bzr-find-revision (file rev buffer)
  "Fetch revision REV of file FILE and put it into BUFFER."
469 470 471 472 473
    (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
474 475 476 477
(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
478 479 480

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

483 484 485 486
(defvar log-view-message-re)
(defvar log-view-file-re)
(defvar log-view-font-lock-keywords)
(defvar log-view-current-tag-function)
487
(defvar log-view-per-file-logs)
488 489 490

(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
491
  (require 'add-log)
492
  (set (make-local-variable 'log-view-per-file-logs) nil)
493
  (set (make-local-variable 'log-view-file-re) "\\`a\\`")
494
  (set (make-local-variable 'log-view-message-re)
495
       (if (eq vc-log-view-type 'short)
496
	   "^ *\\([0-9.]+\\): \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?"
497
	 "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)"))
Stefan Monnier's avatar
Stefan Monnier committed
498
  (set (make-local-variable 'log-view-font-lock-keywords)
499 500
       ;; log-view-font-lock-keywords is careful to use the buffer-local
       ;; value of log-view-message-re only since Emacs-23.
501
       (if (eq vc-log-view-type 'short)
502 503 504 505
	 (append `((,log-view-message-re
		    (1 'log-view-message-face)
		    (2 'change-log-name)
		    (3 'change-log-date)
506
		    (4 'change-log-list nil lax))))
507 508
	 (append `((,log-view-message-re . 'log-view-message-face))
		 ;; log-view-font-lock-keywords
509
		 '(("^ *\\(?:committer\\|author\\): \
510
\\([^<(]+?\\)[  ]*[(<]\\([[:alnum:]_.+-]+@[[:alnum:]_.-]+\\)[>)]"
511 512 513
		    (1 'change-log-name)
		    (2 'change-log-email))
		   ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face)))))))
Stefan Monnier's avatar
Stefan Monnier committed
514

515
(defun vc-bzr-print-log (files buffer &optional shortlog start-revision limit)
516
  "Get bzr change log for FILES into specified BUFFER."
517 518 519 520 521
  ;; `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
522 523 524
  ;; 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.
525 526
  (with-current-buffer buffer
    (apply 'vc-bzr-command "log" buffer 'async files
527
	   (append
528
	    (when shortlog '("--line"))
529
	    (when start-revision (list (format "-r..%s" start-revision)))
530 531 532 533
	    (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
534

535 536 537 538 539 540 541 542
(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))))

543 544
(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
545
  (goto-char (point-min))
546
  (when revision
547 548
    (let (case-fold-search
	  found)
549 550 551 552 553 554 555
      (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)
556 557 558 559 560
	  (progn
	    (beginning-of-line 0)
	    (setq found t))
	(goto-char (point-min)))
      found)))
Stefan Monnier's avatar
Stefan Monnier committed
561

562
(defun vc-bzr-diff (files &optional rev1 rev2 buffer)
Stefan Monnier's avatar
Stefan Monnier committed
563
  "VC bzr backend for diff."
564
  ;; `bzr diff' exits with code 1 if diff is non-empty.
565 566
  (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*")
	 (if vc-disable-async-diff 1 'async) files
567
         "--diff-options" (mapconcat 'identity
568
                                     (vc-switches 'bzr 'diff)
Miles Bader's avatar
Miles Bader committed
569
				     " ")
570 571 572 573
         ;; 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"
574
                              (or rev1 "revno:-1")
575
                              (or rev2 ""))))))
Stefan Monnier's avatar
Stefan Monnier committed
576 577


578 579
;; FIXME: vc-{next,previous}-revision need fixing in vc.el to deal with
;; straight integer revisions.
Stefan Monnier's avatar
Stefan Monnier committed
580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595

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

596
(defun vc-bzr-annotate-command (file buffer &optional revision)
Stefan Monnier's avatar
Stefan Monnier committed
597 598 599
  "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."
600
  (apply #'vc-bzr-command "annotate" buffer 'async file "--long" "--all"
Dan Nicolaescu's avatar
Dan Nicolaescu committed
601
         (if revision (list "-r" revision)))
602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618
  (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))
           (while (string-match "^\\( *[0-9.]+ *\\) \\([^\n ]+\\) +\\([0-9]\\{8\\}\\)\\( |.*\n\\)" string)
             (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)))
619 620 621
	       (unless tag
		 (setq tag
		       (propertize
622
			(format "%s %-7.7s" rev author)
623 624 625 626
			'help-echo (format "Revision: %d, author: %s, date: %s"
					   (string-to-number rev)
					   author date)
			'mouse-face 'highlight))
627 628 629 630 631
                 (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
632

633 634
(declare-function vc-annotate-convert-time "vc-annotate" (time))

Stefan Monnier's avatar
Stefan Monnier committed
635
(defun vc-bzr-annotate-time ()
636
  (when (re-search-forward "^ *[0-9.]+ +[^\n ]* +|" nil t)
Dan Nicolaescu's avatar
Dan Nicolaescu committed
637 638
    (let ((prop (get-text-property (line-beginning-position) 'help-echo)))
      (string-match "[0-9]+\\'" prop)
639
      (let ((str (match-string-no-properties 0 prop)))
Stefan Monnier's avatar
Stefan Monnier committed
640 641
      (vc-annotate-convert-time
       (encode-time 0 0 0
642 643 644
                      (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
645 646 647 648 649 650

(defun vc-bzr-annotate-extract-revision-at-line ()
  "Return revision for current line of annoation buffer, or nil.
Return nil if current line isn't annotated."
  (save-excursion
    (beginning-of-line)
651
    (if (looking-at "^ *\\([0-9.]+\\) +[^\n ]* +|")
Dan Nicolaescu's avatar
Dan Nicolaescu committed
652
        (match-string-no-properties 1))))
Stefan Monnier's avatar
Stefan Monnier committed
653

654 655
(defun vc-bzr-command-discarding-stderr (command &rest args)
  "Execute shell command COMMAND (with ARGS); return its output and exitcode.
656 657 658 659 660
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
661
    (cons
662
     (apply #'process-file command nil (list (current-buffer) nil) nil args)
663
     (buffer-substring (point-min) (point-max)))))
Stefan Monnier's avatar
Stefan Monnier committed
664

665 666 667 668 669 670
(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

671
(defun vc-bzr-dir-printer (info)
672 673
  "Pretty-printer for the vc-dir-fileinfo structure."
  (let ((extra (vc-dir-fileinfo->extra info)))
674
    (vc-default-dir-printer 'Bzr info)
675 676 677 678 679 680
    (when extra
      (insert (propertize
	       (format "   (renamed from %s)"
		       (vc-bzr-extra-fileinfo->extra-name extra))
	       'face 'font-lock-comment-face)))))

681
;; FIXME: this needs testing, it's probably incomplete.
682
(defun vc-bzr-after-dir-status (update-function relative-dir)
683
  (let ((status-str nil)
684 685 686 687 688 689 690
	(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)
691
                       ;; For conflicts, should we list the .THIS/.BASE/.OTHER?
692 693
		       ("C  " . conflict)
		       ("?  " . unregistered)
694 695
		       ;; No such state, but we need to distinguish this case.
		       ("R  " . renamed)
696
		       ("RM " . renamed)
697 698 699
		       ;; For a non existent file FOO, the output is:
		       ;; bzr: ERROR: Path(s) do not exist: FOO
		       ("bzr" . not-found)
700 701 702 703 704
		       ;; 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)
705
                       ;; Ignore "P " and "P." for pending patches.
706 707
		       ("P  " . not-found)
		       ("P. " . not-found)
708
                       ))
709 710 711 712 713
	(translated nil)
	(result nil))
      (goto-char (point-min))
      (while (not (eobp))
	(setq status-str
714
	      (buffer-substring-no-properties (point) (+ (point) 3)))
715
	(setq translated (cdr (assoc status-str translation)))
716 717 718 719 720 721 722 723 724 725 726 727 728 729 730
	(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)
731
	  (re-search-forward "R[ M]  \\(.*\\) => \\(.*\\)$" (line-end-position) t)
732 733
	  (let ((new-name (file-relative-name (match-string 2) relative-dir))
		(old-name (file-relative-name (match-string 1) relative-dir)))
734 735
	    (push (list new-name 'edited
		      (vc-bzr-create-extra-fileinfo old-name)) result)))
736 737
	 ;; do nothing for non existent files
	 ((eq translated 'not-found))
738
	 (t
739 740 741 742
	  (push (list (file-relative-name
		       (buffer-substring-no-properties
			(+ (point) 4)
			(line-end-position)) relative-dir)
743
		      translated) result)))
744
	(forward-line))
745
      (funcall update-function result)))
746

747
(defun vc-bzr-dir-status (dir update-function)
748
  "Return a list of conses (file . state) for DIR."
749 750
  (vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S")
  (vc-exec-after
751 752 753 754 755 756 757 758 759
   `(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)))))
760

761 762 763 764
(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
765 766
   `(vc-bzr-after-dir-status (quote ,update-function)
			     (file-relative-name ,dir (vc-bzr-root ,dir)))))
767

768 769 770 771 772 773 774
(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)
775 776 777
    (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)
778
    (define-key map "P" 'vc-bzr-shelve-apply-at-point)
779
    (define-key map "S" 'vc-bzr-shelve-snapshot)
780 781 782 783 784 785 786
    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"))
787 788 789
    (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"))
790 791 792
    (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"))
793 794 795
    (define-key map [sh]
      '(menu-item "Show shelve" vc-bzr-shelve-show-at-point
    		  :help "Show the contents of the current shelve"))
796 797 798 799
    map))

(defvar vc-bzr-extra-menu-map
  (let ((map (make-sparse-keymap)))
800 801 802
    (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"))
803 804 805 806 807 808 809 810 811
    (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)

812
(defun vc-bzr-dir-extra-headers (dir)
813 814 815 816
  (let*
      ((str (with-temp-buffer
	      (vc-bzr-command "info" t 0 dir)
	      (buffer-string)))
817 818
       (shelve (vc-bzr-shelve-list))
       (shelve-help-echo "Use M-x vc-bzr-shelve to create shelves")
819 820
       (root-dir (vc-bzr-root dir))
       (pending-merge
821 822 823 824 825 826
	;; 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))))
827 828
       (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))
829 830 831 832 833 834 835
       (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)))))
836
    (concat
837 838
     (propertize "Parent branch      : " 'face 'font-lock-type-face)
     (propertize
839
      (if (string-match "parent branch: \\(.+\\)$" str)
840 841 842 843 844 845 846 847 848 849 850 851 852
 	  (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)
853
	 "\n"))
854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879
      (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))))))
880 881 882 883 884 885 886 887 888

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

889 890 891
(defun vc-bzr-shelve-show (name)
  "Show the contents of shelve NAME."
  (interactive "sShelve name: ")
892
  (vc-setup-buffer "*vc-diff*")
893
  ;; FIXME: how can you show the contents of a shelf?
894 895
  (vc-bzr-command "unshelve" "*vc-diff*" 'async nil "--preview" name)
  (set-buffer "*vc-diff*")
896 897 898
  (diff-mode)
  (setq buffer-read-only t)
  (pop-to-buffer (current-buffer)))
899 900

(defun vc-bzr-shelve-apply (name)
901 902
  "Apply shelve NAME and remove it afterwards."
  (interactive "sApply (and remove) shelf: ")
903
  (vc-bzr-command "unshelve" nil 0 nil "--apply" name)
904 905
  (vc-resynch-buffer (vc-bzr-root default-directory) t t))

906 907 908
(defun vc-bzr-shelve-apply-and-keep (name)
  "Apply shelve NAME and keep it afterwards."
  (interactive "sApply (and keep) shelf: ")
909
  (vc-bzr-command "unshelve" nil 0 nil "--apply" "--keep" name)
910 911 912 913 914 915 916 917 918 919
  (vc-resynch-buffer (vc-bzr-root default-directory) t t))

(defun vc-bzr-shelve-snapshot ()
  "Create a stash with the current tree state."
  (interactive)
  (vc-bzr-command "shelve" nil 0 nil "--all" "-m"
		  (let ((ct (current-time)))
		    (concat
		     (format-time-string "Snapshot on %Y-%m-%d" ct)
		     (format-time-string " at %H:%M" ct))))
920
  (vc-bzr-command "unshelve" nil 0 nil "--apply" "--keep")
921 922
  (vc-resynch-buffer (vc-bzr-root default-directory) t t))

923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946
(defun vc-bzr-shelve-list ()
  (with-temp-buffer
    (vc-bzr-command "shelve" (current-buffer) 1 nil "--list" "-q")
    (delete
     ""
     (split-string
      (buffer-substring (point-min) (point-max))
      "\n"))))

(defun vc-bzr-shelve-get-at-point (point)
  (save-excursion
    (goto-char point)
    (beginning-of-line)
    (if (looking-at "^ +\\([0-9]+\\):")
	(match-string 1)
      (error "Cannot find shelf at point"))))

(defun vc-bzr-shelve-delete-at-point ()
  (interactive)
  (let ((shelve (vc-bzr-shelve-get-at-point (point))))
    (when (y-or-n-p (format "Remove shelf %s ?" shelve))
      (vc-bzr-command "unshelve" nil 0 nil "--delete-only" shelve)
      (vc-dir-refresh))))

947 948 949
(defun vc-bzr-shelve-show-at-point ()
  (interactive)
  (vc-bzr-shelve-show (vc-bzr-shelve-get-at-point (point))))
950 951 952 953 954

(defun vc-bzr-shelve-apply-at-point ()
  (interactive)
  (vc-bzr-shelve-apply (vc-bzr-shelve-get-at-point (point))))

955 956 957 958
(defun vc-bzr-shelve-apply-and-keep-at-point ()
  (interactive)
  (vc-bzr-shelve-apply-and-keep (vc-bzr-shelve-get-at-point (point))))

959 960 961
(defun vc-bzr-shelve-menu (e)
  (interactive "e")
  (vc-dir-at-event e (popup-menu vc-bzr-shelve-menu-map e)))
962

963 964 965 966 967 968 969 970 971 972 973 974 975
(defun vc-bzr-revision-table (files)
  (let ((vc-bzr-revisions '())
        (default-directory (file-name-directory (car files))))
    (with-temp-buffer
      (vc-bzr-command "log" t 0 files "--line")
      (let ((start (point-min))
            (loglines (buffer-substring-no-properties (point-min) (point-max))))
        (while (string-match "^\\([0-9]+\\):" loglines)
          (push (match-string 1 loglines) vc-bzr-revisions)
          (setq start (+ start (match-end 0)))
          (setq loglines (buffer-substring-no-properties start (point-max))))))
    vc-bzr-revisions))

976 977 978 979 980 981 982 983 984 985 986 987 988
(defun vc-bzr-conflicted-files (dir)
  (let ((default-directory (vc-bzr-root dir))
        (files ()))
    (with-temp-buffer
      (vc-bzr-command "status" t 0 default-directory)
      (goto-char (point-min))
      (when (re-search-forward "^conflicts:\n" nil t)
        (while (looking-at "  \\(?:Text conflict in \\(.*\\)\\|.*\\)\n")
          (if (match-end 1)
              (push (expand-file-name (match-string 1)) files))
          (goto-char (match-end 0)))))
    files))

989 990
;;; Revision completion

991 992 993 994 995
(eval-and-compile
  (defconst vc-bzr-revision-keywords
    '("revno" "revid" "last" "before"
      "tag" "date" "ancestor" "branch" "submit")))

996 997 998 999 1000 1001 1002
(defun vc-bzr-revision-completion-table (files)
  (lexical-let ((files files))
    ;; What about using `files'?!?  --Stef
    (lambda (string pred action)
      (cond
       ((string-match "\\`\\(ancestor\\|branch\\|\\(revno:\\)?[-0-9]+:\\):"
                      string)
1003
        (completion-table-with-context (substring string 0 (match-end 0))
Stefan Monnier's avatar