Mercurial > emacs
changeset 108885:b008fff91985
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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 03 Jun 2010 16:26:39 -0700 |
| parents | ac4bf6e2c535 |
| children | 0ed39249e8e4 |
| files | etc/NEWS lisp/ChangeLog lisp/vc-git.el |
| diffstat | 3 files changed, 22 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Thu Jun 03 16:08:26 2010 -0700 +++ b/etc/NEWS Thu Jun 03 16:26:39 2010 -0700 @@ -164,6 +164,9 @@ *** 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.
--- a/lisp/ChangeLog Thu Jun 03 16:08:26 2010 -0700 +++ b/lisp/ChangeLog Thu Jun 03 16:26:39 2010 -0700 @@ -1,5 +1,10 @@ 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. * vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming and vc-log-outgoing.
--- a/lisp/vc-git.el Thu Jun 03 16:08:26 2010 -0700 +++ b/lisp/vc-git.el Thu Jun 03 16:26:39 2010 -0700 @@ -622,23 +622,29 @@ (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)