[Emacs-diffs] /srv/bzr/emacs/trunk r100526: Add bindings for vc-log-incoming and vc-log-outgoing.

[Dan Nicolaescu]

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

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-05-29 23:50:47 +0000
+++ b/etc/NEWS  2010-06-03 23:08:26 +0000
@@ -164,6 +164,9 @@
 
 *** 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.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-03 17:22:27 +0000
+++ b/lisp/ChangeLog    2010-06-03 23:08:26 +0000
@@ -1,3 +1,11 @@
+2010-06-03  Dan Nicolaescu  <address@hidden>
+
+       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  <address@hidden>
 
        * net/rcirc.el (rcirc-sort-nicknames): Remove.

=== modified file 'lisp/vc-dir.el'
--- a/lisp/vc-dir.el    2010-06-01 07:15:55 +0000
+++ b/lisp/vc-dir.el    2010-06-03 23:08:26 +0000
@@ -188,9 +188,18 @@
     (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]

=== modified file 'lisp/vc-hooks.el'
--- a/lisp/vc-hooks.el  2010-04-09 17:19:53 +0000
+++ b/lisp/vc-hooks.el  2010-06-03 23:08:26 +0000
@@ -942,6 +942,8 @@
     (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)