annotate lisp/vc-bzr.el @ 80343:3c75e19e7ec9

(vc-bzr-print-log): Insert a file marker. Run the log command for each file in the list. (vc-bzr-log-view-mode): Recognize the file marker. (vc-bzr-show-log-entry): Make regexp match more cases.
author Dan Nicolaescu <dann@ics.uci.edu>
date Wed, 19 Mar 2008 03:49:09 +0000
parents 756c7bbc9664
children a88ae58b9053
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1 ;;; vc-bzr.el --- VC backend for the bzr revision control system
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
3 ;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
4
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
5 ;; Author: Dave Love <fx@gnu.org>, Riccardo Murri <riccardo.murri@gmail.com>
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
6 ;; Keywords: tools
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
7 ;; Created: Sept 2006
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
8 ;; Version: 2008-01-04 (Bzr revno 25)
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
9 ;; URL: http://launchpad.net/vc-bzr
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
10
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
11 ;; This file is free software; you can redistribute it and/or modify
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
13 ;; the Free Software Foundation; either version 3, or (at your option)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
14 ;; any later version.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
15
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
16 ;; This file is distributed in the hope that it will be useful,
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
79695
f62e87c6eb20 2008-01-05 Sven Joachim <svenjoac@gmx.de>
Romain Francoise <romain@orebokech.com>
parents: 79688
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
19 ;; GNU General Public License for more details.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
20
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
24 ;; Boston, MA 02110-1301, USA.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
25
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
26
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
27 ;;; Commentary:
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
28
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
29 ;; See <URL:http://bazaar-vcs.org/> concerning bzr. See
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
30 ;; <URL:http://launchpad.net/vc-bzr> for alternate development
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
31 ;; branches of `vc-bzr'.
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
32
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
33 ;; Load this library to register bzr support in VC.
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
34
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
35 ;; Known bugs
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
36 ;; ==========
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
37
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
38 ;; When edititing a symlink and *both* the symlink and its target
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
39 ;; are bzr-versioned, `vc-bzr` presently runs `bzr status` on the
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
40 ;; symlink, thereby not detecting whether the actual contents
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
41 ;; (that is, the target contents) are changed.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
42 ;; See https://bugs.launchpad.net/vc-bzr/+bug/116607
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
43
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
44 ;; For an up-to-date list of bugs, please see:
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
45 ;; https://bugs.launchpad.net/vc-bzr/+bugs
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
46
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
47
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
48 ;;; Code:
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
49
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
50 (eval-when-compile
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
51 (require 'cl)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
52 (require 'vc)) ; for vc-exec-after
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
53
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
54 ;; Clear up the cache to force vc-call to check again and discover
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
55 ;; new functions when we reload this file.
78404
27f00e50116a Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents: 78387
diff changeset
56 (put 'Bzr 'vc-functions nil)
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
57
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
58 (defgroup vc-bzr nil
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
59 "VC bzr backend."
78564
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
60 :version "22.2"
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
61 :group 'vc)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
62
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
63 (defcustom vc-bzr-program "bzr"
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
64 "Name of the bzr command (excluding any arguments)."
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
65 :group 'vc-bzr
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
66 :type 'string)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
67
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
68 (defcustom vc-bzr-diff-switches nil
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
69 "String/list of strings specifying extra switches for bzr diff under VC."
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
70 :type '(choice (const :tag "None" nil)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
71 (string :tag "Argument String")
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
72 (repeat :tag "Argument List" :value ("") string))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
73 :group 'vc-bzr)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
74
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
75 (defcustom vc-bzr-log-switches nil
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
76 "String/list of strings specifying extra switches for `bzr log' under VC."
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
77 :type '(choice (const :tag "None" nil)
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
78 (string :tag "Argument String")
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
79 (repeat :tag "Argument List" :value ("") string))
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
80 :group 'vc-bzr)
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
81
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
82 ;; since v0.9, bzr supports removing the progress indicators
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
83 ;; by setting environment variable BZR_PROGRESS_BAR to "none".
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
84 (defun vc-bzr-command (bzr-command buffer okstatus file-or-list &rest args)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
85 "Wrapper round `vc-do-command' using `vc-bzr-program' as COMMAND.
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
86 Invoke the bzr command adding `BZR_PROGRESS_BAR=none' and
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
87 `LC_MESSAGES=C' to the environment."
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
88 (let ((process-environment
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
89 (list* "BZR_PROGRESS_BAR=none" ; Suppress progress output (bzr >=0.9)
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
90 "LC_MESSAGES=C" ; Force English output
78435
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
91 process-environment)))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
92 (apply 'vc-do-command buffer okstatus vc-bzr-program
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
93 file-or-list bzr-command args)))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
94
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
95 ;;;###autoload
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
96 (defconst vc-bzr-admin-dirname ".bzr"
78431
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
97 "Name of the directory containing Bzr repository status files.")
78435
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
98 ;;;###autoload
78431
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
99 (defconst vc-bzr-admin-checkout-format-file
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
100 (concat vc-bzr-admin-dirname "/checkout/format"))
78435
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
101 (defconst vc-bzr-admin-dirstate
78431
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
102 (concat vc-bzr-admin-dirname "/checkout/dirstate"))
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
103 (defconst vc-bzr-admin-branch-format-file
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
104 (concat vc-bzr-admin-dirname "/branch/format"))
78435
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
105 (defconst vc-bzr-admin-revhistory
78431
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
106 (concat vc-bzr-admin-dirname "/branch/revision-history"))
78748
0b7bd1d9ffbf (vc-bzr-admin-lastrev): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78564
diff changeset
107 (defconst vc-bzr-admin-lastrev
0b7bd1d9ffbf (vc-bzr-admin-lastrev): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78564
diff changeset
108 (concat vc-bzr-admin-dirname "/branch/last-revision"))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
109
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
110 ;;;###autoload (defun vc-bzr-registered (file)
78431
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
111 ;;;###autoload (if (vc-find-root file vc-bzr-admin-checkout-format-file)
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
112 ;;;###autoload (progn
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
113 ;;;###autoload (load "vc-bzr")
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
114 ;;;###autoload (vc-bzr-registered file))))
78431
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
115
78435
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
116 (defun vc-bzr-root (file)
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
117 "Return the root directory of the bzr repository containing FILE."
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
118 ;; Cache technique copied from vc-arch.el.
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
119 (or (vc-file-getprop file 'bzr-root)
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
120 (vc-file-setprop
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
121 file 'bzr-root
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
122 (vc-find-root file vc-bzr-admin-checkout-format-file))))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
123
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
124 (defun vc-bzr-registered (file)
78435
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
125 "Return non-nil if FILE is registered with bzr.
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
126
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
127 For speed, this function tries first to parse Bzr internal file
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
128 `checkout/dirstate', but it may fail if Bzr internal file format
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
129 has changed. As a safeguard, the `checkout/dirstate' file is
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
130 only parsed if it contains the string `#bazaar dirstate flat
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
131 format 3' in the first line.
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
132
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
133 If the `checkout/dirstate' file cannot be parsed, fall back to
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
134 running `vc-bzr-state'."
78564
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
135 (lexical-let ((root (vc-bzr-root file)))
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
136 (when root ; Short cut.
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
137 ;; This looks at internal files. May break if they change
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
138 ;; their format.
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
139 (lexical-let ((dirstate (expand-file-name vc-bzr-admin-dirstate root)))
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
140 (if (not (file-readable-p dirstate))
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
141 (vc-bzr-state file) ; Expensive.
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
142 (with-temp-buffer
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
143 (insert-file-contents dirstate)
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
144 (goto-char (point-min))
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
145 (if (not (looking-at "#bazaar dirstate flat format 3"))
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
146 (vc-bzr-state file) ; Some other unknown format?
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
147 (let* ((relfile (file-relative-name file root))
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
148 (reldir (file-name-directory relfile)))
80333
5818a522c583 (vc-bzr-registered): Fail if `bzr' is not installed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79695
diff changeset
149 (when (re-search-forward
5818a522c583 (vc-bzr-registered): Fail if `bzr' is not installed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79695
diff changeset
150 (concat "^\0"
5818a522c583 (vc-bzr-registered): Fail if `bzr' is not installed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79695
diff changeset
151 (if reldir (regexp-quote
5818a522c583 (vc-bzr-registered): Fail if `bzr' is not installed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79695
diff changeset
152 (directory-file-name reldir)))
5818a522c583 (vc-bzr-registered): Fail if `bzr' is not installed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79695
diff changeset
153 "\0"
5818a522c583 (vc-bzr-registered): Fail if `bzr' is not installed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79695
diff changeset
154 (regexp-quote (file-name-nondirectory relfile))
5818a522c583 (vc-bzr-registered): Fail if `bzr' is not installed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79695
diff changeset
155 "\0")
5818a522c583 (vc-bzr-registered): Fail if `bzr' is not installed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79695
diff changeset
156 nil t)
5818a522c583 (vc-bzr-registered): Fail if `bzr' is not installed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79695
diff changeset
157 ;; Make sure `bzr' agrees that this file is under Bzr's
5818a522c583 (vc-bzr-registered): Fail if `bzr' is not installed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79695
diff changeset
158 ;; control. This is important because if `bzr' is not
5818a522c583 (vc-bzr-registered): Fail if `bzr' is not installed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79695
diff changeset
159 ;; installed vc-find-file may otherwise get an error in
5818a522c583 (vc-bzr-registered): Fail if `bzr' is not installed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79695
diff changeset
160 ;; the subsequent call to `vc-state'.
5818a522c583 (vc-bzr-registered): Fail if `bzr' is not installed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79695
diff changeset
161 (vc-bzr-state file))))))))))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
162
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
163 (defconst vc-bzr-state-words
78521
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
164 "added\\|ignored\\|kind changed\\|modified\\|removed\\|renamed\\|unknown"
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
165 "Regexp matching file status words as reported in `bzr' output.")
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
166
78431
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
167 (defun vc-bzr-file-name-relative (filename)
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
168 "Return file name FILENAME stripped of the initial Bzr repository path."
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
169 (lexical-let*
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
170 ((filename* (expand-file-name filename))
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
171 (rootdir (vc-bzr-root filename*)))
78748
0b7bd1d9ffbf (vc-bzr-admin-lastrev): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78564
diff changeset
172 (when rootdir
78431
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
173 (file-relative-name filename* rootdir))))
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
174
78521
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
175 (defun vc-bzr-status (file)
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
176 "Return FILE status according to Bzr.
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
177 Return value is a cons (STATUS . WARNING), where WARNING is a
78564
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
178 string or nil, and STATUS is one of the symbols: `added',
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
179 `ignored', `kindchanged', `modified', `removed', `renamed', `unknown',
78521
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
180 which directly correspond to `bzr status' output, or 'unchanged
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
181 for files whose copy in the working tree is identical to the one
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
182 in the branch repository, or nil for files that are not
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
183 registered with Bzr.
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
184
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
185 If any error occurred in running `bzr status', then return nil."
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
186 (with-temp-buffer
78564
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
187 (let ((ret (condition-case nil
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
188 (vc-bzr-command "status" t 0 file)
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
189 (file-error nil))) ; vc-bzr-program not found.
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
190 (status 'unchanged))
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
191 ;; the only secure status indication in `bzr status' output
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
192 ;; is a couple of lines following the pattern::
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
193 ;; | <status>:
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
194 ;; | <file name>
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
195 ;; if the file is up-to-date, we get no status report from `bzr',
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
196 ;; so if the regexp search for the above pattern fails, we consider
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
197 ;; the file to be up-to-date.
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
198 (goto-char (point-min))
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
199 (when (re-search-forward
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
200 ;; bzr prints paths relative to the repository root.
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
201 (concat "^\\(" vc-bzr-state-words "\\):[ \t\n]+"
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
202 (regexp-quote (vc-bzr-file-name-relative file))
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
203 ;; Bzr appends a '/' to directory names and
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
204 ;; '*' to executable files
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
205 (if (file-directory-p file) "/?" "\\*?")
78564
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
206 "[ \t\n]*$")
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
207 nil t)
78748
0b7bd1d9ffbf (vc-bzr-admin-lastrev): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78564
diff changeset
208 (lexical-let ((statusword (match-string 1)))
78564
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
209 ;; Erase the status text that matched.
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
210 (delete-region (match-beginning 0) (match-end 0))
78521
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
211 (setq status
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
212 (intern (replace-regexp-in-string " " "" statusword)))))
78564
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
213 (when status
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
214 (goto-char (point-min))
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
215 (skip-chars-forward " \n\t") ;Throw away spaces.
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
216 (cons status
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
217 ;; "bzr" will output warnings and informational messages to
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
218 ;; stderr; due to Emacs' `vc-do-command' (and, it seems,
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
219 ;; `start-process' itself) limitations, we cannot catch stderr
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
220 ;; and stdout into different buffers. So, if there's anything
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
221 ;; left in the buffer after removing the above status
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
222 ;; keywords, let us just presume that any other message from
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
223 ;; "bzr" is a user warning, and display it.
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
224 (unless (eobp) (buffer-substring (point) (point-max))))))))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
225
78521
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
226 (defun vc-bzr-state (file)
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
227 (lexical-let ((result (vc-bzr-status file)))
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
228 (when (consp result)
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
229 (if (cdr result)
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
230 (message "Warnings in `bzr' output: %s" (cdr result)))
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
231 (cdr (assq (car result)
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
232 '((added . edited)
78564
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
233 (kindchanged . edited)
78521
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
234 (renamed . edited)
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
235 (modified . edited)
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
236 (removed . edited)
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
237 (ignored . nil)
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
238 (unknown . nil)
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
239 (unchanged . up-to-date)))))))
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
240
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
241 (defun vc-bzr-workfile-unchanged-p (file)
78521
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
242 (eq 'unchanged (car (vc-bzr-status file))))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
243
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
244 (defun vc-bzr-workfile-version (file)
78435
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
245 (lexical-let*
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
246 ((rootdir (vc-bzr-root file))
78748
0b7bd1d9ffbf (vc-bzr-admin-lastrev): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78564
diff changeset
247 (branch-format-file (expand-file-name vc-bzr-admin-branch-format-file
0b7bd1d9ffbf (vc-bzr-admin-lastrev): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78564
diff changeset
248 rootdir))
0b7bd1d9ffbf (vc-bzr-admin-lastrev): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78564
diff changeset
249 (revhistory-file (expand-file-name vc-bzr-admin-revhistory rootdir))
0b7bd1d9ffbf (vc-bzr-admin-lastrev): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78564
diff changeset
250 (lastrev-file (expand-file-name vc-bzr-admin-lastrev rootdir)))
0b7bd1d9ffbf (vc-bzr-admin-lastrev): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78564
diff changeset
251 ;; This looks at internal files to avoid forking a bzr process.
0b7bd1d9ffbf (vc-bzr-admin-lastrev): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78564
diff changeset
252 ;; May break if they change their format.
78435
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
253 (if (file-exists-p branch-format-file)
78564
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
254 (with-temp-buffer
78435
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
255 (insert-file-contents branch-format-file)
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
256 (goto-char (point-min))
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
257 (cond
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
258 ((or
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
259 (looking-at "Bazaar-NG branch, format 0.0.4")
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
260 (looking-at "Bazaar-NG branch format 5"))
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
261 ;; count lines in .bzr/branch/revision-history
78564
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
262 (insert-file-contents revhistory-file)
78435
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
263 (number-to-string (count-lines (line-end-position) (point-max))))
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
264 ((looking-at "Bazaar Branch Format 6 (bzr 0.15)")
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
265 ;; revno is the first number in .bzr/branch/last-revision
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
266 (insert-file-contents lastrev-file)
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
267 (if (re-search-forward "[0-9]+" nil t)
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
268 (buffer-substring (match-beginning 0) (match-end 0))))))
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
269 ;; fallback to calling "bzr revno"
78431
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
270 (lexical-let*
78435
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
271 ((result (vc-bzr-command-discarding-stderr
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
272 vc-bzr-program "revno" file))
78431
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
273 (exitcode (car result))
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
274 (output (cdr result)))
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
275 (cond
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
276 ((eq exitcode 0) (substring output 0 -1))
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
277 (t nil))))))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
278
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
279 (defun vc-bzr-checkout-model (file)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
280 'implicit)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
281
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
282 (defun vc-bzr-create-repo ()
78404
27f00e50116a Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents: 78387
diff changeset
283 "Create a new Bzr repository."
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
284 (vc-bzr-command "init" nil 0 nil))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
285
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
286 (defun vc-bzr-init-version (&optional file)
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
287 "Always return nil, as Bzr cannot register explicit versions."
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
288 nil)
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
289
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
290 (defun vc-bzr-register (files &optional rev comment)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
291 "Register FILE under bzr.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
292 Signal an error unless REV is nil.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
293 COMMENT is ignored."
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
294 (if rev (error "Can't register explicit version with bzr"))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
295 (vc-bzr-command "add" nil 0 files))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
296
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
297 ;; Could run `bzr status' in the directory and see if it succeeds, but
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
298 ;; that's relatively expensive.
78431
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
299 (defalias 'vc-bzr-responsible-p 'vc-bzr-root
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
300 "Return non-nil if FILE is (potentially) controlled by bzr.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
301 The criterion is that there is a `.bzr' directory in the same
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
302 or a superior directory.")
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
303
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
304 (defun vc-bzr-could-register (file)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
305 "Return non-nil if FILE could be registered under bzr."
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
306 (and (vc-bzr-responsible-p file) ; shortcut
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
307 (condition-case ()
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
308 (with-temp-buffer
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
309 (vc-bzr-command "add" t 0 file "--dry-run")
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
310 ;; The command succeeds with no output if file is
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
311 ;; registered (in bzr 0.8).
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
312 (goto-char (point-min))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
313 (looking-at "added "))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
314 (error))))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
315
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
316 (defun vc-bzr-unregister (file)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
317 "Unregister FILE from bzr."
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
318 (vc-bzr-command "remove" nil 0 file "--keep"))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
319
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
320 (defun vc-bzr-checkin (files rev comment)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
321 "Check FILE in to bzr with log message COMMENT.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
322 REV non-nil gets an error."
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
323 (if rev (error "Can't check in a specific version with bzr"))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
324 (vc-bzr-command "commit" nil 0 files "-m" comment))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
325
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
326 (defun vc-bzr-find-version (file rev buffer)
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
327 "Fetch version REV of file FILE and put it into BUFFER."
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
328 (with-current-buffer buffer
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
329 (if (and rev (stringp rev) (not (string= rev "")))
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
330 (vc-bzr-command "cat" t 0 file "-r" rev)
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
331 (vc-bzr-command "cat" t 0 file))))
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
332
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
333 (defun vc-bzr-checkout (file &optional editable rev destfile)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
334 "Checkout revision REV of FILE from bzr to DESTFILE.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
335 EDITABLE is ignored."
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
336 (unless destfile
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
337 (setq destfile (vc-version-backup-file-name file rev)))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
338 (let ((coding-system-for-read 'binary)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
339 (coding-system-for-write 'binary))
78564
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
340 (with-temp-file destfile
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
341 (if (and rev (stringp rev) (not (string= rev "")))
78564
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
342 (vc-bzr-command "cat" t 0 file "-r" rev)
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
343 (vc-bzr-command "cat" t 0 file)))))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
344
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
345 (defun vc-bzr-revert (file &optional contents-done)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
346 (unless contents-done
78521
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
347 (with-temp-buffer (vc-bzr-command "revert" t 0 file))))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
348
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
349 (defvar log-view-message-re)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
350 (defvar log-view-file-re)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
351 (defvar log-view-font-lock-keywords)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
352 (defvar log-view-current-tag-function)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
353
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
354 (define-derived-mode vc-bzr-log-view-mode log-view-mode "Bzr-Log-View"
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
355 (remove-hook 'log-view-mode-hook 'vc-bzr-log-view-mode) ;Deactivate the hack.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
356 (require 'add-log)
80343
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
357 (set (make-local-variable 'log-view-file-re) "^Working file:[ \t]+\\(.+\\)")
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
358 (set (make-local-variable 'log-view-message-re)
80340
756c7bbc9664 (vc-bzr-log-view-mode, vc-bzr-annotate-command)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 80333
diff changeset
359 "^ *-+\n *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)")
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
360 (set (make-local-variable 'log-view-font-lock-keywords)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
361 ;; log-view-font-lock-keywords is careful to use the buffer-local
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
362 ;; value of log-view-message-re only since Emacs-23.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
363 (append `((,log-view-message-re . 'log-view-message-face))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
364 ;; log-view-font-lock-keywords
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
365 '(("^ *committer: \
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
366 \\([^<(]+?\\)[ ]*[(<]\\([[:alnum:]_.+-]+@[[:alnum:]_.-]+\\)[>)]"
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
367 (1 'change-log-name)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
368 (2 'change-log-email))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
369 ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face))))))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
370
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
371 (defun vc-bzr-print-log (files &optional buffer) ; get buffer arg in Emacs 22
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
372 "Get bzr change log for FILES into specified BUFFER."
80343
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
373 ;; `vc-do-command' creates the buffer, but we need it before running
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
374 ;; the command.
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
375 (vc-setup-buffer buffer)
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
376 ;; If the buffer exists from a previous invocation it might be
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
377 ;; read-only.
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
378 (let ((inhibit-read-only t))
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
379 ;; FIXME: `vc-bzr-command' runs `bzr log' with `LC_MESSAGES=C', so
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
380 ;; the log display may not what the user wants - but I see no other
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
381 ;; way of getting the above regexps working.
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
382 ;; "bzr log" (as of bzr-1.1) can only take a single file argument.
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
383 ;; Loop through the file list.
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
384 (dolist (file files)
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
385 (with-current-buffer buffer
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
386 ;; Insert the file name so that log-view.el can find it.
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
387 (insert "Working file: " file "\n")) ;; Like RCS/CVS.
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
388 (apply 'vc-bzr-command "log" buffer 0 file
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
389 (if (stringp vc-bzr-log-switches)
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
390 (list vc-bzr-log-switches)
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
391 vc-bzr-log-switches))))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
392 ;; FIXME: Until Emacs-23, VC was missing a hook to sort out the mode for
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
393 ;; the buffer, or at least set the regexps right.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
394 (unless (fboundp 'vc-default-log-view-mode)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
395 (add-hook 'log-view-mode-hook 'vc-bzr-log-view-mode)))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
396
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
397 (defun vc-bzr-show-log-entry (version)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
398 "Find entry for patch name VERSION in bzr change log buffer."
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
399 (goto-char (point-min))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
400 (let (case-fold-search)
80343
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
401 (if (re-search-forward
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
402 ;; "revno:" can appear either at the beginning of a line, or indented.
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
403 (concat "^[ ]*-+\n[ ]*revno: "
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
404 ;; The revision can contain ".", quote it so that it
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
405 ;; does not interfere with regexp matching.
3c75e19e7ec9 (vc-bzr-print-log): Insert a file marker. Run the log
Dan Nicolaescu <dann@ics.uci.edu>
parents: 80340
diff changeset
406 (regexp-quote revision) "$") nil t)
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
407 (beginning-of-line 0)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
408 (goto-char (point-min)))))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
409
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
410 (autoload 'vc-diff-switches-list "vc" nil nil t)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
411
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
412 (defun vc-bzr-diff (files &optional rev1 rev2 buffer)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
413 "VC bzr backend for diff."
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
414 ;; `bzr diff' exits with code 1 if diff is non-empty
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
415 (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 1 files
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
416 "--diff-options" (mapconcat 'identity
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
417 (vc-diff-switches-list bzr)
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
418 " ")
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
419 (list "-r" (format "%s..%s"
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
420 (or rev1 "revno:-1")
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
421 (or rev2 "")))))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
422
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
423 (defalias 'vc-bzr-diff-tree 'vc-bzr-diff)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
424
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
425
78521
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
426 ;; FIXME: vc-{next,previous}-version need fixing in vc.el to deal with
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
427 ;; straight integer versions.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
428
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
429 (defun vc-bzr-delete-file (file)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
430 "Delete FILE and delete it in the bzr repository."
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
431 (condition-case ()
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
432 (delete-file file)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
433 (file-error nil))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
434 (vc-bzr-command "remove" nil 0 file))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
435
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
436 (defun vc-bzr-rename-file (old new)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
437 "Rename file from OLD to NEW using `bzr mv'."
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
438 (vc-bzr-command "mv" nil 0 new old))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
439
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
440 (defvar vc-bzr-annotation-table nil
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
441 "Internal use.")
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
442 (make-variable-buffer-local 'vc-bzr-annotation-table)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
443
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
444 (defun vc-bzr-annotate-command (file buffer &optional version)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
445 "Prepare BUFFER for `vc-annotate' on FILE.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
446 Each line is tagged with the revision number, which has a `help-echo'
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
447 property containing author and date information."
78748
0b7bd1d9ffbf (vc-bzr-admin-lastrev): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78564
diff changeset
448 (apply #'vc-bzr-command "annotate" buffer 0 file "--long" "--all"
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
449 (if version (list "-r" version)))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
450 (with-current-buffer buffer
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
451 ;; Store the tags for the annotated source lines in a hash table
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
452 ;; to allow saving space by sharing the text properties.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
453 (setq vc-bzr-annotation-table (make-hash-table :test 'equal))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
454 (goto-char (point-min))
80340
756c7bbc9664 (vc-bzr-log-view-mode, vc-bzr-annotate-command)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 80333
diff changeset
455 (while (re-search-forward "^\\( *[0-9.]+ *\\) \\([^\n ]+\\) +\\([0-9]\\{8\\}\\) |"
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
456 nil t)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
457 (let* ((rev (match-string 1))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
458 (author (match-string 2))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
459 (date (match-string 3))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
460 (key (match-string 0))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
461 (tag (gethash key vc-bzr-annotation-table)))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
462 (unless tag
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
463 (setq tag (propertize rev 'help-echo (concat "Author: " author
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
464 ", date: " date)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
465 'mouse-face 'highlight))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
466 (puthash key tag vc-bzr-annotation-table))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
467 (replace-match "")
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
468 (insert tag " |")))))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
469
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
470 (defun vc-bzr-annotate-time ()
80340
756c7bbc9664 (vc-bzr-log-view-mode, vc-bzr-annotate-command)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 80333
diff changeset
471 (when (re-search-forward "^ *[0-9.]+ +|" nil t)
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
472 (let ((prop (get-text-property (line-beginning-position) 'help-echo)))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
473 (string-match "[0-9]+\\'" prop)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
474 (vc-annotate-convert-time
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
475 (encode-time 0 0 0
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
476 (string-to-number (substring (match-string 0 prop) 6 8))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
477 (string-to-number (substring (match-string 0 prop) 4 6))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
478 (string-to-number (substring (match-string 0 prop) 0 4))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
479 )))))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
480
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
481 (defun vc-bzr-annotate-extract-revision-at-line ()
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
482 "Return revision for current line of annoation buffer, or nil.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
483 Return nil if current line isn't annotated."
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
484 (save-excursion
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
485 (beginning-of-line)
80340
756c7bbc9664 (vc-bzr-log-view-mode, vc-bzr-annotate-command)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 80333
diff changeset
486 (if (looking-at " *\\([0-9.]+\\) | ")
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
487 (match-string-no-properties 1))))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
488
78435
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
489 (defun vc-bzr-command-discarding-stderr (command &rest args)
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
490 "Execute shell command COMMAND (with ARGS); return its output and exitcode.
78431
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
491 Return value is a cons (EXITCODE . OUTPUT), where EXITCODE is
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
492 the (numerical) exit code of the process, and OUTPUT is a string
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
493 containing whatever the process sent to its standard output
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
494 stream. Standard error output is discarded."
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
495 (with-temp-buffer
78435
adc16e5bfb60 Remove comments about vc-bzr.el being a modified unofficial version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78431
diff changeset
496 (cons
78521
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
497 (apply #'call-process command nil (list (current-buffer) nil) nil args)
78431
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
498 (buffer-substring (point-min) (point-max)))))
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
499
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
500 ;; TODO: it would be nice to mark the conflicted files in VC Dired,
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
501 ;; and implement a command to run ediff and `bzr resolve' once the
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
502 ;; changes have been merged.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
503 (defun vc-bzr-dir-state (dir &optional localp)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
504 "Find the VC state of all files in DIR.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
505 Optional argument LOCALP is always ignored."
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
506 (let ((bzr-root-directory (vc-bzr-root dir))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
507 (at-start t)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
508 current-bzr-state current-vc-state)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
509 ;; Check that DIR is a bzr repository.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
510 (unless (file-name-absolute-p bzr-root-directory)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
511 (error "Cannot find bzr repository for directory `%s'" dir))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
512 ;; `bzr ls --versioned' lists all versioned files;
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
513 ;; assume they are up-to-date, unless we are given
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
514 ;; evidence of the contrary.
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
515 (setq at-start t)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
516 (with-temp-buffer
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
517 (vc-bzr-command "ls" t 0 nil "--versioned" "--non-recursive")
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
518 (goto-char (point-min))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
519 (while (or at-start
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
520 (eq 0 (forward-line)))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
521 (setq at-start nil)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
522 (let ((file (expand-file-name
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
523 (buffer-substring-no-properties
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
524 (line-beginning-position) (line-end-position))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
525 bzr-root-directory)))
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
526 ;; files are up-to-date unless they appear in the `bzr
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
527 ;; status' output below
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
528 (vc-file-setprop file 'vc-state 'up-to-date)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
529 ;; XXX: is this correct? what happens if one
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
530 ;; mixes different SCMs in the same dir?
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
531 ;; Anyway, we're looking at the output of `bzr ls --versioned',
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
532 ;; so we know these files are registered with Bzr.
78404
27f00e50116a Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents: 78387
diff changeset
533 (vc-file-setprop file 'vc-backend 'Bzr))))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
534 ;; `bzr status' reports on added/modified/renamed and unknown/ignored files
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
535 (setq at-start t)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
536 (with-temp-buffer
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
537 (vc-bzr-command "status" t 0 nil)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
538 (goto-char (point-min))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
539 (while (or at-start
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
540 (eq 0 (forward-line)))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
541 (setq at-start nil)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
542 (cond
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
543 ((looking-at "^added")
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
544 (setq current-vc-state 'edited)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
545 (setq current-bzr-state 'added))
78521
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
546 ((looking-at "^kind changed")
98c39e79e082 (vc-bzr-registered): Use \0 instead of literal NULs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78435
diff changeset
547 (setq current-vc-state 'edited)
78564
8f9613d80af0 Don't fiddle with vc-handled-backend.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78521
diff changeset
548 (setq current-bzr-state 'kindchanged))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
549 ((looking-at "^modified")
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
550 (setq current-vc-state 'edited)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
551 (setq current-bzr-state 'modified))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
552 ((looking-at "^renamed")
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
553 (setq current-vc-state 'edited)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
554 (setq current-bzr-state 'renamed))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
555 ((looking-at "^\\(unknown\\|ignored\\)")
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
556 (setq current-vc-state nil)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
557 (setq current-bzr-state 'not-versioned))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
558 ((looking-at " ")
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
559 ;; file names are indented by two spaces
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
560 (when current-vc-state
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
561 (let ((file (expand-file-name
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
562 (buffer-substring-no-properties
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
563 (match-end 0) (line-end-position))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
564 bzr-root-directory)))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
565 (vc-file-setprop file 'vc-state current-vc-state)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
566 (vc-file-setprop file 'vc-bzr-state current-bzr-state)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
567 (when (eq 'added current-bzr-state)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
568 (vc-file-setprop file 'vc-workfile-version "0"))))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
569 (when (eq 'not-versioned current-bzr-state)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
570 (let ((file (expand-file-name
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
571 (buffer-substring-no-properties
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
572 (match-end 0) (line-end-position))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
573 bzr-root-directory)))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
574 (vc-file-setprop file 'vc-backend 'none)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
575 (vc-file-setprop file 'vc-state nil))))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
576 (t
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
577 ;; skip this part of `bzr status' output
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
578 (setq current-vc-state nil)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
579 (setq current-bzr-state nil)))))))
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
580
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
581 (defun vc-bzr-dired-state-info (file)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
582 "Bzr-specific version of `vc-dired-state-info'."
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
583 (if (eq 'edited (vc-state file))
79688
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
584 (concat "(" (symbol-name (or (vc-file-getprop file 'vc-bzr-state)
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
585 'edited)) ")")
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
586 ;; else fall back to default vc.el representation
f82034083629 Copyright and version headers update.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78748
diff changeset
587 (vc-default-dired-state-info 'Bzr file)))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
588
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
589 (eval-after-load "vc"
78431
abd7f08fa06b (vc-bzr-registered): Gracefully handle missing "bzr"
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78404
diff changeset
590 '(add-to-list 'vc-directory-exclusion-list vc-bzr-admin-dirname t))
78372
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
591
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
592 (provide 'vc-bzr)
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
593 ;; arch-tag: 8101bad8-4e92-4e7d-85ae-d8e08b4e7c06
53ed644d1a88 * vc-bzr.el: New file (copied from the trunk).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
594 ;;; vc-bzr.el ends here