Mercurial > emacs
changeset 80340:756c7bbc9664
(vc-bzr-log-view-mode, vc-bzr-annotate-command)
(vc-bzr-annotate-time, vc-bzr-annotate-extract-revision-at-line):
Revision numbers can include ".".
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 18 Mar 2008 20:52:17 +0000 |
| parents | 448b3f1d280a |
| children | 25f843ea0096 |
| files | lisp/ChangeLog lisp/vc-bzr.el |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Mar 18 20:49:52 2008 +0000 +++ b/lisp/ChangeLog Tue Mar 18 20:52:17 2008 +0000 @@ -1,5 +1,9 @@ 2008-03-18 Stefan Monnier <monnier@iro.umontreal.ca> + * vc-bzr.el (vc-bzr-log-view-mode, vc-bzr-annotate-command) + (vc-bzr-annotate-time, vc-bzr-annotate-extract-revision-at-line): + Revision numbers can include ".". + * diff-mode.el (diff-end-of-hunk): Be careful not to overlook trailing "+" lines not accounted for by counting "-" and context lines.
--- a/lisp/vc-bzr.el Tue Mar 18 20:49:52 2008 +0000 +++ b/lisp/vc-bzr.el Tue Mar 18 20:52:17 2008 +0000 @@ -357,7 +357,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. @@ -436,7 +436,7 @@ ;; 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]+ *\\) \\([^\n ]+\\) +\\([0-9]\\{8\\}\\) |" + (while (re-search-forward "^\\( *[0-9.]+ *\\) \\([^\n ]+\\) +\\([0-9]\\{8\\}\\) |" nil t) (let* ((rev (match-string 1)) (author (match-string 2)) @@ -452,7 +452,7 @@ (insert tag " |"))))) (defun vc-bzr-annotate-time () - (when (re-search-forward "^ *[0-9]+ +|" nil t) + (when (re-search-forward "^ *[0-9.]+ +|" nil t) (let ((prop (get-text-property (line-beginning-position) 'help-echo))) (string-match "[0-9]+\\'" prop) (vc-annotate-convert-time @@ -467,7 +467,7 @@ Return nil if current line isn't annotated." (save-excursion (beginning-of-line) - (if (looking-at " *\\([0-9]+\\) | ") + (if (looking-at " *\\([0-9.]+\\) | ") (match-string-no-properties 1)))) (defun vc-bzr-command-discarding-stderr (command &rest args)