annotate lisp/vc-bzr.el @ 82185:60a0f1fabb5a

*** empty log message ***
author Eli Zaretskii <eliz@gnu.org>
date Sat, 28 Jul 2007 07:47:37 +0000
parents 2d2d51d01a8c
children 36893fdf92ab 539530fa389c
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
82159
2d2d51d01a8c Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents: 81982
diff changeset
7 ;; I could not get in touch with Dave Love by email, so
81307
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
82159
2d2d51d01a8c Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents: 81982
diff changeset
18 ;; the Free Software Foundation; either version 3, or (at your option)
81307
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
81649
e40762570726 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81539
diff changeset
64 ;; Clear up the cache to force vc-call to check again and discover
e40762570726 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81539
diff changeset
65 ;; new functions when we reload this file.
e40762570726 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81539
diff changeset
66 (put 'BZR 'vc-functions nil)
e40762570726 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81539
diff changeset
67
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
68 (defgroup vc-bzr nil
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
69 "VC bzr backend."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
70 ;; :version "22"
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
71 :group 'vc)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
72
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
73 (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
74 "Name of the bzr command (excluding any arguments)."
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
75 :group 'vc-bzr
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
76 :type 'string)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
77
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
78 ;; Fixme: there's probably no call for this.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
79 (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
80 "List of global arguments to pass to `vc-bzr-program'."
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
81 :group 'vc-bzr
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
82 :type '(repeat string))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
83
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
84 (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
85 "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
86 :type '(choice (const :tag "None" nil)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
87 (string :tag "Argument String")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
88 (repeat :tag "Argument List" :value ("") string))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
89 :group 'vc-bzr)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
90
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
91 ;; 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
92 ;; by setting environment variable BZR_PROGRESS_BAR to "none".
81961
ca2e61765033 Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81925
diff changeset
93 (defun vc-bzr-command (bzr-command buffer okstatus file-or-list &rest args)
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
94 "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
95 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
96 (let ((process-environment
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
97 (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
98 "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
99 process-environment))
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
100 ;; 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
101 ;; 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
102 ;; communicate with it.
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
103 ;; 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
104 (process-connection-type nil))
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
105 (apply 'vc-do-command buffer okstatus vc-bzr-program
81961
ca2e61765033 Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81925
diff changeset
106 file-or-list bzr-command (append vc-bzr-program-args args))))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
107
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
108
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
109 ;;;###autoload
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
110 (defconst vc-bzr-admin-dirname ".bzr") ; FIXME: "_bzr" on w32?
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
111
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
112 ;;;###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
113 ;;;###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
114 ;;;###autoload (progn
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
115 ;;;###autoload (load "vc-bzr")
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
116 ;;;###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
117
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
118 (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
119 "Return the root directory in the hierarchy above FILE.
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
120 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
121 (vc-find-root file vc-bzr-admin-dirname))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
122
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
123 (defun vc-bzr-registered (file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
124 "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
125 (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
126 (vc-bzr-state file))) ; Expensive.
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
127
81477
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
128 (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
129 "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
130 (or (> (buffer-size buffer) 0)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
131 (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
132 (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
133 (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
134 (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
135
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
136 (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
137 "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
138 "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
139
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
140 ;; 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
141 (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
142 (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
143 (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
144 (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
145 (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
146 ;; 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
147 ;; 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
148 ;; | <status>:
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
149 ;; | <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
150 ;; 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
151 ;; 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
152 ;; 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
153 (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
154 (when
81649
e40762570726 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81539
diff changeset
155 (re-search-forward
e40762570726 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81539
diff changeset
156 (concat "^\\(" vc-bzr-state-words "\\):[ \t\n]+"
81477
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
157 (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
158 (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
159 (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
160 (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
161 (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
162 (setq state
81649
e40762570726 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81539
diff changeset
163 (cond
81477
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
164 ((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
165 ((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
166 ((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
167 ;; 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
168 (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
169 (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
170 ;; "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
171 ;; 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
172 ;; 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
173 ;; 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
174 ;; 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
175 ;; 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
176 ;; "bzr" is a user warning, and display it.
81649
e40762570726 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81539
diff changeset
177 (message "Warnings in `bzr' output: %s"
81477
92dd41bc6130 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81446
diff changeset
178 (buffer-substring (point-min) (point-max))))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
179 (when state
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
180 (vc-file-setprop file 'vc-workfile-version
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
181 (vc-bzr-workfile-version file))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
182 (vc-file-setprop file 'vc-state state))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
183 state)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
184
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
185 (defun vc-bzr-workfile-unchanged-p (file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
186 (eq 'up-to-date (vc-bzr-state file)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
187
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
188 (defun vc-bzr-workfile-version (file)
81649
e40762570726 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81539
diff changeset
189 ;; Looks like this could be obtained via counting lines in
e40762570726 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81539
diff changeset
190 ;; .bzr/branch/revision-history.
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
191 (with-temp-buffer
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
192 (vc-bzr-command "revno" t 0 file)
81649
e40762570726 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81539
diff changeset
193 (goto-char (point-min))
e40762570726 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81539
diff changeset
194 (buffer-substring (point) (line-end-position))))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
195
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
196 (defun vc-bzr-checkout-model (file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
197 'implicit)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
198
81982
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81961
diff changeset
199 (defun vc-bzr-create-repo ()
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81961
diff changeset
200 "Create a new BZR repository."
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81961
diff changeset
201 (vc-bzr-command "init" nil 0 nil))
d4b8336cd8f5 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81961
diff changeset
202
81961
ca2e61765033 Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81925
diff changeset
203 (defun vc-bzr-register (files &optional rev comment)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
204 "Register FILE under bzr.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
205 Signal an error unless REV is nil.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
206 COMMENT is ignored."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
207 (if rev (error "Can't register explicit version with bzr"))
81961
ca2e61765033 Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81925
diff changeset
208 (vc-bzr-command "add" nil 0 files))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
209
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
210 ;; 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
211 ;; 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
212 (defalias 'vc-bzr-responsible-p 'vc-bzr-root-dir
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
213 "Return non-nil if FILE is (potentially) controlled by bzr.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
214 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
215 or a superior directory.")
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
216
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
217 (defun vc-bzr-could-register (file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
218 "Return non-nil if FILE could be registered under bzr."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
219 (and (vc-bzr-responsible-p file) ; shortcut
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
220 (condition-case ()
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
221 (with-temp-buffer
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
222 (vc-bzr-command "add" t 0 file "--dry-run")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
223 ;; The command succeeds with no output if file is
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
224 ;; registered (in bzr 0.8).
81649
e40762570726 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81539
diff changeset
225 (goto-char (point-min))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
226 (looking-at "added "))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
227 (error))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
228
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
229 (defun vc-bzr-unregister (file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
230 "Unregister FILE from bzr."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
231 (vc-bzr-command "remove" nil 0 file))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
232
81961
ca2e61765033 Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81925
diff changeset
233 (defun vc-bzr-checkin (files rev comment)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
234 "Check FILE in to bzr with log message COMMENT.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
235 REV non-nil gets an error."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
236 (if rev (error "Can't check in a specific version with bzr"))
81961
ca2e61765033 Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81925
diff changeset
237 (vc-bzr-command "commit" nil 0 files "-m" comment))
81307
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-checkout (file &optional editable rev destfile)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
240 "Checkout revision REV of FILE from bzr to DESTFILE.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
241 EDITABLE is ignored."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
242 (unless destfile
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
243 (setq destfile (vc-version-backup-file-name file rev)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
244 (let ((coding-system-for-read 'binary)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
245 (coding-system-for-write 'binary))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
246 (with-temp-file destfile
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
247 (if rev
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
248 (vc-bzr-command "cat" t 0 file "-r" rev)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
249 (vc-bzr-command "cat" t 0 file)))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
250
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
251 (defun vc-bzr-revert (file &optional contents-done)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
252 (unless contents-done
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
253 (with-temp-buffer (vc-bzr-command "revert" t 'async file))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
254
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
255 (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
256 (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
257 (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
258 (defvar log-view-current-tag-function)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
259
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
260 (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
261 (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
262 (require 'add-log)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
263 ;; Don't have file markers, so use impossible regexp.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
264 (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
265 (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
266 "^ *-+\n *\\(?:revno: \\([0-9]+\\)\\|merged: .+\\)")
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
267 (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
268 ;; 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
269 ;; 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
270 (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
271 ;; 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
272 '(("^ *committer: \
81539
0c6323e48d45 (vc-bzr-log-view-mode): Add + to the email address
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81512
diff changeset
273 \\([^<(]+?\\)[ ]*[(<]\\([[:alnum:]_.+-]+@[[:alnum:]_.-]+\\)[>)]"
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
274 (1 'change-log-name)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
275 (2 'change-log-email))
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
276 ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face))))))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
277
81961
ca2e61765033 Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81925
diff changeset
278 (defun vc-bzr-print-log (files &optional buffer) ; get buffer arg in Emacs 22
ca2e61765033 Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81925
diff changeset
279 "Get bzr change log for FILES into specified BUFFER."
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
280 ;; 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
281 ;; got localized, but certainly it shouldn't use LC_ALL=C.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
282 ;; NB. Can't be async -- see `vc-bzr-post-command-function'.
81961
ca2e61765033 Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81925
diff changeset
283 (vc-bzr-command "log" buffer 0 files)
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
284 ;; 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
285 ;; 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
286 (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
287 (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
288
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
289 (defun vc-bzr-show-log-entry (version)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
290 "Find entry for patch name VERSION in bzr change log buffer."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
291 (goto-char (point-min))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
292 (let (case-fold-search)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
293 (if (re-search-forward (concat "^-+\nrevno: " version "$") nil t)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
294 (beginning-of-line 0)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
295 (goto-char (point-min)))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
296
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
297 ;; Fixem: vc-bzr-wash-log
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
298
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
299 (autoload 'vc-diff-switches-list "vc" nil nil t)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
300
81961
ca2e61765033 Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81925
diff changeset
301 (defun vc-bzr-diff (files &optional rev1 rev2 buffer)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
302 "VC bzr backend for diff."
81961
ca2e61765033 Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81925
diff changeset
303 (let ((working (vc-workfile-version (car files))))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
304 (if (and (equal rev1 working) (not rev2))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
305 (setq rev1 nil))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
306 (if (and (not rev1) rev2)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
307 (setq rev1 working))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
308 ;; NB. Can't be async -- see `vc-bzr-post-command-function'.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
309 ;; bzr diff produces condition code 1 for some reason.
81961
ca2e61765033 Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81925
diff changeset
310 (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 1 files
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
311 "--diff-options" (mapconcat 'identity (vc-diff-switches-list bzr)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
312 " ")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
313 (when rev1
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
314 (if rev2
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
315 (list "-r" (format "%s..%s" rev1 rev2))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
316 (list "-r" rev1))))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
317
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
318 (defalias 'vc-bzr-diff-tree 'vc-bzr-diff)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
319
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
320 ;; Fixme: implement vc-bzr-dir-state, vc-bzr-dired-state-info
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
321
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
322 ;; 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
323 ;; straight integer versions.
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-delete-file (file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
326 "Delete FILE and delete it in the bzr repository."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
327 (condition-case ()
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
328 (delete-file file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
329 (file-error nil))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
330 (vc-bzr-command "remove" nil 0 file))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
331
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
332 (defun vc-bzr-rename-file (old new)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
333 "Rename file from OLD to NEW using `bzr mv'."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
334 (vc-bzr-command "mv" nil 0 new old))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
335
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
336 (defvar vc-bzr-annotation-table nil
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
337 "Internal use.")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
338 (make-variable-buffer-local 'vc-bzr-annotation-table)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
339
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
340 (defun vc-bzr-annotate-command (file buffer &optional version)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
341 "Prepare BUFFER for `vc-annotate' on FILE.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
342 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
343 property containing author and date information."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
344 (apply #'vc-bzr-command "annotate" buffer 0 file "-l" "--all"
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
345 (if version (list "-r" version)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
346 (with-current-buffer buffer
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
347 ;; 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
348 ;; to allow saving space by sharing the text properties.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
349 (setq vc-bzr-annotation-table (make-hash-table :test 'equal))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
350 (goto-char (point-min))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
351 (while (re-search-forward "^\\( *[0-9]+\\) \\(.+\\) +\\([0-9]\\{8\\}\\) |"
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
352 nil t)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
353 (let* ((rev (match-string 1))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
354 (author (match-string 2))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
355 (date (match-string 3))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
356 (key (match-string 0))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
357 (tag (gethash key vc-bzr-annotation-table)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
358 (unless tag
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
359 (save-match-data
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
360 (string-match " +\\'" author)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
361 (setq author (substring author 0 (match-beginning 0))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
362 (setq tag (propertize rev 'help-echo (concat "Author: " author
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
363 ", date: " date)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
364 'mouse-face 'highlight))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
365 (puthash key tag vc-bzr-annotation-table))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
366 (replace-match "")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
367 (insert tag " |")))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
368
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
369 ;; Definition from Emacs 22
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
370 (unless (fboundp 'vc-annotate-convert-time)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
371 (defun vc-annotate-convert-time (time)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
372 "Convert a time value to a floating-point number of days.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
373 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
374 `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
375 (/ (+ (* (float (car time)) (lsh 1 16)) (cadr time)) 24 3600)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
376
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
377 (defun vc-bzr-annotate-time ()
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
378 (when (re-search-forward "^ *[0-9]+ |" nil t)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
379 (let ((prop (get-text-property (line-beginning-position) 'help-echo)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
380 (string-match "[0-9]+\\'" prop)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
381 (vc-annotate-convert-time
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
382 (encode-time 0 0 0
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
383 (string-to-number (substring (match-string 0 prop) 6 8))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
384 (string-to-number (substring (match-string 0 prop) 4 6))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
385 (string-to-number (substring (match-string 0 prop) 0 4))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
386 )))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
387
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
388 (defun vc-bzr-annotate-extract-revision-at-line ()
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
389 "Return revision for current line of annoation buffer, or nil.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
390 Return nil if current line isn't annotated."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
391 (save-excursion
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
392 (beginning-of-line)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
393 (if (looking-at " *\\([0-9]+\\) | ")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
394 (match-string-no-properties 1))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
395
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
396 ;; Not needed for Emacs 22
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
397 (defun vc-bzr-annotate-difference (point)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
398 (let ((next-time (vc-bzr-annotate-time)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
399 (if next-time
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
400 (- (vc-annotate-convert-time (current-time)) next-time))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
401
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
402 ;; 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
403 ;; 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
404 ;; if there are any symbolic links.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
405 (defun vc-bzr-root (dir)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
406 "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
407 ;; 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
408 (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
409 (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
410 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
411 (substring
774e9d2142bd * vc-bzr.el (vc-bzr-root): Cache the output of shell command execution.
Masatake YAMATO <jet@gyve.org>
parents: 81307
diff changeset
412 (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
413
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
414 ;; 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
415 ;; 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
416 ;; changes have been merged.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
417 (defun vc-bzr-dir-state (dir &optional localp)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
418 "Find the VC state of all files in DIR.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
419 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
420 (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
421 (at-start t)
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
422 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
423 ;; 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
424 (unless (file-name-absolute-p bzr-root-directory)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
425 (error "Cannot find bzr repository for directory `%s'" dir))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
426 ;; `bzr ls --versioned' lists all versioned files;
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
427 ;; assume they are up-to-date, unless we are given
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
428 ;; 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
429 (setq at-start t)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
430 (with-temp-buffer
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
431 (vc-bzr-command "ls" t 0 nil "--versioned" "--non-recursive")
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
432 (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
433 (while (or at-start
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
434 (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
435 (setq at-start nil)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
436 (let ((file (expand-file-name
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
437 (buffer-substring-no-properties
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
438 (line-beginning-position) (line-end-position))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
439 bzr-root-directory)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
440 (vc-file-setprop file 'vc-state 'up-to-date)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
441 ;; XXX: is this correct? what happens if one
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
442 ;; mixes different SCMs in the same dir?
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
443 (vc-file-setprop file 'vc-backend 'BZR))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
444 ;; `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
445 (setq at-start t)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
446 (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
447 (vc-bzr-command "status" t 0 nil)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
448 (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
449 (while (or at-start
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
450 (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
451 (setq at-start nil)
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
452 (cond
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
453 ((looking-at "^added")
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
454 (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
455 (setq current-bzr-state 'added))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
456 ((looking-at "^modified")
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
457 (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
458 (setq current-bzr-state 'modified))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
459 ((looking-at "^renamed")
81512
1214f1b9e278 (vc-bzr-dir-state): Use setq rather than set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81477
diff changeset
460 (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
461 (setq current-bzr-state 'renamed))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
462 ((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
463 (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
464 (setq current-bzr-state 'not-versioned))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
465 ((looking-at " ")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
466 ;; file names are indented by two spaces
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
467 (when current-vc-state
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
468 (let ((file (expand-file-name
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
469 (buffer-substring-no-properties
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
470 (match-end 0) (line-end-position))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
471 bzr-root-directory)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
472 (vc-file-setprop file 'vc-state current-vc-state)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
473 (vc-file-setprop file 'vc-bzr-state current-bzr-state)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
474 (when (eq 'added current-bzr-state)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
475 (vc-file-setprop file 'vc-workfile-version "0"))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
476 (when (eq 'not-versioned current-bzr-state)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
477 (let ((file (expand-file-name
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
478 (buffer-substring-no-properties
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
479 (match-end 0) (line-end-position))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
480 bzr-root-directory)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
481 (vc-file-setprop file 'vc-backend 'none)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
482 (vc-file-setprop file 'vc-state nil))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
483 (t
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
484 ;; 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
485 (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
486 (setq current-bzr-state nil)))))))
81307
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
487
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
488 (defun vc-bzr-dired-state-info (file)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
489 "Bzr-specific version of `vc-dired-state-info'."
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
490 (if (eq 'edited (vc-state file))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
491 (let ((bzr-state (vc-file-getprop file 'vc-bzr-state)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
492 (if bzr-state
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
493 (concat "(" (symbol-name bzr-state) ")")
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
494 ;; else fall back to default vc representation
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
495 (vc-default-dired-state-info 'BZR file)))))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
496
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
497 ;; 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
498 ;; way to do it.
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
499 (add-to-list 'vc-handled-backends 'BZR)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
500
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
501 (eval-after-load "vc"
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
502 '(add-to-list 'vc-directory-exclusion-list ".bzr" t))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
503
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
504 (defconst vc-bzr-unload-hook
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
505 (lambda ()
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
506 (setq vc-handled-backends (delq 'BZR vc-handled-backends))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
507 (remove-hook 'vc-post-command-functions 'vc-bzr-post-command-function)))
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
508
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
509 (provide 'vc-bzr)
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
510 ;; arch-tag: 8101bad8-4e92-4e7d-85ae-d8e08b4e7c06
a5186dc625d4 *** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
511 ;;; vc-bzr.el ends here