aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2010-06-03 16:08:26 -0700
committerDan Nicolaescu2010-06-03 16:08:26 -0700
commit54d3626e26da1d3d094e6182c308bb2ca968d691 (patch)
treefde4cbe3cb4d27a68915ef00591a3725a125f8cd
parentd8198da06bc90f4d3857fccf668bcc7c46a41a38 (diff)
downloademacs-54d3626e26da1d3d094e6182c308bb2ca968d691.tar.gz
emacs-54d3626e26da1d3d094e6182c308bb2ca968d691.zip
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.
-rw-r--r--etc/NEWS3
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/vc-dir.el13
-rw-r--r--lisp/vc-hooks.el2
4 files changed, 24 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 62fe1ce1a86..58546d31bb6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -164,6 +164,9 @@ read a file name from the minibuffer instead of using buffer-file-name.
164 164
165*** New VC commands: vc-log-incoming, vc-log-outgoing, vc-find-conflicted-file. 165*** New VC commands: vc-log-incoming, vc-log-outgoing, vc-find-conflicted-file.
166 166
167*** New key bindings: C-x v I and C-x v O bound to vc-log-incoming and
168vc-log-outgoing, respectively.
169
167*** vc-dir for Bzr supports viewing shelve contents and shelving snapshots. 170*** vc-dir for Bzr supports viewing shelve contents and shelving snapshots.
168 171
169*** Special markup can be added to log-edit buffers. 172*** Special markup can be added to log-edit buffers.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c5d7349381..e037c2579b8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12010-06-03 Dan Nicolaescu <dann@ics.uci.edu>
2
3 Add bindings for vc-log-incoming and vc-log-outgoing.
4 * vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming
5 and vc-log-outgoing.
6 * vc-dir.el (vc-dir-menu-map): Add menu bindings for vc-log-incoming
7 and vc-log-outgoing.
8
12010-06-03 Chong Yidong <cyd@stupidchicken.com> 92010-06-03 Chong Yidong <cyd@stupidchicken.com>
2 10
3 * net/rcirc.el (rcirc-sort-nicknames): Remove. 11 * net/rcirc.el (rcirc-sort-nicknames): Remove.
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index 44f0fed0806..3d6bd328f16 100644
--- a/lisp/vc-dir.el
+++ b/lisp/vc-dir.el
@@ -188,9 +188,18 @@ See `run-hooks'."
188 (define-key map [diff] 188 (define-key map [diff]
189 '(menu-item "Compare with Base Version" vc-diff 189 '(menu-item "Compare with Base Version" vc-diff
190 :help "Compare file set with the base version")) 190 :help "Compare file set with the base version"))
191 (define-key map [logo]
192 '(menu-item "Show Outgoing Log" vc-log-outgoing
193 :help "Show a log of changes that will be sent with a push operation"))
194 (define-key map [logi]
195 '(menu-item "Show Incoming Log" vc-log-incoming
196 :help "Show a log of changes that will be received with a pull operation"))
191 (define-key map [log] 197 (define-key map [log]
192 '(menu-item "Show history" vc-print-log 198 '(menu-item "Show history" vc-print-log
193 :help "List the change log of the current file set in a window")) 199 :help "List the change log of the current file set in a window"))
200 (define-key map [rlog]
201 '(menu-item "Show Top of the Tree History " vc-print-root-log
202 :help "List the change log for the current tree in a window"))
194 ;; VC commands. 203 ;; VC commands.
195 (define-key map [sepvccmd] '("--")) 204 (define-key map [sepvccmd] '("--"))
196 (define-key map [update] 205 (define-key map [update]
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index ab9972a7e44..6735bf7a9ee 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -942,6 +942,8 @@ current, and kill the buffer that visits the link."
942 (define-key map "i" 'vc-register) 942 (define-key map "i" 'vc-register)
943 (define-key map "l" 'vc-print-log) 943 (define-key map "l" 'vc-print-log)
944 (define-key map "L" 'vc-print-root-log) 944 (define-key map "L" 'vc-print-root-log)
945 (define-key map "I" 'vc-log-incoming)
946 (define-key map "O" 'vc-log-outgoing)
945 (define-key map "m" 'vc-merge) 947 (define-key map "m" 'vc-merge)
946 (define-key map "r" 'vc-retrieve-tag) 948 (define-key map "r" 'vc-retrieve-tag)
947 (define-key map "s" 'vc-create-tag) 949 (define-key map "s" 'vc-create-tag)