[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: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v |
Date: |
Tue, 09 Oct 2007 08:53:05 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 07/10/09 08:52:58
Index: lisp/vc-bzr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-bzr.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- lisp/vc-bzr.el 6 Sep 2007 19:46:17 -0000 1.15
+++ lisp/vc-bzr.el 9 Oct 2007 08:52:46 -0000 1.16
@@ -5,7 +5,7 @@
;; Author: Dave Love <address@hidden>, Riccardo Murri <address@hidden>
;; Keywords: tools
;; Created: Sept 2006
-;; Version: 2007-08-03
+;; Version: 2007-09-05
;; URL: http://launchpad.net/vc-bzr
;; This file is free software; you can redistribute it and/or modify
@@ -164,7 +164,7 @@
(lexical-let*
((filename* (expand-file-name filename))
(rootdir (vc-bzr-root (file-name-directory filename*))))
- (and rootdir
+ (when rootdir
(file-relative-name filename* rootdir))))
;; FIXME: Also get this in a non-registered sub-directory.
@@ -200,13 +200,13 @@
(if (file-directory-p file) "/?" "")
"[ \t\n]*$")
nil t)
- (let ((status (match-string 1)))
+ (lexical-let ((statusword (match-string 1)))
;; Erase the status text that matched.
(delete-region (match-beginning 0) (match-end 0))
(setq status
(and (equal ret 0) ; Seems redundant. --Stef
(intern (replace-regexp-in-string " " ""
- status))))))
+ statusword))))))
(when status
(goto-char (point-min))
(skip-chars-forward " \n\t") ;Throw away spaces.
@@ -241,12 +241,12 @@
(defun vc-bzr-workfile-version (file)
(lexical-let*
((rootdir (vc-bzr-root file))
- (branch-format-file (concat rootdir "/"
vc-bzr-admin-branch-format-file))
- (revhistory-file (concat rootdir "/" vc-bzr-admin-revhistory))
- (lastrev-file (concat rootdir "/" vc-bzr-admin-lastrev)))
- ;; Count lines in .bzr/branch/revision-history to avoid forking a
- ;; bzr process. This looks at internal files. May break if they
- ;; change their format.
+ (branch-format-file (expand-file-name vc-bzr-admin-branch-format-file
+ rootdir))
+ (revhistory-file (expand-file-name vc-bzr-admin-revhistory rootdir))
+ (lastrev-file (expand-file-name vc-bzr-admin-lastrev rootdir)))
+ ;; This looks at internal files to avoid forking a bzr process.
+ ;; May break if they change their format.
(if (file-exists-p branch-format-file)
(with-temp-buffer
(insert-file-contents branch-format-file)
@@ -261,7 +261,6 @@
((looking-at "Bazaar Branch Format 6 (bzr 0.15)")
;; revno is the first number in .bzr/branch/last-revision
(insert-file-contents lastrev-file)
- (goto-char (line-end-position))
(if (re-search-forward "[0-9]+" nil t)
(buffer-substring (match-beginning 0) (match-end 0))))))
;; fallback to calling "bzr revno"
@@ -417,14 +416,14 @@
"Prepare BUFFER for `vc-annotate' on FILE.
Each line is tagged with the revision number, which has a `help-echo'
property containing author and date information."
- (apply #'vc-bzr-command "annotate" buffer 0 file "-l" "--all"
+ (apply #'vc-bzr-command "annotate" buffer 0 file "--long" "--all"
(if version (list "-r" version)))
(with-current-buffer buffer
;; Store the tags for the annotated source lines in a hash table
;; to allow saving space by sharing the text properties.
(setq vc-bzr-annotation-table (make-hash-table :test 'equal))
(goto-char (point-min))
- (while (re-search-forward "^\\( *[0-9]+\\) \\(.+\\) +\\([0-9]\\{8\\}\\) |"
+ (while (re-search-forward "^\\( *[0-9]+\\) +\\(.+\\) +\\([0-9]\\{8\\}\\) |"
nil t)
(let* ((rev (match-string 1))
(author (match-string 2))
@@ -432,9 +431,6 @@
(key (match-string 0))
(tag (gethash key vc-bzr-annotation-table)))
(unless tag
- (save-match-data
- (string-match " +\\'" author)
- (setq author (substring author 0 (match-beginning 0))))
(setq tag (propertize rev 'help-echo (concat "Author: " author
", date: " date)
'mouse-face 'highlight))
@@ -575,7 +571,6 @@
(eval-after-load "vc"
'(add-to-list 'vc-directory-exclusion-list vc-bzr-admin-dirname t))
-
(provide 'vc-bzr)
;; arch-tag: 8101bad8-4e92-4e7d-85ae-d8e08b4e7c06
;;; vc-bzr.el ends here
- [Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v,
Miles Bader <=