Mercurial > emacs
changeset 108901:10652acf752a
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 03 Jun 2010 23:18:01 +0000 |
| parents | ff2d80da1816 (current diff) ac4bf6e2c535 (diff) |
| children | 1f795f817d05 |
| files | |
| diffstat | 4 files changed, 24 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Thu Jun 03 22:45:12 2010 +0000 +++ b/etc/NEWS Thu Jun 03 23:18:01 2010 +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.
--- a/lisp/ChangeLog Thu Jun 03 22:45:12 2010 +0000 +++ b/lisp/ChangeLog Thu Jun 03 23:18:01 2010 +0000 @@ -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.
--- a/lisp/vc-dir.el Thu Jun 03 22:45:12 2010 +0000 +++ b/lisp/vc-dir.el Thu Jun 03 23:18:01 2010 +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]
--- a/lisp/vc-hooks.el Thu Jun 03 22:45:12 2010 +0000 +++ b/lisp/vc-hooks.el Thu Jun 03 23:18:01 2010 +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)