Commit 0a670690 authored by Tom Tromey's avatar Tom Tromey
Browse files

vc-log-outgoing fixes for git; add binding to vc-dir

* lisp/vc/vc-dir.el (vc-dir-mode-map): Bind "O" to vc-log-outgoing.
* lisp/vc/vc-git.el (vc-git-log-outgoing, vc-git-log-incoming): Use
async execution.
(vc-git-log-view-mode): Also truncate lines for log-outgoing and
log-incoming.
* lisp/vc/vc.el (vc-log-incoming, vc-log-outgoing): Don't pass nil
as remote-location argument.
parent a4c32272
......@@ -255,6 +255,7 @@ See `run-hooks'."
(define-key map "l" 'vc-print-log) ;; C-x v l
(define-key map "L" 'vc-print-root-log) ;; C-x v L
(define-key map "I" 'vc-log-incoming) ;; C-x v I
(define-key map "O" 'vc-log-outgoing) ;; C-x v O
;; More confusing than helpful, probably
;;(define-key map "R" 'vc-revert) ;; u is taken by vc-dir-unmark.
;;(define-key map "A" 'vc-annotate) ;; g is taken by revert-buffer
......
......@@ -972,7 +972,7 @@ If LIMIT is non-nil, show no more than this many entries."
(defun vc-git-log-outgoing (buffer remote-location)
(interactive)
(vc-git-command
buffer 0 nil
buffer 'async nil
"log"
"--no-color" "--graph" "--decorate" "--date=short"
(format "--pretty=tformat:%s" (car vc-git-root-log-format))
......@@ -986,7 +986,7 @@ If LIMIT is non-nil, show no more than this many entries."
(interactive)
(vc-git-command nil 0 nil "fetch")
(vc-git-command
buffer 0 nil
buffer 'async nil
"log"
"--no-color" "--graph" "--decorate" "--date=short"
(format "--pretty=tformat:%s" (car vc-git-root-log-format))
......@@ -1011,7 +1011,7 @@ If LIMIT is non-nil, show no more than this many entries."
(cadr vc-git-root-log-format)
"^commit *\\([0-9a-z]+\\)"))
;; Allow expanding short log entries.
(when (eq vc-log-view-type 'short)
(when (memq vc-log-view-type '(short log-outgoing log-incoming))
(setq truncate-lines t)
(set (make-local-variable 'log-view-expanded-log-entry-function)
'vc-git-expanded-log-entry))
......
......@@ -2378,8 +2378,8 @@ When called interactively with a prefix argument, prompt for REMOTE-LOCATION."
(let ((backend (vc-deduce-backend)))
(unless backend
(error "Buffer is not version controlled"))
(vc-incoming-outgoing-internal backend remote-location "*vc-incoming*"
'log-incoming)))
(vc-incoming-outgoing-internal backend (or remote-location "")
"*vc-incoming*" 'log-incoming)))
;;;###autoload
(defun vc-log-outgoing (&optional remote-location)
......@@ -2391,8 +2391,8 @@ When called interactively with a prefix argument, prompt for REMOTE-LOCATION."
(let ((backend (vc-deduce-backend)))
(unless backend
(error "Buffer is not version controlled"))
(vc-incoming-outgoing-internal backend remote-location "*vc-outgoing*"
'log-outgoing)))
(vc-incoming-outgoing-internal backend (or remote-location "")
"*vc-outgoing*" 'log-outgoing)))
;;;###autoload
(defun vc-region-history (from to)
......
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