1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
Commit Graph

316 Commits

Author SHA1 Message Date
André Spiegel
ecd50f6599 Mention vc-*-switches in backend API documentation.
(vc-annotate): Adapt doc string to recent change.
2001-10-29 12:21:26 +00:00
André Spiegel
b453817c99 (vc-diff-switches): Doc rewritten. 2001-10-22 12:13:29 +00:00
André Spiegel
7566514145 Change scaling algorithm for vc-annotate.
From JD Smith <jdsmith@astro.cornell.edu>.
(vc-annotate-display-default): Accept colormap scaling
ratio (now deprecated).
(vc-annotate-display-autoscale): Added.
(vc-annotate-add-menu): New autoscaling menu options "Span to
Oldest" and "Span Oldest->Newest".  Easymenu support added for
toggle menus driven by customize variable
`vc-annotate-display-mode'.
(vc-annotate-display-select): Added.
(vc-annotate): Changed temp-buffer-show-function to
`vc-annotate-display-select'.
(vc-annotate-display): Removed arguments BUFFER and BACKEND.
Added argument OFFSET.  Instead of backend function, calls now
generic `vc-annotate-difference'.
(vc-annotate-difference): Added as generic function instead of
backend-specific function.  No longer takes argument POINT, but
instead accepts a time OFFSET.
(vc-default-annotate-current-time): Added.
2001-10-22 07:54:03 +00:00
André Spiegel
e98b08246c (diff-switches): Remove duplicate definition. 2001-10-21 23:31:45 +00:00
André Spiegel
2c87edc17b (vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
New functions.
(vc-version-diff): Use them.  As a result, coding systems are now set
up properly for all sorts of diffs, and tree diffs can now also be
done locally.
(vc-diff): With a prefix argument, don't require that it's called from
a buffer under version control.
2001-10-21 12:15:22 +00:00
Stefan Monnier
ab750f9c19 (vc-checkin): Use vc-delete-automatic-version-backups. 2001-09-24 22:30:31 +00:00
Stefan Monnier
eb407e67eb Doc fix 2001-09-22 20:04:21 +00:00
André Spiegel
08eab195a7 (vc-annotate): Use current workfile version explicitly as a default,
suggested by Gustav Hallberg <gustav@virtutech.se>.
2001-09-17 09:59:41 +00:00
André Spiegel
1cec418c1e (vc-annotate): Rewrote doc string. 2001-09-10 17:51:04 +00:00
Gerd Moellmann
284b3043c0 Add Keywords header. 2001-09-04 12:54:14 +00:00
André Spiegel
bbfc07d319 (vc-revert-file): Call the backend even if the FILE's
contents can be reverted locally; pass new arg CONTENTS-DONE
down to the backend.
2001-08-28 17:02:59 +00:00
Gerd Moellmann
21b5029601 (vc-transfer-file): Fix malformed autoload cookie. 2001-08-07 14:48:30 +00:00
André Spiegel
133a84aa60 #Document prev change. 2001-07-30 18:25:58 +00:00
André Spiegel
7cad930dbd (vc-checkout-hook): New hook.
(vc-checkout): Run it.
2001-07-30 15:01:49 +00:00
Gerd Moellmann
76e5906daf (vc-switch-backend): Fix autoload cookie. 2001-07-30 08:18:04 +00:00
Stefan Monnier
a84b80ba4a (vc-do-command): Autoload. 2001-07-16 14:19:17 +00:00
Stefan Monnier
ec402ad432 (vc-prefix-map): Moved back to vc-hooks.el.
(vc-dired-mode-map): Fix the madness.
2001-07-11 22:55:25 +00:00
Stefan Monnier
fd8092f01b (vc-next-action-on-file): Only force buffer+file to writable
if both the buffer and the file are read-only.
2001-05-03 00:36:07 +00:00
André Spiegel
ad339989e5 (vc-do-command): If the destination buffer is already current, don't
set it up and don't erase it.  Updated doc string to reflect that.
(vc-version-diff): When doing a single file diff, don't switch to the
*vc-diff* buffer before the command.  This is to preserve local variable
bindings that might affect the diff command.
(vc-print-log): Don't switch to the *vc* buffer before the command, so
that local variable bindings are preserved.
2001-03-10 10:44:35 +00:00
André Spiegel
336203a282 (vc-default-workfile-unchanged-p, vc-default-latest-on-branch-p): Add
missing BACKEND argument.
2001-02-26 13:45:06 +00:00
Dave Love
891b8b69b4 Copyright up-date. 2001-02-01 17:42:44 +00:00
André Spiegel
acc5b122f0 (vc-diff-switches): New user option.
(vc-version-diff): Use it.
(vc-diff-switches-list): New macro.
2001-02-01 15:08:49 +00:00
André Spiegel
fcb500ea43 Added documentation for backend interface. 2001-01-10 14:42:53 +00:00
André Spiegel
38d88d32ef (vc-default-latest-on-branch-p): New function, replaces constant
implementations in backends.
2001-01-08 16:23:33 +00:00
André Spiegel
2ce63cb7f5 Undo prev change. 2000-11-20 14:01:35 +00:00
André Spiegel
5675c431ba (vc-workfile-unchanged-p, vc-default-workfile-unchanged-p): Moved to
vc-hooks.el.
2000-11-19 09:52:45 +00:00
Stefan Monnier
66321b2fe2 (vc-version-diff): Bind inhibit-read-only when inserting text.
(vc-version-backup-file): Docstring fix.
2000-11-16 18:28:36 +00:00
André Spiegel
aae91380e9 Updated backend documentation.
(vc-default-check-headers): New function.
2000-11-16 18:17:26 +00:00
André Spiegel
d9ed410081 (vc-do-command): In the asynchronous case, output messages only if the
minibuffer is not active.
2000-11-16 16:40:59 +00:00
André Spiegel
c96da2b0a5 (vc-revert-buffer): Ask for confirmation if file seems up-to-date. 2000-11-16 15:26:37 +00:00
André Spiegel
afe355024f (vc-annotate): Changed handling of prefix arg; now asks for both
version and ratio in the minibuffer.
2000-11-16 13:39:10 +00:00
André Spiegel
f9b59b2b16 (vc-version-other-window): If an automatic backup of the desired
version exists, rename it instead of copying it.
2000-10-27 12:13:19 +00:00
Stefan Monnier
347bef3060 (vc-start-entry): Only erase the buffer if comment is set. 2000-10-26 20:53:11 +00:00
Dave Love
166a0ef795 fix my email 2000-10-26 12:38:02 +00:00
Stefan Monnier
5e011cb2e8 (vc-version-other-window): Bind `file'. 2000-10-25 21:45:09 +00:00
André Spiegel
10b48cc413 (vc-checkout): Added `-p' suffix in call to vc-make-version-backups-p;
use vc-make-version-backup to actually make the backup.
(vc-version-other-window, vc-version-backup-file): Handle both
automatic and manual backups.
(vc-revert-file): Use vc-delete-automatic-version-backups to get rid
of all of them.
2000-10-22 15:37:51 +00:00
Thien-Thi Nguyen
46e33aee25 (with-vc-file, edit-vc-file): Specify `indent-function' property. 2000-10-10 01:28:06 +00:00
Stefan Monnier
8f4f021405 (vc-version-diff): diff-switches can be a list. 2000-10-08 19:12:52 +00:00
Stefan Monnier
a325540023 (with-vc-properties): Use conses rather than length-2 lists.
(vc-checkout, vc-finish-steal, vc-checkin, vc-revert-file):
Update call to with-vc-properties accordingly.
(vc-comment-search-reverse, vc-comment-search-forward): Docstring fix.
(vc-revert-buffer): Be more careful about window selection and deletion.
(vc-switch-backend): Slight reorg to avoid calling `registered' twice.
2000-10-05 22:55:17 +00:00
André Spiegel
ffda046061 (vc-revert-buffer): Handle empty diff properly.
(vc-version-backup-file): New function.
(vc-checkout): Create a version backup if necessary.
(vc-checkin): If a version backup file exists, delete it.
(vc-version-diff): Diff locally using version backups, if available.
(vc-revert-file): If there's a version backup, revert locally.
(vc-transfer-file): Use version backup for base version, if
available.  If not, ask for confirmation whether to get it from the
server.  Update mode line before check-in.
2000-10-04 09:48:37 +00:00
André Spiegel
72cfc5fb64 (vc-transfer-file, vc-default-receive-file): Rewritten to factorize
backend-specific code cleanly.
(vc-unregister): Function removed.
2000-10-03 12:24:15 +00:00
André Spiegel
045e1aa59e (vc-revert-file): New function.
(vc-revert-buffer): Delegate some of the work to it.
2000-10-03 11:22:13 +00:00
André Spiegel
8989ab56c2 (vc-responsible-backend): Undo the previous change in the argument
list.  Handle multiple backends correctly.
(vc-find-new-backend): Function removed.
(vc-register): Use vc-responsible-backend, as before.
(vc-next-action-on-file): Do use vc-registered, not vc-backend.
2000-10-02 12:01:09 +00:00
Stefan Monnier
ceec5a0c1b (with-vc-file, vc-next-action-on-file):
Use vc-backend rather than vc-registered.
(vc-next-action-on-file): Use intern-soft.
Deal with read-only *vc-diff* buffer.
(vc-switch-backend): Short circuit if nothing is to be done.
Handle the case where (not (memq backend backends)).
Don't use vc-resynch-buffer which could lose unsaved editing.
(vc-transfer-file): Docstring fix.
2000-10-01 20:58:17 +00:00
Stefan Monnier
7849e1791b * vc.el (vc-editable-p): Minor optimization.
(edit-vc-file, vc-next-action-on-file): Don't use find-file.
(vc-find-new-backend): New function split from vc-responsible-backend.
(vc-register): Use it.
(vc-responsible-backend): Remove REGISTER arg and add BACKENDS arg.
(vc-unregister): Drop BACKEND arg (it doesn't work anyway).
(vc-default-unregister, vc-revert-buffer): Docstring fix.
(vc-clear-headers): Don't use find-file.
(vc-revert-buffer): Use `and' again (must have been a braino).
(vc-switch-backend): Only prompt if requested.
(vc-default-receive-file): Update call to vc-unregister.

