Mercurial > emacs
changeset 92884:62bd4693326e
(vc-bzr-log-view-mode): "." can be part of a revno.
(vc-bzr-show-log-entry): Make regexp match more cases.
(vc-diff-switches-list): Remove autoload, not needed.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 14 Mar 2008 01:52:59 +0000 |
| parents | 150cdc89c68b |
| children | fcf8c2e3b6ef |
| files | lisp/ChangeLog lisp/vc-bzr.el |
| diffstat | 2 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Mar 14 01:02:45 2008 +0000 +++ b/lisp/ChangeLog Fri Mar 14 01:52:59 2008 +0000 @@ -1,3 +1,9 @@ +2008-03-14 Dan Nicolaescu <dann@ics.uci.edu> + + * vc-bzr.el (vc-bzr-log-view-mode): "." can be part of a revno. + (vc-bzr-show-log-entry): Make regexp match more cases. + (vc-diff-switches-list): Remove autoload, not needed. + 2008-03-14 Juri Linkov <juri@jurta.org> * isearch.el (isearch-edit-string): Remove one call to
--- a/lisp/vc-bzr.el Fri Mar 14 01:02:45 2008 +0000 +++ b/lisp/vc-bzr.el Fri Mar 14 01:52:59 2008 +0000 @@ -378,7 +378,7 @@ ;; Don't have file markers, so use impossible regexp. (set (make-local-variable 'log-view-file-re) "\\'\\`") (set (make-local-variable 'log-view-message-re) - "^ *-+\n *\\(?:revno: \\([0-9]+\\)\\|merged: .+\\)") + "^ *-+\n *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)") (set (make-local-variable 'log-view-font-lock-keywords) ;; log-view-font-lock-keywords is careful to use the buffer-local ;; value of log-view-message-re only since Emacs-23. @@ -408,12 +408,15 @@ "Find entry for patch name REVISION in bzr change log buffer." (goto-char (point-min)) (let (case-fold-search) - (if (re-search-forward (concat "^-+\nrevno: " revision "$") nil t) + (if (re-search-forward + ;; "revno:" can appear either at the beginning of a line, or indented. + (concat "^[ ]*-+\n[ ]*revno: " + ;; The revision can contain ".", quote it so that it + ;; does not interfere with regexp matching. + (regexp-quote revision) "$") nil t) (beginning-of-line 0) (goto-char (point-min))))) -(autoload 'vc-diff-switches-list "vc" nil nil t) - (defun vc-bzr-diff (files &optional rev1 rev2 buffer) "VC bzr backend for diff." ;; `bzr diff' exits with code 1 if diff is non-empty