diff options
| author | Chong Yidong | 2010-10-31 23:13:42 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-10-31 23:13:42 -0400 |
| commit | 98cfec0d6935f25a54852caaa33112ea1ca4634b (patch) | |
| tree | 95822bce29eaee01ee15f79a24405489e2eaf8d5 /lisp/ChangeLog | |
| parent | 6aad7ea061dac5966904f6a6b4f36816d9c87d10 (diff) | |
| download | emacs-98cfec0d6935f25a54852caaa33112ea1ca4634b.tar.gz emacs-98cfec0d6935f25a54852caaa33112ea1ca4634b.zip | |
Backport VC improvements from trunk.
* vc/log-edit.el (log-edit-rewrite-fixes): New var.
(log-edit-author): New dynamic var.
(log-edit-changelog-ours-p, log-edit-insert-changelog-entries):
Use it to return the author if different from committer.
(log-edit-insert-changelog): Use them to add Author: and Fixes headers.
* vc/vc-hooks.el (vc-default-mode-line-string): Doc fix.
* vc/vc.el (vc-deduce-backend): New fun. Handle diff buffers.
(vc-root-diff, vc-print-root-log, vc-log-incoming)
(vc-log-outgoing): Use it.
(vc-diff-internal): Set diff-vc-backend.
* vc/diff-mode.el (diff-vc-backend): New var.
* vc/vc.el (vc-diff-internal): Set `revert-buffer-function'
buffer-locally to lambda that re-runs the vc diff command.
(Bug#6447)
* vc/log-view.el (log-view-mode-map): Bind revert-buffer.
Make 'g' (AKA revert-buffer) rerun VC log, log-incoming and
log-outgoing commands.
* vc/vc.el (vc-log-internal-common): Add a new argument and use it
to create a buffer local revert-buffer-function variable.
(vc-print-log-internal, vc-log-incoming, vc-log-outgoing): Pass a
revert-buffer-function lambda.
Improve VC create/retrieve tag/branch.
* vc.el (vc-create-tag): Do not read the directory name for VCs
with repository revision granularity. Adjust the tag/branch
prompt. Reset VC properties.
(vc-retrieve-tag): Do not read the directory name for VCs
with repository revision granularity. Reset VC properties.
Add optional support for resetting VC properties.
* vc-dispatcher.el (vc-resynch-window): Add new optional argument,
call vc-file-clearprops when true.
(vc-resynch-buffer): Add new optional argument, pass it down.
(vc-resynch-buffers-in-directory): Likewise.
Improve support for special markup in the VC commit message.
* vc-mtn.el (vc-mtn-checkin): Support Author: and Date: markup.
* vc-hg.el (vc-hg-checkin): Add support for Date:.
* vc-git.el (vc-git-checkin):
* vc-bzr.el (vc-bzr-checkin): Likewise.
Add support for vc-log-incoming, improve vc-log-outgoing for Git.
* vc-git.el (vc-git-log-view-mode): Fix font lock for
incoming/outgoing logs.
(vc-git-log-outgoing, vc-git-log-incoming): New functions.
* 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.
* vc-dir.el (vc-dir-menu-map): Add menu bindings for vc-log-incoming
and vc-log-outgoing.
Improve state updating for VC tag commands.
* vc.el (vc-create-tag, vc-retrieve-tag): Call vc-resynch-buffer
to update the state of all buffers in the directory.
* vc-dir.el (vc-dir): Don't pop-up-windows. (Bug#6204)
* vc.el (vc-checkin, vc-modify-change-comment):
Adjust to new vc-start/finish-logentry.
(vc-find-conflicted-file): New command.
(vc-transfer-file): Adjust to new vc-checkin.
(vc-next-action): Improve scoping.
* vc-git.el (vc-git-checkin): Use log-edit-extract-headers.
(vc-git-commits-coding-system): Rename from git-commits-coding-system.
* vc-dispatcher.el (vc-log-edit): Shorten names for
log-edit-show-files.
* vc-bzr.el (vc-bzr-checkin): Use log-edit-extract-headers.
(vc-bzr-conflicted-files): New function.
* log-edit.el (log-edit-summary, log-edit-header)
(log-edit-unknown-header): New faces.
(log-edit-headers-alist): New var.
(log-edit-header-contents-regexp): New const.
(log-edit-match-to-eoh): New function.
(log-edit-font-lock-keywords): Use them.
(log-edit): Insert a "Summary:" header as default.
(log-edit-mode): Mark font-lock rules as case-insensitive.
(log-edit-done): Cleanup headers.
(log-edit-extract-headers): New function to replace it.
* vc-dispatcher.el (vc-finish-logentry): Don't mess so badly with
the windows/frames.
* vc-bzr.el (vc-bzr-shelve-apply): Don't use *vc-bzr-shelve*.
* vc-dir.el (vc-dir-kill-line): New command.
(vc-dir-mode-map): Bind it to C-k.
(vc-dir-headers): Abbreviate the working dir.
* vc-git.el (vc-git-revision-table): Include remote branches.
New VC methods: vc-log-incoming and vc-log-outgoing.
* vc.el (vc-print-log-setup-buttons, vc-log-internal-common)
(vc-incoming-outgoing-internal, vc-log-incoming, vc-log-outgoing):
New functions.
(vc-print-log-internal): Just call vc-log-internal-common.
(vc-log-view-type): New permanent local variable.
* vc-hooks.el (vc-menu-map): Bind vc-log-incoming and vc-log-outgoing.
* vc-bzr.el (vc-bzr-log-view-mode): Use vc-log-view-type instead
of the dynamic bound vc-short-log.
(vc-bzr-log-incoming, vc-bzr-log-outgoing): New functions.
* vc-git.el (vc-git-log-outgoing): New function.
(vc-git-log-view-mode): Use vc-log-view-type instead
of the dynamic bound vc-short-log.
* vc-hg.el (vc-hg-log-view-mode): Use vc-log-view-type instead of
the dynamic bound vc-short-log. Highlight the tag.
(vc-hg-log-incoming, vc-hg-log-outgoing): New functions.
(vc-hg-outgoing, vc-hg-incoming, vc-hg-outgoing-mode):
(vc-hg-incoming-mode): Remove.
(vc-hg-extra-menu-map): Do not bind vc-hg-incoming and vc-hg-outgoing.
Fix default-directory for vc-root-diff.
* vc.el (vc-root-diff): Bind default-directory to the root
directory for the diff command.
* vc-hg.el (vc-hg-push, vc-hg-pull): Use `apply' when calling
`vc-hg-command' with a list of flags.
* vc-bzr.el (vc-bzr-log-edit-mode): Add --fixes support to
log-edit-before-checkin-process.
* vc.el (vc-modify-change-comment): Pass MODE to vc-start-logentry.
* vc-bzr.el, vc-hg.el (log-edit-mode): Declare.
* vc-dispatcher.el (vc-start-logentry): Doc fix.
(log-view-process-buffer, log-edit-extra-flags): Declare.
Add special markup processing for commit logs.
* log-edit.el (log-edit): Add new argument MODE. Use that mode
when non-nil instead of the log-view-mode.
* vc.el (vc-default-log-edit-mode): New function.
* vc-dispatcher.el (vc-log-edit): Add a mode argument, pass it to
log-edit.
Support for shelving snapshots and for showing shelves.
* vc-bzr.el (vc-bzr-shelve-show, vc-bzr-shelve-show-at-point)
(vc-bzr-shelve-apply-and-keep-at-point, vc-bzr-shelve-snapshot):
New functions.
(vc-bzr-shelve-map, vc-bzr-shelve-menu-map)
(vc-bzr-extra-menu-map): Map them.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 185 |
1 files changed, 185 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3944fdebc69..d2a1713ed27 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,188 @@ | |||
| 1 | 2010-10-31 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * vc/log-edit.el (log-edit-rewrite-fixes): New var. | ||
| 4 | (log-edit-author): New dynamic var. | ||
| 5 | (log-edit-changelog-ours-p, log-edit-insert-changelog-entries): | ||
| 6 | Use it to return the author if different from committer. | ||
| 7 | (log-edit-insert-changelog): Use them to add Author: and Fixes headers. | ||
| 8 | |||
| 9 | 2010-10-31 Eli Zaretskii <eliz@gnu.org> | ||
| 10 | |||
| 11 | * vc/vc-hooks.el (vc-default-mode-line-string): Doc fix. | ||
| 12 | |||
| 13 | 2010-10-31 Chong Yidong <cyd@stupidchicken.com> | ||
| 14 | |||
| 15 | * vc/vc.el (vc-deduce-backend): New fun. Handle diff buffers. | ||
| 16 | (vc-root-diff, vc-print-root-log, vc-log-incoming) | ||
| 17 | (vc-log-outgoing): Use it. | ||
| 18 | (vc-diff-internal): Set diff-vc-backend. | ||
| 19 | |||
| 20 | * vc/diff-mode.el (diff-vc-backend): New var. | ||
| 21 | |||
| 22 | 2010-10-31 Juri Linkov <juri@jurta.org> | ||
| 23 | |||
| 24 | * vc/vc.el (vc-diff-internal): Set `revert-buffer-function' | ||
| 25 | buffer-locally to lambda that re-runs the vc diff command. | ||
| 26 | (Bug#6447) | ||
| 27 | |||
| 28 | 2010-10-31 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 29 | |||
| 30 | * vc/log-view.el (log-view-mode-map): Bind revert-buffer. | ||
| 31 | |||
| 32 | Make 'g' (AKA revert-buffer) rerun VC log, log-incoming and | ||
| 33 | log-outgoing commands. | ||
| 34 | * vc/vc.el (vc-log-internal-common): Add a new argument and use it | ||
| 35 | to create a buffer local revert-buffer-function variable. | ||
| 36 | (vc-print-log-internal, vc-log-incoming, vc-log-outgoing): Pass a | ||
| 37 | revert-buffer-function lambda. | ||
| 38 | |||
| 39 | Improve VC create/retrieve tag/branch. | ||
| 40 | * vc.el (vc-create-tag): Do not read the directory name for VCs | ||
| 41 | with repository revision granularity. Adjust the tag/branch | ||
| 42 | prompt. Reset VC properties. | ||
| 43 | (vc-retrieve-tag): Do not read the directory name for VCs | ||
| 44 | with repository revision granularity. Reset VC properties. | ||
| 45 | |||
| 46 | Add optional support for resetting VC properties. | ||
| 47 | * vc-dispatcher.el (vc-resynch-window): Add new optional argument, | ||
| 48 | call vc-file-clearprops when true. | ||
| 49 | (vc-resynch-buffer): Add new optional argument, pass it down. | ||
| 50 | (vc-resynch-buffers-in-directory): Likewise. | ||
| 51 | |||
| 52 | Improve support for special markup in the VC commit message. | ||
| 53 | * vc-mtn.el (vc-mtn-checkin): Support Author: and Date: markup. | ||
| 54 | * vc-hg.el (vc-hg-checkin): Add support for Date:. | ||
| 55 | * vc-git.el (vc-git-checkin): | ||
| 56 | * vc-bzr.el (vc-bzr-checkin): Likewise. | ||
| 57 | |||
| 58 | Add support for vc-log-incoming, improve vc-log-outgoing for Git. | ||
| 59 | * vc-git.el (vc-git-log-view-mode): Fix font lock for | ||
| 60 | incoming/outgoing logs. | ||
| 61 | (vc-git-log-outgoing, vc-git-log-incoming): New functions. | ||
| 62 | |||
| 63 | * vc-git.el (vc-git-log-outgoing): Use the same format as the | ||
| 64 | short log. | ||
| 65 | (vc-git-log-incoming): Likewise. Run "git fetch" before the log | ||
| 66 | command | ||
| 67 | |||
| 68 | Add bindings for vc-log-incoming and vc-log-outgoing. | ||
| 69 | * vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming | ||
| 70 | and vc-log-outgoing. | ||
| 71 | * vc-dir.el (vc-dir-menu-map): Add menu bindings for vc-log-incoming | ||
| 72 | and vc-log-outgoing. | ||
| 73 | |||
| 74 | Improve state updating for VC tag commands. | ||
| 75 | * vc.el (vc-create-tag, vc-retrieve-tag): Call vc-resynch-buffer | ||
| 76 | to update the state of all buffers in the directory. | ||
| 77 | |||
| 78 | 2010-05-19 Glenn Morris <rgm@gnu.org> | ||
| 79 | |||
| 80 | * vc-dir.el (vc-dir): Don't pop-up-windows. (Bug#6204) | ||
| 81 | |||
| 82 | 2010-10-31 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 83 | |||
| 84 | * vc.el (vc-checkin, vc-modify-change-comment): | ||
| 85 | Adjust to new vc-start/finish-logentry. | ||
| 86 | (vc-find-conflicted-file): New command. | ||
| 87 | (vc-transfer-file): Adjust to new vc-checkin. | ||
| 88 | (vc-next-action): Improve scoping. | ||
| 89 | |||
| 90 | * vc-git.el (vc-git-checkin): Use log-edit-extract-headers. | ||
| 91 | (vc-git-commits-coding-system): Rename from git-commits-coding-system. | ||
| 92 | |||
| 93 | * vc-dispatcher.el (vc-log-edit): Shorten names for | ||
| 94 | log-edit-show-files. | ||
| 95 | |||
| 96 | * vc-bzr.el (vc-bzr-checkin): Use log-edit-extract-headers. | ||
| 97 | (vc-bzr-conflicted-files): New function. | ||
| 98 | |||
| 99 | * log-edit.el (log-edit-summary, log-edit-header) | ||
| 100 | (log-edit-unknown-header): New faces. | ||
| 101 | (log-edit-headers-alist): New var. | ||
| 102 | (log-edit-header-contents-regexp): New const. | ||
| 103 | (log-edit-match-to-eoh): New function. | ||
| 104 | (log-edit-font-lock-keywords): Use them. | ||
| 105 | (log-edit): Insert a "Summary:" header as default. | ||
| 106 | (log-edit-mode): Mark font-lock rules as case-insensitive. | ||
| 107 | (log-edit-done): Cleanup headers. | ||
| 108 | (log-edit-extract-headers): New function to replace it. | ||
| 109 | |||
| 110 | * vc-dispatcher.el (vc-finish-logentry): Don't mess so badly with | ||
| 111 | the windows/frames. | ||
| 112 | |||
| 113 | * vc-bzr.el (vc-bzr-shelve-apply): Don't use *vc-bzr-shelve*. | ||
| 114 | |||
| 115 | * vc-dir.el (vc-dir-kill-line): New command. | ||
| 116 | (vc-dir-mode-map): Bind it to C-k. | ||
| 117 | (vc-dir-headers): Abbreviate the working dir. | ||
| 118 | |||
| 119 | * vc-git.el (vc-git-revision-table): Include remote branches. | ||
| 120 | |||
| 121 | 2010-10-31 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 122 | |||
| 123 | New VC methods: vc-log-incoming and vc-log-outgoing. | ||
| 124 | * vc.el (vc-print-log-setup-buttons, vc-log-internal-common) | ||
| 125 | (vc-incoming-outgoing-internal, vc-log-incoming, vc-log-outgoing): | ||
| 126 | New functions. | ||
| 127 | (vc-print-log-internal): Just call vc-log-internal-common. | ||
| 128 | (vc-log-view-type): New permanent local variable. | ||
| 129 | |||
| 130 | * vc-hooks.el (vc-menu-map): Bind vc-log-incoming and vc-log-outgoing. | ||
| 131 | |||
| 132 | * vc-bzr.el (vc-bzr-log-view-mode): Use vc-log-view-type instead | ||
| 133 | of the dynamic bound vc-short-log. | ||
| 134 | (vc-bzr-log-incoming, vc-bzr-log-outgoing): New functions. | ||
| 135 | |||
| 136 | * vc-git.el (vc-git-log-outgoing): New function. | ||
| 137 | (vc-git-log-view-mode): Use vc-log-view-type instead | ||
| 138 | of the dynamic bound vc-short-log. | ||
| 139 | |||
| 140 | * vc-hg.el (vc-hg-log-view-mode): Use vc-log-view-type instead of | ||
| 141 | the dynamic bound vc-short-log. Highlight the tag. | ||
| 142 | (vc-hg-log-incoming, vc-hg-log-outgoing): New functions. | ||
| 143 | (vc-hg-outgoing, vc-hg-incoming, vc-hg-outgoing-mode): | ||
| 144 | (vc-hg-incoming-mode): Remove. | ||
| 145 | (vc-hg-extra-menu-map): Do not bind vc-hg-incoming and vc-hg-outgoing. | ||
| 146 | |||
| 147 | Fix default-directory for vc-root-diff. | ||
| 148 | * vc.el (vc-root-diff): Bind default-directory to the root | ||
| 149 | directory for the diff command. | ||
| 150 | |||
| 151 | 2010-10-31 Sam Steingold <sds@gnu.org> | ||
| 152 | |||
| 153 | * vc-hg.el (vc-hg-push, vc-hg-pull): Use `apply' when calling | ||
| 154 | `vc-hg-command' with a list of flags. | ||
| 155 | |||
| 156 | 2010-10-31 Glenn Morris <rgm@gnu.org> | ||
| 157 | |||
| 158 | * vc-bzr.el (vc-bzr-log-edit-mode): Add --fixes support to | ||
| 159 | log-edit-before-checkin-process. | ||
| 160 | |||
| 161 | * vc.el (vc-modify-change-comment): Pass MODE to vc-start-logentry. | ||
| 162 | |||
| 163 | * vc-bzr.el, vc-hg.el (log-edit-mode): Declare. | ||
| 164 | |||
| 165 | * vc-dispatcher.el (vc-start-logentry): Doc fix. | ||
| 166 | (log-view-process-buffer, log-edit-extra-flags): Declare. | ||
| 167 | |||
| 168 | 2010-10-31 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 169 | |||
| 170 | Add special markup processing for commit logs. | ||
| 171 | * log-edit.el (log-edit): Add new argument MODE. Use that mode | ||
| 172 | when non-nil instead of the log-view-mode. | ||
| 173 | |||
| 174 | * vc.el (vc-default-log-edit-mode): New function. | ||
| 175 | |||
| 176 | * vc-dispatcher.el (vc-log-edit): Add a mode argument, pass it to | ||
| 177 | log-edit. | ||
| 178 | |||
| 179 | Support for shelving snapshots and for showing shelves. | ||
| 180 | * vc-bzr.el (vc-bzr-shelve-show, vc-bzr-shelve-show-at-point) | ||
| 181 | (vc-bzr-shelve-apply-and-keep-at-point, vc-bzr-shelve-snapshot): | ||
| 182 | New functions. | ||
| 183 | (vc-bzr-shelve-map, vc-bzr-shelve-menu-map) | ||
| 184 | (vc-bzr-extra-menu-map): Map them. | ||
| 185 | |||
| 1 | 2010-10-30 Michael Albinus <michael.albinus@gmx.de> | 186 | 2010-10-30 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 187 | ||
| 3 | * net/tramp.el (tramp-handle-insert-file-contents): For root, | 188 | * net/tramp.el (tramp-handle-insert-file-contents): For root, |