Mercurial > emacs
changeset 98220:962e4709829b
* vc-bzr.el (vc-bzr-show-log-entry):
* vc-git.el (vc-git-show-log-entry): Deal with a nil argument,
C-x v l for a directory uses that.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 18 Sep 2008 17:01:41 +0000 |
| parents | bc71ea30073c |
| children | 72976c727c57 |
| files | lisp/ChangeLog lisp/vc-bzr.el lisp/vc-git.el |
| diffstat | 3 files changed, 24 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Sep 18 15:02:59 2008 +0000 +++ b/lisp/ChangeLog Thu Sep 18 17:01:41 2008 +0000 @@ -1,3 +1,9 @@ +2008-09-18 Dan Nicolaescu <dann@ics.uci.edu> + + * vc-bzr.el (vc-bzr-show-log-entry): + * vc-git.el (vc-git-show-log-entry): Deal with a nil argument, + C-x v l for a directory uses that. + 2008-09-18 Simon Josefsson <simon@josefsson.org> * files.el (auto-mode-alist): Use sieve-mode for .sv, .siv, and
--- a/lisp/vc-bzr.el Thu Sep 18 15:02:59 2008 +0000 +++ b/lisp/vc-bzr.el Thu Sep 18 17:01:41 2008 +0000 @@ -468,15 +468,17 @@ (defun vc-bzr-show-log-entry (revision) "Find entry for patch name REVISION in bzr change log buffer." (goto-char (point-min)) - (let (case-fold-search) - (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))))) + (when revision + (let (case-fold-search) + (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)))))) (defun vc-bzr-diff (files &optional rev1 rev2 buffer) "VC bzr backend for diff."
--- a/lisp/vc-git.el Thu Sep 18 15:02:59 2008 +0000 +++ b/lisp/vc-git.el Thu Sep 18 17:01:41 2008 +0000 @@ -491,12 +491,13 @@ REVISION may have the form BRANCH, BRANCH~N, or BRANCH^ (where \"^\" can be repeated)." (goto-char (point-min)) - (search-forward "\ncommit" nil t - (cond ((string-match "~\\([0-9]\\)$" revision) - (1+ (string-to-number (match-string 1 revision)))) - ((string-match "\\^+$" revision) - (1+ (length (match-string 0 revision)))) - (t nil))) + (when revision + (search-forward "\ncommit" nil t + (cond ((string-match "~\\([0-9]\\)$" revision) + (1+ (string-to-number (match-string 1 revision)))) + ((string-match "\\^+$" revision) + (1+ (length (match-string 0 revision)))) + (t nil)))) (beginning-of-line)) (defun vc-git-diff (files &optional rev1 rev2 buffer)