* vc-rcs.el (vc-rcs-unregister): Keep a backup of the master file.
(vc-rcs-receive-file): Avoid with-vc-properties.
Update call to vc-unregister.
Use constant `RCS' rather than (dynamically bound) var `backend'.
2000-10-01 19:35:24 +00:00
André Spiegel
0ab66291b8 (vc-next-action-on-file): Update mode line only if file is visited.
(vc-start-entry): New argument initial-contents.  Don't visit the file
if it isn't already visited.  Brought documentation up-to-date.
(vc-next-action, vc-register): Updated calls to vc-start-entry.
(vc-checkin): New optional arg initial-contents, which is passed to
vc-start-entry.
(vc-finish-logentry): Make sure to bury log buffer only if there
really is one.  Call `vc-resynch-buffer' on log-file, not
buffer-file-name.
(vc-default-comment-history, vc-default-wash-log): New functions.
(vc-index-of): Removed.
(vc-transfer-file): Make do without the above.
(vc-default-receive-file): Call comment-history unconditionally.  Pass
the resulting string to vc-checkin, instead of inserting it into the
comment ring.
2000-10-01 12:06:15 +00:00
André Spiegel
e07adf40d3 (vc-switch-backend): Signal an error if the file is not registered
under the new backend.
2000-09-22 07:49:19 +00:00
André Spiegel
1d502d5a5a (vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
(vc-next-action-on-file): Call vc-transfer-file at appropriate places.
(vc-switch-backend): New function.
(vc-prefix-map): Bind `vc-switch-backend' to `b'.
(vc-register): Fix prompt.
(vc-unregister, vc-default-unregister): New functions.
(vc-version-diff): Handle empty buffer in sentinel.
2000-09-21 13:27:08 +00:00
André Spiegel
c13809cf28 (vc-revert-buffer): Set vc-checkout-time correctly. 2000-09-19 13:58:56 +00:00
Dave Love
6f41eeb577 (vc-dired-listing-switches): Fix :version. 2000-09-12 13:03:44 +00:00