diff options
| -rw-r--r-- | etc/NEWS | 3 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-git.el | 22 |
3 files changed, 22 insertions, 8 deletions
@@ -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. +**** 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 vc-log-outgoing, respectively. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e037c2579b..8af8ba4d07 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2010-06-03 Dan Nicolaescu <[email protected]> + 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. * vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming and vc-log-outgoing. diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 4f67e1b067..145c44d9b4 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -622,23 +622,29 @@ for the --graph option." (when (string-match "\\([^\n]+\\)" remote) (setq remote (match-string 1 remote))))))) - (defun vc-git-log-outgoing (buffer remote-location) (interactive) (vc-git-command buffer 0 nil - "log" (if (string= remote-location "") - (concat (vc-git-compute-remote) "..HEAD") - remote-location))) - + "log" + "--no-color" "--graph" "--decorate" "--date=short" + "--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) (interactive) + (vc-git-command nil 0 nil "fetch") (vc-git-command buffer 0 nil - "log" (if (string= remote-location "") - (concat "HEAD.." (vc-git-compute-remote)) - remote-location))) + "log" + "--no-color" "--graph" "--decorate" "--date=short" + "--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-file-re) |