Mercurial > emacs
changeset 80356:a88ae58b9053
(vc-bzr-print-log): Ensure it works when passed a
single file argument.
(vc-bzr-show-log-entry): Fix typo.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 20 Mar 2008 07:48:08 +0000 |
| parents | 35dfb85c0e6b |
| children | 949b65c7d0c6 |
| files | lisp/ChangeLog lisp/vc-bzr.el |
| diffstat | 2 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Mar 20 06:15:05 2008 +0000 +++ b/lisp/ChangeLog Thu Mar 20 07:48:08 2008 +0000 @@ -1,3 +1,9 @@ +2008-03-20 Dan Nicolaescu <dann@ics.uci.edu> + + * vc-bzr.el (vc-bzr-print-log): Ensure it works when passed a + single file argument. + (vc-bzr-show-log-entry): Fix typo. + 2008-03-19 Wilson Snyder <wsnyder@wsnyder.org> * progmodes/verilog-mode.el (verilog-easy-menu-filter): New
--- a/lisp/vc-bzr.el Thu Mar 20 06:15:05 2008 +0000 +++ b/lisp/vc-bzr.el Thu Mar 20 07:48:08 2008 +0000 @@ -375,13 +375,16 @@ (vc-setup-buffer buffer) ;; If the buffer exists from a previous invocation it might be ;; read-only. - (let ((inhibit-read-only t)) + (let ((inhibit-read-only t) + ;; Support both the old print-log interface that passes a + ;; single file, and the new one that passes a file list. + (flist (if (listp files) files (list files)))) ;; 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. ;; "bzr log" (as of bzr-1.1) can only take a single file argument. ;; Loop through the file list. - (dolist (file files) + (dolist (file flist) (with-current-buffer buffer ;; Insert the file name so that log-view.el can find it. (insert "Working file: " file "\n")) ;; Like RCS/CVS. @@ -403,7 +406,7 @@ (concat "^[ ]*-+\n[ ]*revno: " ;; The revision can contain ".", quote it so that it ;; does not interfere with regexp matching. - (regexp-quote revision) "$") nil t) + (regexp-quote version) "$") nil t) (beginning-of-line 0) (goto-char (point-min)))))