Commit 89d98000 authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

* 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.
parent 8a28dd0b
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
......
......@@ -468,15 +468,17 @@ REV non-nil gets an error."
(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."
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment