Commit 6941ffec authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

vc-log-incoming/vc-log-outgoing improvements for Git.

* lisp/vc-git.el (vc-git-log-outgoing): Use the same format as the
short log.
(vc-git-log-incoming): Likewise.  Run "git fetch" before the log command.
parent 54d3626e
...@@ -164,6 +164,9 @@ read a file name from the minibuffer instead of using buffer-file-name. ...@@ -164,6 +164,9 @@ read a file name from the minibuffer instead of using buffer-file-name.
*** New VC commands: vc-log-incoming, vc-log-outgoing, vc-find-conflicted-file. *** New VC commands: vc-log-incoming, vc-log-outgoing, vc-find-conflicted-file.
**** vc-log-incoming for Git runs "git fetch" so that the necessary
data is available locally.
*** New key bindings: C-x v I and C-x v O bound to vc-log-incoming and *** New key bindings: C-x v I and C-x v O bound to vc-log-incoming and
vc-log-outgoing, respectively. vc-log-outgoing, respectively.
......
2010-06-03 Dan Nicolaescu <dann@ics.uci.edu> 2010-06-03 Dan Nicolaescu <dann@ics.uci.edu>
   
vc-log-incoming/vc-log-outgoing improvements for Git.
* vc-git.el (vc-git-log-outgoing): Use the same format as the
short log.
(vc-git-log-incoming): Likewise. Run "git fetch" before the log command.
Add bindings for vc-log-incoming and vc-log-outgoing. Add bindings for vc-log-incoming and vc-log-outgoing.
* vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming * vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming
and vc-log-outgoing. and vc-log-outgoing.
......
...@@ -622,23 +622,29 @@ for the --graph option." ...@@ -622,23 +622,29 @@ for the --graph option."
(when (string-match "\\([^\n]+\\)" remote) (when (string-match "\\([^\n]+\\)" remote)
(setq remote (match-string 1 remote))))))) (setq remote (match-string 1 remote)))))))
(defun vc-git-log-outgoing (buffer remote-location) (defun vc-git-log-outgoing (buffer remote-location)
(interactive) (interactive)
(vc-git-command (vc-git-command
buffer 0 nil buffer 0 nil
"log" (if (string= remote-location "") "log"
(concat (vc-git-compute-remote) "..HEAD") "--no-color" "--graph" "--decorate" "--date=short"
remote-location))) "--pretty=tformat:%d%h %ad %s" "--abbrev-commit"
(concat (if (string= remote-location "")
(vc-git-compute-remote)
remote-location)
"..HEAD")))
(defun vc-git-log-incoming (buffer remote-location) (defun vc-git-log-incoming (buffer remote-location)
(interactive) (interactive)
(vc-git-command nil 0 nil "fetch")
(vc-git-command (vc-git-command
buffer 0 nil buffer 0 nil
"log" (if (string= remote-location "") "log"
(concat "HEAD.." (vc-git-compute-remote)) "--no-color" "--graph" "--decorate" "--date=short"
remote-location))) "--pretty=tformat:%d%h %ad %s" "--abbrev-commit"
(concat "HEAD.." (if (string= remote-location "")
(vc-git-compute-remote)
remote-location))))
(defvar log-view-message-re) (defvar log-view-message-re)
(defvar log-view-file-re) (defvar log-view-file-re)
......
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