1 ;;; vc-bzr.el --- VC backend for the bzr revision control system
3 ;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
5 ;; Author: Dave Love <fx@gnu.org>
6 ;; Riccardo Murri <riccardo.murri@gmail.com>
10 ;; URL: http://launchpad.net/vc-bzr
13 ;; This file is part of GNU Emacs.
15 ;; GNU Emacs is free software: you can redistribute it and/or modify
16 ;; it under the terms of the GNU General Public License as published by
17 ;; the Free Software Foundation, either version 3 of the License, or
18 ;; (at your option) any later version.
20 ;; GNU Emacs is distributed in the hope that it will be useful,
21 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
22 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23 ;; GNU General Public License for more details.
25 ;; 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/>.
30 ;; See <URL:http://bazaar-vcs.org/> concerning bzr. See
31 ;; <URL:http://launchpad.net/vc-bzr> for alternate development
32 ;; branches of `vc-bzr'.
34 ;; Load this library to register bzr support in VC.
39 ;; When editing a symlink and *both* the symlink and its target
40 ;; are bzr-versioned, `vc-bzr` presently runs `bzr status` on the
41 ;; symlink, thereby not detecting whether the actual contents
42 ;; (that is, the target contents) are changed.
43 ;; See https://bugs.launchpad.net/vc-bzr/+bug/116607
45 ;; For an up-to-date list of bugs, please see:
46 ;; https://bugs.launchpad.net/vc-bzr/+bugs
48 ;;; Properties of the backend
50 (defun vc-bzr-revision-granularity () 'repository
)
51 (defun vc-bzr-checkout-model (files) 'implicit
)
57 (require 'vc
) ;; for vc-exec-after
60 ;; Clear up the cache to force vc-call to check again and discover
61 ;; new functions when we reload this file.
62 (put 'Bzr
'vc-functions nil
)
69 (defcustom vc-bzr-program
"bzr"
70 "Name of the bzr command (excluding any arguments)."
74 (defcustom vc-bzr-diff-switches nil
75 "String or list of strings specifying switches for bzr diff under VC.
76 If nil, use the value of `vc-diff-switches'. If t, use no switches."
77 :type
'(choice (const :tag
"Unspecified" nil
)
79 (string :tag
"Argument String")
80 (repeat :tag
"Argument List" :value
("") string
))
83 (defcustom vc-bzr-log-switches nil
84 "String or list of strings specifying switches for bzr log under VC."
85 :type
'(choice (const :tag
"None" nil
)
86 (string :tag
"Argument String")
87 (repeat :tag
"Argument List" :value
("") string
))
90 ;; since v0.9, bzr supports removing the progress indicators
91 ;; 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 Invoke the bzr command adding `BZR_PROGRESS_BAR=none' and
95 `LC_MESSAGES=C' to the environment."
96 (let ((process-environment
97 (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
)))
105 (defconst vc-bzr-admin-dirname
".bzr"
106 "Name of the directory containing Bzr repository status files.")
108 (defconst vc-bzr-admin-checkout-format-file
109 (concat vc-bzr-admin-dirname
"/checkout/format"))
110 (defconst vc-bzr-admin-dirstate
111 (concat vc-bzr-admin-dirname
"/checkout/dirstate"))
112 (defconst vc-bzr-admin-branch-format-file
113 (concat vc-bzr-admin-dirname
"/branch/format"))
114 (defconst vc-bzr-admin-revhistory
115 (concat vc-bzr-admin-dirname
"/branch/revision-history"))
116 (defconst vc-bzr-admin-lastrev
117 (concat vc-bzr-admin-dirname
"/branch/last-revision"))
119 ;;;###autoload (defun vc-bzr-registered (file)
120 ;;;###autoload (if (vc-find-root file vc-bzr-admin-checkout-format-file)
121 ;;;###autoload (progn
122 ;;;###autoload (load "vc-bzr")
123 ;;;###autoload (vc-bzr-registered file))))
125 (defun vc-bzr-root (file)
126 "Return the root directory of the bzr repository containing FILE."
127 ;; Cache technique copied from vc-arch.el.
128 (or (vc-file-getprop file
'bzr-root
)
129 (let ((root (vc-find-root file vc-bzr-admin-checkout-format-file
)))
130 (when root
(vc-file-setprop file
'bzr-root root
)))))
132 (require 'sha1
) ;For sha1-program
134 (defun vc-bzr-sha1 (file)
136 (set-buffer-multibyte nil
)
137 (let ((prog sha1-program
)
139 process-file-side-effects
)
141 (setq args
(cdr prog
))
142 (setq prog
(car prog
)))
143 (apply 'process-file prog
(file-relative-name file
) t nil args
)
144 (buffer-substring (point-min) (+ (point-min) 40)))))
146 (defun vc-bzr-state-heuristic (file)
147 "Like `vc-bzr-state' but hopefully without running Bzr."
148 ;; `bzr status' was excrutiatingly slow with large histories and
149 ;; pending merges, so try to avoid using it until they fix their
150 ;; performance problems.
151 ;; This function tries first to parse Bzr internal file
152 ;; `checkout/dirstate', but it may fail if Bzr internal file format
153 ;; has changed. As a safeguard, the `checkout/dirstate' file is
154 ;; only parsed if it contains the string `#bazaar dirstate flat
155 ;; format 3' in the first line.
156 ;; If the `checkout/dirstate' file cannot be parsed, fall back to
157 ;; running `vc-bzr-state'."
158 (lexical-let ((root (vc-bzr-root file
)))
159 (when root
; Short cut.
160 ;; This looks at internal files. May break if they change
162 (lexical-let ((dirstate (expand-file-name vc-bzr-admin-dirstate root
)))
165 (insert-file-contents dirstate
)
166 (goto-char (point-min))
167 (if (not (looking-at "#bazaar dirstate flat format 3"))
168 (vc-bzr-state file
) ; Some other unknown format?
169 (let* ((relfile (file-relative-name file root
))
170 (reldir (file-name-directory relfile
)))
171 (if (re-search-forward
173 (if reldir
(regexp-quote
174 (directory-file-name reldir
)))
176 (regexp-quote (file-name-nondirectory relfile
))
179 "\\([^\0]*\\)\0" ;"a/f/d", a=removed?
180 "\\([^\0]*\\)\0" ;sha1 (empty if conflicted)?
181 "\\([^\0]*\\)\0" ;size?p
182 "[^\0]*\0" ;"y/n", executable?
184 "\\([^\0]*\\)\0" ;"a/f/d" a=added?
185 "\\([^\0]*\\)\0" ;sha1 again?
186 "\\([^\0]*\\)\0" ;size again?
187 "[^\0]*\0" ;"y/n", executable again?
188 "[^\0]*\0" ;last revid?
189 ;; There are more fields when merges are pending.
192 ;; Apparently the second sha1 is the one we want: when
193 ;; there's a conflict, the first sha1 is absent (and the
194 ;; first size seems to correspond to the file with
195 ;; conflict markers).
197 ((eq (char-after (match-beginning 1)) ?a
) 'removed
)
198 ((eq (char-after (match-beginning 4)) ?a
) 'added
)
199 ((or (and (eq (string-to-number (match-string 3))
200 (nth 7 (file-attributes file
)))
201 (equal (match-string 5)
204 ;; It looks like for lightweight
205 ;; checkouts \2 is empty and we need to
206 ;; look for size in \6.
207 (eq (match-beginning 2) (match-end 2))
208 (eq (string-to-number (match-string 6))
209 (nth 7 (file-attributes file
)))
210 (equal (match-string 5)
211 (vc-bzr-sha1 file
))))
215 ;; Either the dirstate file can't be read, or the sha1
216 ;; executable is missing, or ...
217 ;; In either case, recent versions of Bzr aren't that slow
219 (error (vc-bzr-state file
)))))))
222 (defun vc-bzr-registered (file)
223 "Return non-nil if FILE is registered with bzr."
224 (let ((state (vc-bzr-state-heuristic file
)))
225 (not (memq state
'(nil unregistered ignored
)))))
227 (defconst vc-bzr-state-words
228 "added\\|ignored\\|kind changed\\|modified\\|removed\\|renamed\\|unknown"
229 "Regexp matching file status words as reported in `bzr' output.")
231 (defun vc-bzr-file-name-relative (filename)
232 "Return file name FILENAME stripped of the initial Bzr repository path."
234 ((filename* (expand-file-name filename
))
235 (rootdir (vc-bzr-root filename
*)))
237 (file-relative-name filename
* rootdir
))))
239 (defun vc-bzr-status (file)
240 "Return FILE status according to Bzr.
241 Return value is a cons (STATUS . WARNING), where WARNING is a
242 string or nil, and STATUS is one of the symbols: `added',
243 `ignored', `kindchanged', `modified', `removed', `renamed', `unknown',
244 which directly correspond to `bzr status' output, or 'unchanged
245 for files whose copy in the working tree is identical to the one
246 in the branch repository, or nil for files that are not
249 If any error occurred in running `bzr status', then return nil."
251 (let ((ret (condition-case nil
252 (vc-bzr-command "status" t
0 file
)
253 (file-error nil
))) ; vc-bzr-program not found.
255 ;; the only secure status indication in `bzr status' output
256 ;; is a couple of lines following the pattern::
259 ;; if the file is up-to-date, we get no status report from `bzr',
260 ;; so if the regexp search for the above pattern fails, we consider
261 ;; the file to be up-to-date.
262 (goto-char (point-min))
263 (when (re-search-forward
264 ;; bzr prints paths relative to the repository root.
265 (concat "^\\(" vc-bzr-state-words
"\\):[ \t\n]+"
266 (regexp-quote (vc-bzr-file-name-relative file
))
267 ;; Bzr appends a '/' to directory names and
268 ;; '*' to executable files
269 (if (file-directory-p file
) "/?" "\\*?")
272 (lexical-let ((statusword (match-string 1)))
273 ;; Erase the status text that matched.
274 (delete-region (match-beginning 0) (match-end 0))
276 (intern (replace-regexp-in-string " " "" statusword
)))))
278 (goto-char (point-min))
279 (skip-chars-forward " \n\t") ;Throw away spaces.
281 ;; "bzr" will output warnings and informational messages to
282 ;; stderr; due to Emacs' `vc-do-command' (and, it seems,
283 ;; `start-process' itself) limitations, we cannot catch stderr
284 ;; and stdout into different buffers. So, if there's anything
285 ;; left in the buffer after removing the above status
286 ;; keywords, let us just presume that any other message from
287 ;; "bzr" is a user warning, and display it.
288 (unless (eobp) (buffer-substring (point) (point-max))))))))
290 (defun vc-bzr-state (file)
291 (lexical-let ((result (vc-bzr-status file
)))
294 (message "Warnings in `bzr' output: %s" (cdr result
)))
295 (cdr (assq (car result
)
297 (kindchanged . edited
)
302 (unknown . unregistered
)
303 (unchanged . up-to-date
)))))))
305 (defun vc-bzr-resolve-when-done ()
306 "Call \"bzr resolve\" if the conflict markers have been removed."
308 (goto-char (point-min))
309 (unless (re-search-forward "^<<<<<<< " nil t
)
310 (vc-bzr-command "resolve" nil
0 buffer-file-name
)
311 ;; Remove the hook so that it is not called multiple times.
312 (remove-hook 'after-save-hook
'vc-bzr-resolve-when-done t
))))
314 (defun vc-bzr-find-file-hook ()
315 (when (and buffer-file-name
316 ;; FIXME: We should check that "bzr status" says "conflict".
317 (file-exists-p (concat buffer-file-name
".BASE"))
318 (file-exists-p (concat buffer-file-name
".OTHER"))
319 (file-exists-p (concat buffer-file-name
".THIS"))
320 ;; If "bzr status" says there's a conflict but there are no
321 ;; conflict markers, it's not clear what we should do.
323 (goto-char (point-min))
324 (re-search-forward "^<<<<<<< " nil t
)))
325 ;; TODO: the merge algorithm used in `bzr merge' is nicely configurable,
326 ;; but the one in `bzr pull' isn't, so it would be good to provide an
327 ;; elisp function to remerge from the .BASE/OTHER/THIS files.
328 (smerge-start-session)
329 (add-hook 'after-save-hook
'vc-bzr-resolve-when-done nil t
)
330 (message "There are unresolved conflicts in this file")))
332 (defun vc-bzr-workfile-unchanged-p (file)
333 (eq 'unchanged
(car (vc-bzr-status file
))))
335 (defun vc-bzr-working-revision (file)
336 ;; Together with the code in vc-state-heuristic, this makes it possible
337 ;; to get the initial VC state of a Bzr file even if Bzr is not installed.
339 ((rootdir (vc-bzr-root file
))
340 (branch-format-file (expand-file-name vc-bzr-admin-branch-format-file
342 (revhistory-file (expand-file-name vc-bzr-admin-revhistory rootdir
))
343 (lastrev-file (expand-file-name vc-bzr-admin-lastrev rootdir
)))
344 ;; This looks at internal files to avoid forking a bzr process.
345 ;; May break if they change their format.
346 (if (and (file-exists-p branch-format-file
)
347 ;; For lightweight checkouts (obtained with bzr checkout --lightweight)
348 ;; the branch-format-file does not contain the revision
349 ;; information, we need to look up the branch-format-file
350 ;; in the place where the lightweight checkout comes
351 ;; from. We only do that if it's a local file.
352 (let ((location-fname (expand-file-name
353 (concat vc-bzr-admin-dirname
354 "/branch/location") rootdir
)))
355 ;; The existence of this file is how we distinguish
356 ;; lightweight checkouts.
357 (if (file-exists-p location-fname
)
359 (insert-file-contents location-fname
)
360 ;; If the lightweight checkout points to a
361 ;; location in the local file system, then we can
362 ;; look there for the version information.
363 (when (re-search-forward "file://\\(.+\\)" nil t
)
364 (let ((l-c-parent-dir (match-string 1)))
365 (when (and (memq system-type
'(ms-dos windows-nt
))
366 (string-match-p "^/[[:alpha:]]:" l-c-parent-dir
))
367 ;;; The non-Windows code takes a shortcut by using the host/path
368 ;;; separator slash as the start of the absolute path. That
369 ;;; 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 (setq branch-format-file
372 (expand-file-name vc-bzr-admin-branch-format-file
375 (expand-file-name vc-bzr-admin-lastrev l-c-parent-dir
))
376 ;; FIXME: maybe it's overkill to check if both these files exist.
377 (and (file-exists-p branch-format-file
)
378 (file-exists-p lastrev-file
)))))
381 (insert-file-contents branch-format-file
)
382 (goto-char (point-min))
385 (looking-at "Bazaar-NG branch, format 0.0.4")
386 (looking-at "Bazaar-NG branch format 5"))
387 ;; count lines in .bzr/branch/revision-history
388 (insert-file-contents revhistory-file
)
389 (number-to-string (count-lines (line-end-position) (point-max))))
391 (looking-at "Bazaar Branch Format 6 (bzr 0.15)")
392 (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 (when (re-search-forward "[0-9]+" nil t
)
396 (buffer-substring (match-beginning 0) (match-end 0))))))
397 ;; fallback to calling "bzr revno"
399 ((result (vc-bzr-command-discarding-stderr
400 vc-bzr-program
"revno" (file-relative-name file
)))
401 (exitcode (car result
))
402 (output (cdr result
)))
404 ((eq exitcode
0) (substring output
0 -
1))
407 (defun vc-bzr-create-repo ()
408 "Create a new Bzr repository."
409 (vc-bzr-command "init" nil
0 nil
))
411 (defun vc-bzr-init-revision (&optional file
)
412 "Always return nil, as Bzr cannot register explicit versions."
415 (defun vc-bzr-previous-revision (file rev
)
416 (if (string-match "\\`[0-9]+\\'" rev
)
417 (number-to-string (1- (string-to-number rev
)))
418 (concat "before:" rev
)))
420 (defun vc-bzr-next-revision (file rev
)
421 (if (string-match "\\`[0-9]+\\'" rev
)
422 (number-to-string (1+ (string-to-number rev
)))
423 (error "Don't know how to compute the next revision of %s" rev
)))
425 (defun vc-bzr-register (files &optional rev comment
)
426 "Register FILE under bzr.
427 Signal an error unless REV is nil.
429 (if rev
(error "Can't register explicit revision with bzr"))
430 (vc-bzr-command "add" nil
0 files
))
432 ;; Could run `bzr status' in the directory and see if it succeeds, but
433 ;; that's relatively expensive.
434 (defalias 'vc-bzr-responsible-p
'vc-bzr-root
435 "Return non-nil if FILE is (potentially) controlled by bzr.
436 The criterion is that there is a `.bzr' directory in the same
437 or a superior directory.")
439 (defun vc-bzr-could-register (file)
440 "Return non-nil if FILE could be registered under bzr."
441 (and (vc-bzr-responsible-p file
) ; shortcut
444 (vc-bzr-command "add" t
0 file
"--dry-run")
445 ;; The command succeeds with no output if file is
446 ;; registered (in bzr 0.8).
447 (goto-char (point-min))
448 (looking-at "added "))
451 (defun vc-bzr-unregister (file)
452 "Unregister FILE from bzr."
453 (vc-bzr-command "remove" nil
0 file
"--keep"))
455 (declare-function log-edit-extract-headers
"log-edit" (headers string
))
457 (defun vc-bzr-checkin (files rev comment
)
458 "Check FILE in to bzr with log message COMMENT.
459 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 ("Fixes" .
"--fixes"))
467 (defun vc-bzr-find-revision (file rev buffer
)
468 "Fetch revision REV of file FILE and put it into BUFFER."
469 (with-current-buffer buffer
470 (if (and rev
(stringp rev
) (not (string= rev
"")))
471 (vc-bzr-command "cat" t
0 file
"-r" rev
)
472 (vc-bzr-command "cat" t
0 file
))))
474 (defun vc-bzr-checkout (file &optional editable rev
)
475 (if rev
(error "Operation not supported")
476 ;; Else, there's nothing to do.
479 (defun vc-bzr-revert (file &optional contents-done
)
480 (unless contents-done
481 (with-temp-buffer (vc-bzr-command "revert" t
0 file
))))
483 (defvar log-view-message-re
)
484 (defvar log-view-file-re
)
485 (defvar log-view-font-lock-keywords
)
486 (defvar log-view-current-tag-function
)
487 (defvar log-view-per-file-logs
)
489 (define-derived-mode vc-bzr-log-view-mode log-view-mode
"Bzr-Log-View"
490 (remove-hook 'log-view-mode-hook
'vc-bzr-log-view-mode
) ;Deactivate the hack.
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: .+\\)"))
498 (set (make-local-variable 'log-view-font-lock-keywords
)
499 ;; log-view-font-lock-keywords is careful to use the buffer-local
500 ;; value of log-view-message-re only since Emacs-23.
501 (if (eq vc-log-view-type
'short
)
502 (append `((,log-view-message-re
503 (1 'log-view-message-face
)
506 (4 'change-log-list nil lax
))))
507 (append `((,log-view-message-re .
'log-view-message-face
))
508 ;; log-view-font-lock-keywords
509 '(("^ *\\(?:committer\\|author\\): \
510 \\([^<(]+?\\)[ ]*[(<]\\([[:alnum:]_.+-]+@[[:alnum:]_.-]+\\)[>)]"
512 (2 'change-log-email
))
513 ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face
)))))))
515 (defun vc-bzr-print-log (files buffer
&optional shortlog start-revision limit
)
516 "Get bzr change log for FILES into specified BUFFER."
517 ;; `vc-do-command' creates the buffer, but we need it before running
519 (vc-setup-buffer buffer
)
520 ;; If the buffer exists from a previous invocation it might be
522 ;; FIXME: `vc-bzr-command' runs `bzr log' with `LC_MESSAGES=C', so
523 ;; the log display may not what the user wants - but I see no other
524 ;; way of getting the above regexps working.
525 (with-current-buffer buffer
526 (apply 'vc-bzr-command
"log" buffer
'async files
528 (when shortlog
'("--line"))
529 (when start-revision
(list (format "-r..%s" start-revision
)))
530 (when limit
(list "-l" (format "%s" limit
)))
531 (if (stringp vc-bzr-log-switches
)
532 (list vc-bzr-log-switches
)
533 vc-bzr-log-switches
)))))
535 (defun vc-bzr-log-incoming (buffer remote-location
)
536 (apply 'vc-bzr-command
"missing" buffer
'async nil
537 (list "--theirs-only" (unless (string= remote-location
"") remote-location
))))
539 (defun vc-bzr-log-outgoing (buffer remote-location
)
540 (apply 'vc-bzr-command
"missing" buffer
'async nil
541 (list "--mine-only" (unless (string= remote-location
"") remote-location
))))
543 (defun vc-bzr-show-log-entry (revision)
544 "Find entry for patch name REVISION in bzr change log buffer."
545 (goto-char (point-min))
547 (let (case-fold-search
549 (if (re-search-forward
550 ;; "revno:" can appear either at the beginning of a line,
552 (concat "^[ ]*-+\n[ ]*revno: "
553 ;; The revision can contain ".", quote it so that it
554 ;; does not interfere with regexp matching.
555 (regexp-quote revision
) "$") nil t
)
557 (beginning-of-line 0)
559 (goto-char (point-min)))
562 (defun vc-bzr-diff (files &optional rev1 rev2 buffer
)
563 "VC bzr backend for diff."
564 ;; `bzr diff' exits with code 1 if diff is non-empty.
565 (apply #'vc-bzr-command
"diff" (or buffer
"*vc-diff*")
566 (if vc-disable-async-diff
1 'async
) files
567 "--diff-options" (mapconcat 'identity
568 (vc-switches 'bzr
'diff
)
570 ;; This `when' is just an optimization because bzr-1.2 is *much*
571 ;; faster when the revision argument is not given.
573 (list "-r" (format "%s..%s"
578 ;; FIXME: vc-{next,previous}-revision need fixing in vc.el to deal with
579 ;; straight integer revisions.
581 (defun vc-bzr-delete-file (file)
582 "Delete FILE and delete it in the bzr repository."
586 (vc-bzr-command "remove" nil
0 file
))
588 (defun vc-bzr-rename-file (old new
)
589 "Rename file from OLD to NEW using `bzr mv'."
590 (vc-bzr-command "mv" nil
0 new old
))
592 (defvar vc-bzr-annotation-table nil
594 (make-variable-buffer-local 'vc-bzr-annotation-table
)
596 (defun vc-bzr-annotate-command (file buffer
&optional revision
)
597 "Prepare BUFFER for `vc-annotate' on FILE.
598 Each line is tagged with the revision number, which has a `help-echo'
599 property containing author and date information."
600 (apply #'vc-bzr-command
"annotate" buffer
'async file
"--long" "--all"
601 (if revision
(list "-r" revision
)))
602 (lexical-let ((table (make-hash-table :test
'equal
)))
604 (get-buffer-process buffer
)
605 (lambda (proc string
)
606 (when (process-buffer proc
)
607 (with-current-buffer (process-buffer proc
)
608 (setq string
(concat (process-get proc
:vc-left-over
) string
))
609 (while (string-match "^\\( *[0-9.]+ *\\) \\([^\n ]+\\) +\\([0-9]\\{8\\}\\)\\( |.*\n\\)" string
)
610 (let* ((rev (match-string 1 string
))
611 (author (match-string 2 string
))
612 (date (match-string 3 string
))
613 (key (substring string
(match-beginning 0)
614 (match-beginning 4)))
615 (line (match-string 4 string
))
616 (tag (gethash key table
))
617 (inhibit-read-only t
))
618 (setq string
(substring string
(match-end 0)))
622 (format "%s %-7.7s" rev author
)
623 'help-echo
(format "Revision: %d, author: %s, date: %s"
624 (string-to-number rev
)
626 'mouse-face
'highlight
))
627 (puthash key tag table
))
628 (goto-char (process-mark proc
))
630 (move-marker (process-mark proc
) (point))))
631 (process-put proc
:vc-left-over string
)))))))
633 (declare-function vc-annotate-convert-time
"vc-annotate" (time))
635 (defun vc-bzr-annotate-time ()
636 (when (re-search-forward "^ *[0-9.]+ +[^\n ]* +|" nil t
)
637 (let ((prop (get-text-property (line-beginning-position) 'help-echo
)))
638 (string-match "[0-9]+\\'" prop
)
639 (let ((str (match-string-no-properties 0 prop
)))
640 (vc-annotate-convert-time
642 (string-to-number (substring str
6 8))
643 (string-to-number (substring str
4 6))
644 (string-to-number (substring str
0 4))))))))
646 (defun vc-bzr-annotate-extract-revision-at-line ()
647 "Return revision for current line of annoation buffer, or nil.
648 Return nil if current line isn't annotated."
651 (if (looking-at "^ *\\([0-9.]+\\) +[^\n ]* +|")
652 (match-string-no-properties 1))))
654 (defun vc-bzr-command-discarding-stderr (command &rest args
)
655 "Execute shell command COMMAND (with ARGS); return its output and exitcode.
656 Return value is a cons (EXITCODE . OUTPUT), where EXITCODE is
657 the (numerical) exit code of the process, and OUTPUT is a string
658 containing whatever the process sent to its standard output
659 stream. Standard error output is discarded."
662 (apply #'process-file command nil
(list (current-buffer) nil
) nil args
)
663 (buffer-substring (point-min) (point-max)))))
665 (defstruct (vc-bzr-extra-fileinfo
667 (:constructor vc-bzr-create-extra-fileinfo
(extra-name))
668 (:conc-name vc-bzr-extra-fileinfo-
>))
669 extra-name
) ;; original name for rename targets, new name for
671 (defun vc-bzr-dir-printer (info)
672 "Pretty-printer for the vc-dir-fileinfo structure."
673 (let ((extra (vc-dir-fileinfo->extra info
)))
674 (vc-default-dir-printer 'Bzr info
)
677 (format " (renamed from %s)"
678 (vc-bzr-extra-fileinfo->extra-name extra
))
679 '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 (translation '(("+N " . added
)
686 (" M " . edited
) ;; file text modified
687 (" *" . edited
) ;; execute bit changed
688 (" M*" . edited
) ;; text modified + execute bit changed
689 ;; FIXME: what about ignored files?
691 ;; For conflicts, should we list the .THIS/.BASE/.OTHER?
693 ("? " . unregistered
)
694 ;; No such state, but we need to distinguish this case.
697 ;; For a non existent file FOO, the output is:
698 ;; bzr: ERROR: Path(s) do not exist: FOO
700 ;; If the tree is not up to date, bzr will print this warning:
701 ;; working tree is out of date, run 'bzr update'
703 ;; FIXME: maybe this warning can be put in the vc-dir header...
705 ;; Ignore "P " and "P." for pending patches.
711 (goto-char (point-min))
714 (buffer-substring-no-properties (point) (+ (point) 3)))
715 (setq translated
(cdr (assoc status-str translation
)))
717 ((eq translated
'conflict
)
718 ;; For conflicts the file appears twice in the listing: once
719 ;; with the M flag and once with the C flag, so take care
720 ;; not to add it twice to `result'. Ugly.
722 (buffer-substring-no-properties
723 ;;For files with conflicts the format is:
724 ;;C Text conflict in FILENAME
726 (+ (point) 21) (line-end-position)))
727 (entry (assoc file result
)))
729 (setf (nth 1 entry
) 'conflict
))))
730 ((eq translated
'renamed
)
731 (re-search-forward "R[ M] \\(.*\\) => \\(.*\\)$" (line-end-position) t
)
732 (let ((new-name (file-relative-name (match-string 2) relative-dir
))
733 (old-name (file-relative-name (match-string 1) relative-dir
)))
734 (push (list new-name
'edited
735 (vc-bzr-create-extra-fileinfo old-name
)) result
)))
736 ;; do nothing for non existent files
737 ((eq translated
'not-found
))
739 (push (list (file-relative-name
740 (buffer-substring-no-properties
742 (line-end-position)) relative-dir
)
743 translated
) result
)))
745 (funcall update-function result
)))
747 (defun vc-bzr-dir-status (dir update-function
)
748 "Return a list of conses (file . state) for DIR."
749 (vc-bzr-command "status" (current-buffer) 'async dir
"-v" "-S")
751 `(vc-bzr-after-dir-status (quote ,update-function
)
752 ;; "bzr status" results are relative to
753 ;; the bzr root directory, NOT to the
754 ;; directory "bzr status" was invoked in.
756 ;; We pass the relative directory here so
757 ;; that `vc-bzr-after-dir-status' can
758 ;; frob the results accordingly.
759 (file-relative-name ,dir
(vc-bzr-root ,dir
)))))
761 (defun vc-bzr-dir-status-files (dir files default-state update-function
)
762 "Return a list of conses (file . state) for DIR."
763 (apply 'vc-bzr-command
"status" (current-buffer) 'async dir
"-v" "-S" files
)
765 `(vc-bzr-after-dir-status (quote ,update-function
)
766 (file-relative-name ,dir
(vc-bzr-root ,dir
)))))
768 (defvar vc-bzr-shelve-map
769 (let ((map (make-sparse-keymap)))
770 ;; Turn off vc-dir marking
771 (define-key map
[mouse-2
] 'ignore
)
773 (define-key map
[down-mouse-3
] 'vc-bzr-shelve-menu
)
774 (define-key map
"\C-k" 'vc-bzr-shelve-delete-at-point
)
775 (define-key map
"=" 'vc-bzr-shelve-show-at-point
)
776 (define-key map
"\C-m" 'vc-bzr-shelve-show-at-point
)
777 (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
)
782 (defvar vc-bzr-shelve-menu-map
783 (let ((map (make-sparse-keymap "Bzr Shelve")))
785 '(menu-item "Delete shelf" vc-bzr-shelve-delete-at-point
786 :help "Delete the current shelf"))
788 '(menu-item "Apply and keep shelf" vc-bzr-shelve-apply-and-keep-at-point
789 :help "Apply the current shelf and keep it"))
791 '(menu-item "Apply and remove shelf (pop)" vc-bzr-shelve-apply-at-point
792 :help "Apply the current shelf and remove it"))
794 '(menu-item "Show shelve" vc-bzr-shelve-show-at-point
795 :help "Show the contents of the current shelve"))
798 (defvar vc-bzr-extra-menu-map
799 (let ((map (make-sparse-keymap)))
800 (define-key map [bzr-sn]
801 '(menu-item "Shelve a snapshot" vc-bzr-shelve-snapshot
802 :help "Shelve the current state of the tree and keep the current state"))
803 (define-key map [bzr-sh]
804 '(menu-item "Shelve..." vc-bzr-shelve
805 :help "Shelve changes"))
808 (defun vc-bzr-extra-menu () vc-bzr-extra-menu-map)
810 (defun vc-bzr-extra-status-menu () vc-bzr-extra-menu-map)
812 (defun vc-bzr-dir-extra-headers (dir)
814 ((str (with-temp-buffer
815 (vc-bzr-command "info" t 0 dir)
817 (shelve (vc-bzr-shelve-list))
818 (shelve-help-echo "Use M-x vc-bzr-shelve to create shelves")
819 (root-dir (vc-bzr-root dir))
821 ;; FIXME: looking for .bzr/checkout/merge-hashes is not a
822 ;; reliable method to detect pending merges, disable this
823 ;; until a proper solution is implemented.
826 (expand-file-name ".bzr/checkout/merge-hashes" root-dir))))
827 (pending-merge-help-echo
828 (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))
830 (when (string-match ".+light checkout root: \\(.+\\)$" str)
831 (match-string 1 str)))
832 (light-checkout-branch
834 (when (string-match ".+checkout of branch: \\(.+\\)$" str)
835 (match-string 1 str)))))
837 (propertize "Parent branch : " 'face 'font-lock-type-face)
839 (if (string-match "parent branch: \\(.+\\)$" str)
842 'face 'font-lock-variable-name-face)
846 (propertize "Light checkout root: " 'face 'font-lock-type-face)
847 (propertize light-checkout 'face 'font-lock-variable-name-face)
849 (when light-checkout-branch
851 (propertize "Checkout of branch : " 'face 'font-lock-type-face)
852 (propertize light-checkout-branch 'face 'font-lock-variable-name-face)
856 (propertize "Warning : " 'face 'font-lock-warning-face
857 'help-echo pending-merge-help-echo)
858 (propertize "Pending merges, commit recommended before any other action"
859 'help-echo pending-merge-help-echo
860 'face 'font-lock-warning-face)
864 (propertize "Shelves :\n" 'face 'font-lock-type-face
865 'help-echo shelve-help-echo)
869 'face 'font-lock-variable-name-face
870 'mouse-face 'highlight
871 '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"
872 'keymap vc-bzr-shelve-map))
875 (propertize "Shelves : " 'face 'font-lock-type-face
876 'help-echo shelve-help-echo)
877 (propertize "No shelved changes"
878 'help-echo shelve-help-echo
879 'face 'font-lock-variable-name-face))))))
881 (defun vc-bzr-shelve (name)
883 (interactive "sShelf name: ")
884 (let ((root (vc-bzr-root default-directory)))
886 (vc-bzr-command "shelve" nil 0 nil "--all" "-m" name)
887 (vc-resynch-buffer root t t))))
889 (defun vc-bzr-shelve-show (name)
890 "Show the contents of shelve NAME."
891 (interactive "sShelve name: ")
892 (vc-setup-buffer "*vc-diff*")
893 ;; FIXME: how can you show the contents of a shelf?
894 (vc-bzr-command "unshelve" "*vc-diff*" 'async nil "--preview" name)
895 (set-buffer "*vc-diff*")
897 (setq buffer-read-only t)
898 (pop-to-buffer (current-buffer)))
900 (defun vc-bzr-shelve-apply (name)
901 "Apply shelve NAME and remove it afterwards."
902 (interactive "sApply (and remove) shelf: ")
903 (vc-bzr-command "unshelve" nil 0 nil "--apply" name)
904 (vc-resynch-buffer (vc-bzr-root default-directory) t t))
906 (defun vc-bzr-shelve-apply-and-keep (name)
907 "Apply shelve NAME and keep it afterwards."
908 (interactive "sApply (and keep) shelf: ")
909 (vc-bzr-command "unshelve" nil 0 nil "--apply" "--keep" name)
910 (vc-resynch-buffer (vc-bzr-root default-directory) t t))
912 (defun vc-bzr-shelve-snapshot ()
913 "Create a stash with the current tree state."
915 (vc-bzr-command "shelve" nil 0 nil "--all" "-m"
916 (let ((ct (current-time)))
918 (format-time-string "Snapshot on %Y-%m-%d" ct)
919 (format-time-string " at %H:%M" ct))))
920 (vc-bzr-command "unshelve" nil 0 nil "--apply" "--keep")
921 (vc-resynch-buffer (vc-bzr-root default-directory) t t))
923 (defun vc-bzr-shelve-list ()
925 (vc-bzr-command "shelve" (current-buffer) 1 nil "--list" "-q")
929 (buffer-substring (point-min) (point-max))
932 (defun vc-bzr-shelve-get-at-point (point)
936 (if (looking-at "^ +\\([0-9]+\\):")
938 (error "Cannot find shelf at point"))))
940 (defun vc-bzr-shelve-delete-at-point ()
942 (let ((shelve (vc-bzr-shelve-get-at-point (point))))
943 (when (y-or-n-p (format "Remove shelf %s ?" shelve))
944 (vc-bzr-command "unshelve" nil 0 nil "--delete-only" shelve)
947 (defun vc-bzr-shelve-show-at-point ()
949 (vc-bzr-shelve-show (vc-bzr-shelve-get-at-point (point))))
951 (defun vc-bzr-shelve-apply-at-point ()
953 (vc-bzr-shelve-apply (vc-bzr-shelve-get-at-point (point))))
955 (defun vc-bzr-shelve-apply-and-keep-at-point ()
957 (vc-bzr-shelve-apply-and-keep (vc-bzr-shelve-get-at-point (point))))
959 (defun vc-bzr-shelve-menu (e)
961 (vc-dir-at-event e (popup-menu vc-bzr-shelve-menu-map e)))
963 (defun vc-bzr-revision-table (files)
964 (let ((vc-bzr-revisions '())
965 (default-directory (file-name-directory (car files))))
967 (vc-bzr-command "log" t 0 files "--line")
968 (let ((start (point-min))
969 (loglines (buffer-substring-no-properties (point-min) (point-max))))
970 (while (string-match "^\\([0-9]+\\):" loglines)
971 (push (match-string 1 loglines) vc-bzr-revisions)
972 (setq start (+ start (match-end 0)))
973 (setq loglines (buffer-substring-no-properties start (point-max))))))
976 (defun vc-bzr-conflicted-files (dir)
977 (let ((default-directory (vc-bzr-root dir))
980 (vc-bzr-command "status" t 0 default-directory)
981 (goto-char (point-min))
982 (when (re-search-forward "^conflicts:\n" nil t)
983 (while (looking-at " \\(?:Text conflict in \\(.*\\)\\|.*\\)\n")
985 (push (expand-file-name (match-string 1)) files))
986 (goto-char (match-end 0)))))
989 ;;; Revision completion
992 (defconst vc-bzr-revision-keywords
993 '("revno" "revid" "last" "before"
994 "tag" "date" "ancestor" "branch" "submit")))
996 (defun vc-bzr-revision-completion-table (files)
997 (lexical-let ((files files))
998 ;; What about using `files'?!? --Stef
999 (lambda (string pred action)
1001 ((string-match "\\`\\(ancestor\\|branch\\|\\(revno:\\)?[-0-9]+:\\):"
1003 (completion-table-with-context (substring string 0 (match-end 0))
1005 'completion-table-with-predicate
1006 'completion-file-name-table
1007 'file-directory-p t)
1008 (substring string (match-end 0))
1011 ((string-match "\\`\\(before\\):" string)
1012 (completion-table-with-context (substring string 0 (match-end 0))
1013 (vc-bzr-revision-completion-table files)
1014 (substring string (match-end 0))
1017 ((string-match "\\`\\(tag\\):" string)
1018 (let ((prefix (substring string 0 (match-end 0)))
1019 (tag (substring string (match-end 0)))
1021 process-file-side-effects)
1023 ;; "bzr-1.2 tags" is much faster with --show-ids.
1024 (process-file vc-bzr-program nil '(t) nil "tags" "--show-ids")
1025 ;; The output is ambiguous, unless we assume that revids do not
1027 (goto-char (point-min))
1028 (while (re-search-forward "^\\(.*[^ \n]\\) +[^ \n]*$" nil t)
1029 (push (match-string-no-properties 1) table)))
1030 (completion-table-with-context prefix table tag pred action)))
1032 ((string-match "\\`\\([a-z]+\\):" string)
1033 ;; no actual completion for the remaining keywords.
1034 (completion-table-with-context (substring string 0 (match-end 0))
1035 (if (member (match-string 1 string)
1036 vc-bzr-revision-keywords)
1037 ;; If it's a valid keyword,
1038 ;; use a non-empty table to
1041 (substring string (match-end 0))
1045 ;; Could use completion-table-with-terminator, except that it
1046 ;; currently doesn't work right w.r.t pcm and doesn't give
1047 ;; the *Completions* output we want.
1048 (complete-with-action action (eval-when-compile
1049 (mapcar (lambda (s) (concat s ":"))
1050 vc-bzr-revision-keywords))
1053 (eval-after-load "vc"
1054 '(add-to-list 'vc-directory-exclusion-list vc-bzr-admin-dirname t))
1057 ;; arch-tag: 8101bad8-4e92-4e7d-85ae-d8e08b4e7c06
1058 ;;; vc-bzr.el ends here