annotate lisp/vc-bzr.el @ 81616:bd1a205d2b3b

*** empty log message ***
author YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date Tue, 26 Jun 2007 03:28:17 +0000
parents 0c6323e48d45
children e40762570726
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1 ;;; vc-bzr.el --- VC backend for the bzr revision control system
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
3 ;; Copyright (C) 2006, 2007 Free Software Foundation, Inc.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
4
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
5 ;; NOTE: THIS IS A MODIFIED VERSION OF Dave Love's vc-bzr.el,
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
6 ;; which you can find at: http://www.loveshack.ukfsn.org/emacs/vc-bzr.el
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
7 ;; I could not get in touch with Dave Love by email, so
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
8 ;; I am releasing my changes separately. -- Riccardo
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
9
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
10 ;; Author: Dave Love <fx@gnu.org>, Riccardo Murri <riccardo.murri@gmail.com>
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
11 ;; Keywords: tools
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
12 ;; Created: Sept 2006
81477
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
13 ;; Version: 2007-05-24
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
14 ;; URL: http://launchpad.net/vc-bzr
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
15
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
16 ;; This file is free software; you can redistribute it and/or modify
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
17 ;; it under the terms of the GNU General Public License as published by
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
18 ;; the Free Software Foundation; either version 2, or (at your option)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
19 ;; any later version.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
20
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
21 ;; This file is distributed in the hope that it will be useful,
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
22 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
23 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
24 ;; GNU General Public License for more details.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
25
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
26 ;; You should have received a copy of the GNU General Public License
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
27 ;; along with GNU Emacs; see the file COPYING. If not, write to the
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
28 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
29 ;; Boston, MA 02110-1301, USA.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
30
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
31
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
32 ;;; Commentary:
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
33
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
34 ;; NOTE: THIS IS A MODIFIED VERSION OF Dave Love's vc-bzr.el,
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
35 ;; which you can find at: http://www.loveshack.ukfsn.org/emacs/vc-bzr.el
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
36
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
37 ;; See <URL:http://bazaar-vcs.org/> concerning bzr.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
38
81477
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
39 ;; Load this library to register bzr support in VC. It covers basic VC
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
40 ;; functionality, but was only lightly exercised with a few Emacs/bzr
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
41 ;; version combinations, namely those current on the authors' PCs.
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
42 ;; See various Fixmes below.
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
43
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
44
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
45 ;; Known bugs
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
46 ;; ==========
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
47
81477
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
48 ;; When edititing a symlink and *both* the symlink and its target
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
49 ;; are bzr-versioned, `vc-bzr` presently runs `bzr status` on the
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
50 ;; symlink, thereby not detecting whether the actual contents
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
51 ;; (that is, the target contents) are changed.
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
52 ;; See https://bugs.launchpad.net/vc-bzr/+bug/116607
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
53
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
54 ;; For an up-to-date list of bugs, please see:
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
55 ;; https://bugs.launchpad.net/vc-bzr/+bugs
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
56
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
57
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
58 ;;; Code:
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
59
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
60 (eval-when-compile
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
61 (require 'cl)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
62 (require 'vc)) ; for vc-exec-after
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
63
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
64 (defgroup vc-bzr nil
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
65 "VC bzr backend."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
66 ;; :version "22"
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
67 :group 'vc)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
68
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
69 (defcustom vc-bzr-program "bzr"
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
70 "Name of the bzr command (excluding any arguments)."
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
71 :group 'vc-bzr
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
72 :type 'string)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
73
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
74 ;; Fixme: there's probably no call for this.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
75 (defcustom vc-bzr-program-args nil
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
76 "List of global arguments to pass to `vc-bzr-program'."
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
77 :group 'vc-bzr
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
78 :type '(repeat string))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
79
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
80 (defcustom vc-bzr-diff-switches nil
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
81 "String/list of strings specifying extra switches for bzr diff under VC."
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
82 :type '(choice (const :tag "None" nil)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
83 (string :tag "Argument String")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
84 (repeat :tag "Argument List" :value ("") string))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
85 :group 'vc-bzr)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
86
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
87 (defvar vc-bzr-version nil
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
88 "Internal use.")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
89
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
90 ;; Could be used for compatibility checks if bzr changes.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
91 (defun vc-bzr-version ()
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
92 "Return a three-numeric element list with components of the bzr version.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
93 This is of the form (X Y Z) for revision X.Y.Z. The elements are zero
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
94 if running `vc-bzr-program' doesn't produce the expected output."
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
95 (or vc-bzr-version
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
96 (setq vc-bzr-version
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
97 (let ((s (shell-command-to-string
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
98 (concat (shell-quote-argument vc-bzr-program)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
99 " --version"))))
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
100 (if (string-match "\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)$" s)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
101 (list (string-to-number (match-string 1 s))
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
102 (string-to-number (match-string 2 s))
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
103 (string-to-number (match-string 3 s)))
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
104 '(0 0 0))))))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
105
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
106 (defun vc-bzr-at-least-version (vers)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
107 "Return t if the bzr command reports being a least version VERS.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
108 First argument VERS is a list of the form (X Y Z), as returned by `vc-bzr-version'."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
109 (version-list-<= vers (vc-bzr-version)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
110
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
111 ;; since v0.9, bzr supports removing the progress indicators
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
112 ;; by setting environment variable BZR_PROGRESS_BAR to "none".
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
113 (defun vc-bzr-command (bzr-command buffer okstatus file &rest args)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
114 "Wrapper round `vc-do-command' using `vc-bzr-program' as COMMAND.
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
115 Invoke the bzr command adding `BZR_PROGRESS_BAR=none' to the environment."
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
116 (let ((process-environment
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
117 (list* "BZR_PROGRESS_BAR=none" ; Suppress progress output (bzr >=0.9)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
118 "LC_ALL=C" ; Force English output
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
119 process-environment))
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
120 ;; bzr may attempt some kind of user interaction if its stdin/stdout
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
121 ;; is connected to a PTY; therefore, ask Emacs to use a pipe to
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
122 ;; communicate with it.
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
123 ;; This is redundant because vc-do-command does it already. --Stef
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
124 (process-connection-type nil))
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
125 (apply 'vc-do-command buffer okstatus vc-bzr-program
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
126 file bzr-command (append vc-bzr-program-args args))))
81477
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
127
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
128 (unless (vc-bzr-at-least-version '(0 9))
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
129 ;; For older versions, we fall back to washing the log buffer
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
130 ;; when all output has been gathered.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
131 (defun vc-bzr-post-command-function (command file flags)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
132 "`vc-post-command-functions' function to remove progress messages."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
133 ;; Note that using this requires that the vc command is run
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
134 ;; synchronously. Otherwise, the ^Ms in the leading progress
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
135 ;; message on stdout cause the stream to be interpreted as having
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
136 ;; DOS line endings, losing the ^Ms, so the search fails. I don't
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
137 ;; know how this works under Windows.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
138 (when (equal command vc-bzr-program)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
139 (save-excursion
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
140 (goto-char (point-min))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
141 (if (looking-at "^\\(\r.*\r\\)[^\r]+$")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
142 (replace-match "" nil nil nil 1)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
143 (save-excursion
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
144 (goto-char (point-min))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
145 ;; This is inserted by bzr 0.11 `log', at least
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
146 (while (looking-at "read knit.*\n")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
147 (replace-match "")))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
148
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
149 (add-hook 'vc-post-command-functions 'vc-bzr-post-command-function))
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
150
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
151 ;;;###autoload
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
152 (defconst vc-bzr-admin-dirname ".bzr") ; FIXME: "_bzr" on w32?
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
153
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
154 ;;;###autoload (defun vc-bzr-registered (file)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
155 ;;;###autoload (if (vc-find-root file vc-bzr-admin-dirname)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
156 ;;;###autoload (progn
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
157 ;;;###autoload (load "vc-bzr")
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
158 ;;;###autoload (vc-bzr-registered file))))
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
159
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
160 (defun vc-bzr-root-dir (file)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
161 "Return the root directory in the hierarchy above FILE.
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
162 Return nil if there isn't one."
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
163 (vc-find-root file vc-bzr-admin-dirname))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
164
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
165 (defun vc-bzr-registered (file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
166 "Return non-nil if FILE is registered with bzr."
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
167 (if (vc-bzr-root-dir file) ; Short cut.
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
168 (vc-bzr-state file))) ; Expensive.
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
169
81477
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
170 (defun vc-bzr-buffer-nonblank-p (&optional buffer)
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
171 "Return non-nil if BUFFER contains any non-blank characters."
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
172 (or (> (buffer-size buffer) 0)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
173 (save-excursion
81477
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
174 (set-buffer (or buffer (current-buffer)))
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
175 (goto-char (point-min))
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
176 (re-search-forward "[^ \t\n]" (point-max) t))))
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
177
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
178 (defconst vc-bzr-state-words
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
179 "added\\|ignored\\|modified\\|removed\\|renamed\\|unknown"
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
180 "Regexp matching file status words as reported in `bzr' output.")
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
181
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
182 ;; FIXME: Also get this in a non-registered sub-directory.
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
183 (defun vc-bzr-state (file)
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
184 (with-temp-buffer
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
185 (cd (file-name-directory file))
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
186 (let ((ret (vc-bzr-command "status" t 255 file))
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
187 (state 'up-to-date))
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
188 ;; the only secure status indication in `bzr status' output
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
189 ;; is a couple of lines following the pattern::
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
190 ;; | <status>:
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
191 ;; | <file name>
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
192 ;; if the file is up-to-date, we get no status report from `bzr',
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
193 ;; so if the regexp search for the above pattern fails, we consider
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
194 ;; the file to be up-to-date.
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
195 (goto-char (point-min))
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
196 (when
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
197 (re-search-forward
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
198 (concat "^\\(" vc-bzr-state-words "\\):[ \t\n]+"
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
199 (file-name-nondirectory file) "[ \t\n]*$")
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
200 (point-max) t)
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
201 (let ((start (match-beginning 0))
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
202 (end (match-end 0)))
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
203 (goto-char start)
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
204 (setq state
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
205 (cond
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
206 ((not (equal ret 0)) nil)
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
207 ((looking-at "added\\|renamed\\|modified\\|removed") 'edited)
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
208 ((looking-at "unknown\\|ignored") nil)))
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
209 ;; erase the status text that matched
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
210 (delete-region start end)))
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
211 (when (vc-bzr-buffer-nonblank-p)
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
212 ;; "bzr" will output some warnings and informational messages
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
213 ;; to the user to stderr; due to Emacs' `vc-do-command' (and,
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
214 ;; it seems, `start-process' itself), we cannot catch stderr
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
215 ;; and stdout into different buffers. So, if there's anything
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
216 ;; left in the buffer after removing the above status
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
217 ;; keywords, let us just presume that any other message from
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
218 ;; "bzr" is a user warning, and display it.
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
219 (message "Warnings in `bzr' output: %s"
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
220 (buffer-substring (point-min) (point-max))))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
221 (when state
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
222 (vc-file-setprop file 'vc-workfile-version
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
223 (vc-bzr-workfile-version file))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
224 (vc-file-setprop file 'vc-state state))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
225 state)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
226
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
227 (defun vc-bzr-workfile-unchanged-p (file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
228 (eq 'up-to-date (vc-bzr-state file)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
229
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
230 (defun vc-bzr-workfile-version (file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
231 (with-temp-buffer
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
232 (vc-bzr-command "revno" t 0 file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
233 (goto-char 1)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
234 (buffer-substring 1 (line-end-position))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
235
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
236 (defun vc-bzr-checkout-model (file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
237 'implicit)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
238
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
239 (defun vc-bzr-register (file &optional rev comment)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
240 "Register FILE under bzr.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
241 Signal an error unless REV is nil.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
242 COMMENT is ignored."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
243 (if rev (error "Can't register explicit version with bzr"))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
244 (vc-bzr-command "add" nil 0 file))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
245
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
246 ;; Could run `bzr status' in the directory and see if it succeeds, but
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
247 ;; that's relatively expensive.
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
248 (defalias 'vc-bzr-responsible-p 'vc-bzr-root-dir
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
249 "Return non-nil if FILE is (potentially) controlled by bzr.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
250 The criterion is that there is a `.bzr' directory in the same
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
251 or a superior directory.")
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
252
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
253 (defun vc-bzr-could-register (file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
254 "Return non-nil if FILE could be registered under bzr."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
255 (and (vc-bzr-responsible-p file) ; shortcut
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
256 (condition-case ()
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
257 (with-temp-buffer
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
258 (vc-bzr-command "add" t 0 file "--dry-run")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
259 ;; The command succeeds with no output if file is
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
260 ;; registered (in bzr 0.8).
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
261 (goto-char 1)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
262 (looking-at "added "))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
263 (error))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
264
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
265 (defun vc-bzr-unregister (file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
266 "Unregister FILE from bzr."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
267 (vc-bzr-command "remove" nil 0 file))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
268
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
269 (defun vc-bzr-checkin (file rev comment)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
270 "Check FILE in to bzr with log message COMMENT.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
271 REV non-nil gets an error."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
272 (if rev (error "Can't check in a specific version with bzr"))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
273 (vc-bzr-command "commit" nil 0 file "-m" comment))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
274
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
275 (defun vc-bzr-checkout (file &optional editable rev destfile)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
276 "Checkout revision REV of FILE from bzr to DESTFILE.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
277 EDITABLE is ignored."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
278 (unless destfile
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
279 (setq destfile (vc-version-backup-file-name file rev)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
280 (let ((coding-system-for-read 'binary)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
281 (coding-system-for-write 'binary))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
282 (with-temp-file destfile
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
283 (if rev
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
284 (vc-bzr-command "cat" t 0 file "-r" rev)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
285 (vc-bzr-command "cat" t 0 file)))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
286
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
287 (defun vc-bzr-revert (file &optional contents-done)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
288 (unless contents-done
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
289 (with-temp-buffer (vc-bzr-command "revert" t 'async file))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
290
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
291 (defvar log-view-message-re)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
292 (defvar log-view-file-re)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
293 (defvar log-view-font-lock-keywords)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
294 (defvar log-view-current-tag-function)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
295
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
296 (define-derived-mode vc-bzr-log-view-mode log-view-mode "Bzr-Log-View"
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
297 (remove-hook 'log-view-mode-hook 'vc-bzr-log-view-mode) ;Deactivate the hack.
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
298 (require 'add-log)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
299 ;; Don't have file markers, so use impossible regexp.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
300 (set (make-local-variable 'log-view-file-re) "\\'\\`")
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
301 (set (make-local-variable 'log-view-message-re)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
302 "^ *-+\n *\\(?:revno: \\([0-9]+\\)\\|merged: .+\\)")
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
303 (set (make-local-variable 'log-view-font-lock-keywords)
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
304 ;; log-view-font-lock-keywords is careful to use the buffer-local
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
305 ;; value of log-view-message-re only since Emacs-23.
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
306 (append `((,log-view-message-re . 'log-view-message-face))
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
307 ;; log-view-font-lock-keywords
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
308 '(("^ *committer: \
81539
0c6323e48d45 (vc-bzr-log-view-mode): Add + to the email address
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81512
diff changeset
309 \\([^<(]+?\\)[ ]*[(<]\\([[:alnum:]_.+-]+@[[:alnum:]_.-]+\\)[>)]"
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
310 (1 'change-log-name)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
311 (2 'change-log-email))
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
312 ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face))))))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
313
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
314 (defun vc-bzr-print-log (file &optional buffer) ; get buffer arg in Emacs 22
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
315 "Get bzr change log for FILE into specified BUFFER."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
316 ;; Fixme: This might need the locale fixing up if things like `revno'
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
317 ;; got localized, but certainly it shouldn't use LC_ALL=C.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
318 ;; NB. Can't be async -- see `vc-bzr-post-command-function'.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
319 (vc-bzr-command "log" buffer 0 file)
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
320 ;; FIXME: Until Emacs-23, VC was missing a hook to sort out the mode for
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
321 ;; the buffer, or at least set the regexps right.
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
322 (unless (fboundp 'vc-default-log-view-mode)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
323 (add-hook 'log-view-mode-hook 'vc-bzr-log-view-mode)))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
324
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
325 (defun vc-bzr-show-log-entry (version)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
326 "Find entry for patch name VERSION in bzr change log buffer."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
327 (goto-char (point-min))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
328 (let (case-fold-search)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
329 (if (re-search-forward (concat "^-+\nrevno: " version "$") nil t)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
330 (beginning-of-line 0)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
331 (goto-char (point-min)))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
332
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
333 ;; Fixem: vc-bzr-wash-log
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
334
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
335 (autoload 'vc-diff-switches-list "vc" nil nil t)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
336
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
337 (defun vc-bzr-diff (file &optional rev1 rev2 buffer)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
338 "VC bzr backend for diff."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
339 (let ((working (vc-workfile-version file)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
340 (if (and (equal rev1 working) (not rev2))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
341 (setq rev1 nil))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
342 (if (and (not rev1) rev2)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
343 (setq rev1 working))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
344 ;; NB. Can't be async -- see `vc-bzr-post-command-function'.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
345 ;; bzr diff produces condition code 1 for some reason.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
346 (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 1 file
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
347 "--diff-options" (mapconcat 'identity (vc-diff-switches-list bzr)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
348 " ")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
349 (when rev1
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
350 (if rev2
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
351 (list "-r" (format "%s..%s" rev1 rev2))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
352 (list "-r" rev1))))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
353
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
354 (defalias 'vc-bzr-diff-tree 'vc-bzr-diff)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
355
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
356 ;; Fixme: implement vc-bzr-dir-state, vc-bzr-dired-state-info
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
357
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
358 ;; Fixme: vc-{next,previous}-version need fixing in vc.el to deal with
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
359 ;; straight integer versions.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
360
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
361 (defun vc-bzr-delete-file (file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
362 "Delete FILE and delete it in the bzr repository."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
363 (condition-case ()
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
364 (delete-file file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
365 (file-error nil))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
366 (vc-bzr-command "remove" nil 0 file))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
367
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
368 (defun vc-bzr-rename-file (old new)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
369 "Rename file from OLD to NEW using `bzr mv'."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
370 (vc-bzr-command "mv" nil 0 new old))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
371
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
372 (defvar vc-bzr-annotation-table nil
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
373 "Internal use.")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
374 (make-variable-buffer-local 'vc-bzr-annotation-table)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
375
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
376 (defun vc-bzr-annotate-command (file buffer &optional version)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
377 "Prepare BUFFER for `vc-annotate' on FILE.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
378 Each line is tagged with the revision number, which has a `help-echo'
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
379 property containing author and date information."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
380 (apply #'vc-bzr-command "annotate" buffer 0 file "-l" "--all"
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
381 (if version (list "-r" version)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
382 (with-current-buffer buffer
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
383 ;; Store the tags for the annotated source lines in a hash table
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
384 ;; to allow saving space by sharing the text properties.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
385 (setq vc-bzr-annotation-table (make-hash-table :test 'equal))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
386 (goto-char (point-min))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
387 (while (re-search-forward "^\\( *[0-9]+\\) \\(.+\\) +\\([0-9]\\{8\\}\\) |"
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
388 nil t)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
389 (let* ((rev (match-string 1))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
390 (author (match-string 2))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
391 (date (match-string 3))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
392 (key (match-string 0))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
393 (tag (gethash key vc-bzr-annotation-table)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
394 (unless tag
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
395 (save-match-data
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
396 (string-match " +\\'" author)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
397 (setq author (substring author 0 (match-beginning 0))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
398 (setq tag (propertize rev 'help-echo (concat "Author: " author
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
399 ", date: " date)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
400 'mouse-face 'highlight))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
401 (puthash key tag vc-bzr-annotation-table))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
402 (replace-match "")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
403 (insert tag " |")))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
404
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
405 ;; Definition from Emacs 22
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
406 (unless (fboundp 'vc-annotate-convert-time)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
407 (defun vc-annotate-convert-time (time)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
408 "Convert a time value to a floating-point number of days.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
409 The argument TIME is a list as returned by `current-time' or
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
410 `encode-time', only the first two elements of that list are considered."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
411 (/ (+ (* (float (car time)) (lsh 1 16)) (cadr time)) 24 3600)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
412
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
413 (defun vc-bzr-annotate-time ()
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
414 (when (re-search-forward "^ *[0-9]+ |" nil t)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
415 (let ((prop (get-text-property (line-beginning-position) 'help-echo)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
416 (string-match "[0-9]+\\'" prop)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
417 (vc-annotate-convert-time
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
418 (encode-time 0 0 0
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
419 (string-to-number (substring (match-string 0 prop) 6 8))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
420 (string-to-number (substring (match-string 0 prop) 4 6))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
421 (string-to-number (substring (match-string 0 prop) 0 4))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
422 )))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
423
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
424 (defun vc-bzr-annotate-extract-revision-at-line ()
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
425 "Return revision for current line of annoation buffer, or nil.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
426 Return nil if current line isn't annotated."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
427 (save-excursion
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
428 (beginning-of-line)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
429 (if (looking-at " *\\([0-9]+\\) | ")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
430 (match-string-no-properties 1))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
431
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
432 ;; Not needed for Emacs 22
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
433 (defun vc-bzr-annotate-difference (point)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
434 (let ((next-time (vc-bzr-annotate-time)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
435 (if next-time
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
436 (- (vc-annotate-convert-time (current-time)) next-time))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
437
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
438 ;; FIXME: `bzr root' will return the real path to the repository root,
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
439 ;; that is, it can differ from the buffer's current directory name
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
440 ;; if there are any symbolic links.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
441 (defun vc-bzr-root (dir)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
442 "Return the root directory of the bzr repository containing DIR."
81446
774e9d2142bd * vc-bzr.el (vc-bzr-root): Cache the output of shell command execution.
Masatake YAMATO <jet@gyve.org>
parents: 81307
diff changeset
443 ;; Cache technique copied from vc-arch.el.
774e9d2142bd * vc-bzr.el (vc-bzr-root): Cache the output of shell command execution.
Masatake YAMATO <jet@gyve.org>
parents: 81307
diff changeset
444 (or (vc-file-getprop dir 'bzr-root)
774e9d2142bd * vc-bzr.el (vc-bzr-root): Cache the output of shell command execution.
Masatake YAMATO <jet@gyve.org>
parents: 81307
diff changeset
445 (vc-file-setprop
774e9d2142bd * vc-bzr.el (vc-bzr-root): Cache the output of shell command execution.
Masatake YAMATO <jet@gyve.org>
parents: 81307
diff changeset
446 dir 'bzr-root
774e9d2142bd * vc-bzr.el (vc-bzr-root): Cache the output of shell command execution.
Masatake YAMATO <jet@gyve.org>
parents: 81307
diff changeset
447 (substring
774e9d2142bd * vc-bzr.el (vc-bzr-root): Cache the output of shell command execution.
Masatake YAMATO <jet@gyve.org>
parents: 81307
diff changeset
448 (shell-command-to-string (concat vc-bzr-program " root " dir)) 0 -1))))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
449
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
450 ;; TODO: it would be nice to mark the conflicted files in VC Dired,
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
451 ;; and implement a command to run ediff and `bzr resolve' once the
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
452 ;; changes have been merged.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
453 (defun vc-bzr-dir-state (dir &optional localp)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
454 "Find the VC state of all files in DIR.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
455 Optional argument LOCALP is always ignored."
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
456 (let ((bzr-root-directory (vc-bzr-root dir))
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
457 (at-start t)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
458 current-bzr-state current-vc-state)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
459 ;; Check that DIR is a bzr repository.
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
460 (unless (file-name-absolute-p bzr-root-directory)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
461 (error "Cannot find bzr repository for directory `%s'" dir))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
462 ;; `bzr ls --versioned' lists all versioned files;
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
463 ;; assume they are up-to-date, unless we are given
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
464 ;; evidence of the contrary.
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
465 (setq at-start t)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
466 (with-temp-buffer
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
467 (vc-bzr-command "ls" t 0 nil "--versioned" "--non-recursive")
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
468 (goto-char (point-min))
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
469 (while (or at-start
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
470 (eq 0 (forward-line)))
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
471 (setq at-start nil)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
472 (let ((file (expand-file-name
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
473 (buffer-substring-no-properties
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
474 (line-beginning-position) (line-end-position))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
475 bzr-root-directory)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
476 (vc-file-setprop file 'vc-state 'up-to-date)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
477 ;; XXX: is this correct? what happens if one
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
478 ;; mixes different SCMs in the same dir?
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
479 (vc-file-setprop file 'vc-backend 'BZR))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
480 ;; `bzr status' reports on added/modified/renamed and unknown/ignored files
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
481 (setq at-start t)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
482 (with-temp-buffer
81477
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
483 (vc-bzr-command "status" t 0 nil)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
484 (goto-char (point-min))
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
485 (while (or at-start
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
486 (eq 0 (forward-line)))
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
487 (setq at-start nil)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
488 (cond
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
489 ((looking-at "^added")
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
490 (setq current-vc-state 'edited)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
491 (setq current-bzr-state 'added))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
492 ((looking-at "^modified")
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
493 (setq current-vc-state 'edited)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
494 (setq current-bzr-state 'modified))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
495 ((looking-at "^renamed")
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
496 (setq current-vc-state 'edited)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
497 (setq current-bzr-state 'renamed))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
498 ((looking-at "^\\(unknown\\|ignored\\)")
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
499 (setq current-vc-state nil)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
500 (setq current-bzr-state 'not-versioned))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
501 ((looking-at " ")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
502 ;; file names are indented by two spaces
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
503 (when current-vc-state
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
504 (let ((file (expand-file-name
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
505 (buffer-substring-no-properties
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
506 (match-end 0) (line-end-position))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
507 bzr-root-directory)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
508 (vc-file-setprop file 'vc-state current-vc-state)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
509 (vc-file-setprop file 'vc-bzr-state current-bzr-state)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
510 (when (eq 'added current-bzr-state)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
511 (vc-file-setprop file 'vc-workfile-version "0"))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
512 (when (eq 'not-versioned current-bzr-state)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
513 (let ((file (expand-file-name
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
514 (buffer-substring-no-properties
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
515 (match-end 0) (line-end-position))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
516 bzr-root-directory)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
517 (vc-file-setprop file 'vc-backend 'none)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
518 (vc-file-setprop file 'vc-state nil))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
519 (t
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
520 ;; skip this part of `bzr status' output
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
521 (setq current-vc-state nil)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
522 (setq current-bzr-state nil)))))))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
523
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
524 (defun vc-bzr-dired-state-info (file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
525 "Bzr-specific version of `vc-dired-state-info'."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
526 (if (eq 'edited (vc-state file))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
527 (let ((bzr-state (vc-file-getprop file 'vc-bzr-state)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
528 (if bzr-state
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
529 (concat "(" (symbol-name bzr-state) ")")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
530 ;; else fall back to default vc representation
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
531 (vc-default-dired-state-info 'BZR file)))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
532
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
533 ;; In case of just `(load "vc-bzr")', but that's probably the wrong
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
534 ;; way to do it.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
535 (add-to-list 'vc-handled-backends 'BZR)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
536
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
537 (eval-after-load "vc"
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
538 '(add-to-list 'vc-directory-exclusion-list ".bzr" t))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
539
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
540 (defconst vc-bzr-unload-hook
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
541 (lambda ()
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
542 (setq vc-handled-backends (delq 'BZR vc-handled-backends))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
543 (remove-hook 'vc-post-command-functions 'vc-bzr-post-command-function)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
544
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
545 (provide 'vc-bzr)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
546 ;; arch-tag: 8101bad8-4e92-4e7d-85ae-d8e08b4e7c06
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
547 ;;; vc-bzr.el ends here