[Emacs-diffs] /srv/bzr/emacs/trunk r100527: vc-log-incoming/vc-log-outgoing improvements for Git.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 100527
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Thu 2010-06-03 16:26:39 -0700
message:
  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.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/vc-git.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-06-03 23:08:26 +0000
+++ b/etc/NEWS  2010-06-03 23:26:39 +0000
@@ -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.
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-03 23:08:26 +0000
+++ b/lisp/ChangeLog    2010-06-03 23:26:39 +0000
@@ -1,5 +1,10 @@
 2010-06-03  Dan Nicolaescu  <address@hidden>
 
+       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.

=== modified file 'lisp/vc-git.el'
--- a/lisp/vc-git.el    2010-06-01 10:40:09 +0000
+++ b/lisp/vc-git.el    2010-06-03 23:26:39 +0000
@@ -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)