Add bindings for vc-log-incoming and vc-log-outgoing.

* lisp/vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming
and vc-log-outgoing.
* lisp/vc-dir.el (vc-dir-menu-map): Add menu bindings for vc-log-incoming
and vc-log-outgoing.

diff --git a/etc/NEWS b/etc/NEWS
index 62fe1ce1a86e6e9dc18c2efd2e801b1552ab9d0c..58546d31bb6d0e4ea3155322a83a5e10de64907e 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -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 key bindings: C-x v I and C-x v O bound to vc-log-incoming and
+vc-log-outgoing, respectively.
+
 *** vc-dir for Bzr supports viewing shelve contents and shelving snapshots.
 
 *** Special markup can be added to log-edit buffers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c5d7349381246e5e742063601f92bf00f58429d..e037c2579b89cc6edc7fa58135efadc5422420d0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-03  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       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.
+       * vc-dir.el (vc-dir-menu-map): Add menu bindings for vc-log-incoming
+       and vc-log-outgoing.
+
 2010-06-03  Chong Yidong  <cyd@stupidchicken.com>
 
        * net/rcirc.el (rcirc-sort-nicknames): Remove.

diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index 44f0fed0806002cd62a574dc3fcf9572d1c1a398..3d6bd328f16f166bfa54b9a08281058dd2012abb 100644 (file)
--- a/lisp/vc-dir.el
+++ b/lisp/vc-dir.el
@@ -188,9 +188,18 @@ See `run-hooks'."
     (define-key map [diff]
       '(menu-item "Compare with Base Version" vc-diff
                  :help "Compare file set with the base version"))
+    (define-key map [logo]
+      '(menu-item "Show Outgoing Log" vc-log-outgoing
+                 :help "Show a log of changes that will be sent with a push operation"))
+    (define-key map [logi]
+      '(menu-item "Show Incoming Log" vc-log-incoming
+                 :help "Show a log of changes that will be received with a pull operation"))
     (define-key map [log]
-     '(menu-item "Show history" vc-print-log
-     :help "List the change log of the current file set in a window"))
+      '(menu-item "Show history" vc-print-log
+                 :help "List the change log of the current file set in a window"))
+    (define-key map [rlog]
+      '(menu-item "Show Top of the Tree History " vc-print-root-log
+                 :help "List the change log for the current tree in a window"))
     ;; VC commands.
     (define-key map [sepvccmd] '("--"))
     (define-key map [update]

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index ab9972a7e44189b0178ffda31cc60137fb7704d4..6735bf7a9ee25bcfb2166fe01922e421f2634822 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -942,6 +942,8 @@ current, and kill the buffer that visits the link."
     (define-key map "i" 'vc-register)
     (define-key map "l" 'vc-print-log)
     (define-key map "L" 'vc-print-root-log)
+    (define-key map "I" 'vc-log-incoming)
+    (define-key map "O" 'vc-log-outgoing)
     (define-key map "m" 'vc-merge)
     (define-key map "r" 'vc-retrieve-tag)
     (define-key map "s" 'vc-create-tag)