diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-03-20 07:48:08 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-03-20 07:48:08 +0000 |
| commit | 9c4c634e3e6736d9e3e3a8dcbab197f978902526 (patch) | |
| tree | 8f4d6cbf06c5d1cd3d73629a1ce9b33bef763a88 | |
| parent | 6b189a3222705f6a0604b415cce8d2ab92909394 (diff) | |
| download | emacs-9c4c634e3e6736d9e3e3a8dcbab197f978902526.tar.gz | |
(vc-bzr-print-log): Ensure it works when passed a
single file argument.
(vc-bzr-show-log-entry): Fix typo.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fba2d6a3aef..b1aecb57b2e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 2d0e1a18c3d..c689d70deef 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -375,13 +375,16 @@ EDITABLE is ignored." (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 @@ EDITABLE is ignored." (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))))) |