[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v |
Date: |
Fri, 14 Mar 2008 16:12:34 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/03/14 16:12:33
Index: vc-bzr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-bzr.el,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- vc-bzr.el 14 Mar 2008 01:52:58 -0000 1.28
+++ vc-bzr.el 14 Mar 2008 16:12:30 -0000 1.29
@@ -375,8 +375,7 @@
(define-derived-mode vc-bzr-log-view-mode log-view-mode "Bzr-Log-View"
(remove-hook 'log-view-mode-hook 'vc-bzr-log-view-mode) ;Deactivate the hack.
(require 'add-log)
- ;; Don't have file markers, so use impossible regexp.
- (set (make-local-variable 'log-view-file-re) "\\'\\`")
+ (set (make-local-variable 'log-view-file-re) "^Working file:[ \t]+\\(.+\\)")
(set (make-local-variable 'log-view-message-re)
"^ *-+\n *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)")
(set (make-local-variable 'log-view-font-lock-keywords)
@@ -392,13 +391,23 @@
(defun vc-bzr-print-log (files &optional buffer) ; get buffer arg in Emacs 22
"Get bzr change log for FILES into specified BUFFER."
+ ;; `vc-do-command' creates the buffer, but we need it before running
+ ;; the command.
+ (vc-setup-buffer buffer)
+ ;; If the buffer exists from a previous invocation it might be
+ ;; read-only.
+ (let ((inhibit-read-only t))
;; FIXME: `vc-bzr-command' runs `bzr log' with `LC_MESSAGES=C', so
;; the log display may not what the user wants - but I see no other
;; way of getting the above regexps working.
- (apply 'vc-bzr-command "log" buffer 0 files
+ (dolist (file files)
+ (with-current-buffer buffer
+ ;; Insert the file name so that log-view.el can find it.
+ (insert "Working file: " file "\n")) ;; Like RCS/CVS.
+ (apply 'vc-bzr-command "log" buffer 0 file
(if (stringp vc-bzr-log-switches)
(list vc-bzr-log-switches)
- vc-bzr-log-switches))
+ vc-bzr-log-switches))))
;; FIXME: Until Emacs-23, VC was missing a hook to sort out the mode for
;; the buffer, or at least set the regexps right.
(unless (fboundp 'vc-default-log-view-mode)
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Stefan Monnier, 2008/03/06
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Dan Nicolaescu, 2008/03/13
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v,
Dan Nicolaescu <=
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Stefan Monnier, 2008/03/15
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Dan Nicolaescu, 2008/03/17
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Dan Nicolaescu, 2008/03/17
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Dan Nicolaescu, 2008/03/21
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Dan Nicolaescu, 2008/03/23
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Dan Nicolaescu, 2008/03/24
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Stefan Monnier, 2008/03/24
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Stefan Monnier, 2008/03/28
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Stefan Monnier, 2008/03/28
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v, Dan Nicolaescu, 2008/03/29