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

140 Commits

Author SHA1 Message Date
André Spiegel
db8afaee0d Don't bind vc-toggle-read-only to C-x C-q.
(vc-toggle-read-only): Explain in the doc string that users can bind
this to C-x C-q.
(vc-checkout-model): Change doc string to refer to vc-next-action,
not vc-toggle-read-only.
2002-07-16 17:42:57 +00:00
André Spiegel
c1cd70afea (vc-menu-map): New entry "Update to Latest Version", which calls
vc-update.  Use the term "Base Version" instead of "Last Version"
for the entries "Revert" and "Compare".
2002-02-28 13:11:11 +00:00
André Spiegel
060a1456ce Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
(vc-mode-line): Set vc-mode to nil if the file is
not version-controlled.  This is necessary, e.g., if the file has
just been reverted, and thus was previously under version control
but isn't any longer.
(vc-find-file-hook): Likewise.
2002-02-21 20:56:58 +00:00
André Spiegel
cb5af02aed (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
FILE is not registered.
(vc-check-master-templates, vc-default-make-version-backups-p): Doc fix.
2001-12-14 07:58:33 +00:00
Pavel Janík
9aa10a4356 (vc-default-make-version-backups-p): Doc fix. 2001-12-11 07:35:18 +00:00
André Spiegel
becd6193d4 (vc-error-occured): Backquotified.
(vc-file-prop-obarray): Use prime length for better efficiency.
Suggested by Kalle Olavi Niemitalo <kon@iki.fi>.
2001-11-09 14:58:21 +00:00
Stefan Monnier
79e954d0ac (vc-delete-automatic-version-backups): Handle the
case where the file is relative.
2001-09-24 16:37:10 +00:00
Stefan Monnier
d455f4f7a9 (vc-delete-automatic-version-backups):
Don't fail if the directory doesn't exist.
2001-09-22 20:09:56 +00:00
Stefan Monnier
14fef9dea4 (vc-mode): Dummy function for doc purposes.
(vc-prefix-map): Moved back from vc.el.
2001-07-11 22:05:01 +00:00
André Spiegel
c3ce5e29ba Require 'cl during compilation. 2000-11-24 16:25:59 +00:00
André Spiegel
2ce63cb7f5 Undo prev change. 2000-11-20 14:01:35 +00:00
André Spiegel
19a79b62ec (vc-workfile-unchanged-p, vc-default-workfile-unchanged-p): Moved here
from vc.el.
2000-11-19 09:58:38 +00:00
Stefan Monnier
4d2806e27a (vc-insert-file): Don't assume byte==char. 2000-11-06 13:21:09 +00:00
André Spiegel
ff40374a7b (vc-insert-file): Rewritten. Don't bother about auto-save-mode. 2000-11-04 18:24:50 +00:00
André Spiegel
48b15d3f46 (vc-make-version-backup): Don't do it on MS-DOS without long file
names.
2000-10-27 13:26:18 +00:00
André Spiegel
e3f955b6a6 (vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
file.~<rev>.~ for automatic ones.
2000-10-27 12:11:55 +00:00
André Spiegel
e896a9e1dc (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
(vc-delete-automatic-version-backups, vc-make-version-backup): New
functions.
(vc-before-save): Use the latter.
(vc-default-make-version-backups-p): Added `-p' suffix to avoid
confusion.
2000-10-22 15:28:58 +00:00
Stefan Monnier
67c6f446df (vc-mode-line): Fix interactive spec. 2000-10-05 22:47:21 +00:00
André Spiegel
d445a9756a (vc-before-save, vc-default-make-version-backups,
vc-version-backup-file-name): New functions.
2000-10-04 09:50:21 +00:00
André Spiegel
1f22ad2403 (vc-registered): If FILE used to be registered under a certain
backend, try that one first.
2000-10-02 12:02:37 +00:00
André Spiegel
64341022ab (vc-name): Force correct computation of the value in case it is missing. 2000-09-21 13:15:26 +00:00
Dave Love
5eb2b516a6 Doc fixes. 2000-09-12 13:00:30 +00:00
Gerd Moellmann
8ddceaf120 Don't require `vc' during compilation;
requiring it leads to a recursive loading of vc.el and vc-hooks.el
during bootstrap.
2000-09-06 10:41:41 +00:00
Stefan Monnier
099bd78a96 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
* vc.el: (toplevel): Don't require `dired' at run-time.
	(vc-dired-resynch-file): Remove autoload cookie.

2000-09-05  Andre Spiegel  <spiegel@gnu.org>

	* vc.el: Made several backend functions optional.
	(vc-default-responsible-p): New function.
	(vc-merge): Use RET for first version to trigger merge-news, not
	prefix arg.
	(vc-annotate): Handle backends that do not support annotation.
	(vc-default-merge-news): Removed.  The existence of a merge-news
	implementation is now checked on caller sites.

	* vc-hooks.el (vc-default-mode-line-string): Removed CVS special
	case.

	* vc-cvs.el (vc-cvs-mode-line-string): New function, handles the
	special case that has been removed from the default in vc-hooks.el.

2000-09-05  Stefan Monnier  <monnier@cs.yale.edu>

	* vc.el (vc-log-edit): Properly handle the case where FILE is nil.

2000-09-05  Andre Spiegel  <spiegel@gnu.org>

	* vc-hooks.el: Require vc during compilation.
	(vc-file-setprop): Use `vc-touched-properties' if bound by the new
	macro `with-vc-properties' in vc.el.
	(vc-file-getprop): Doc fix.
	(vc-after-save): Call `vc-dired-resynch-file' only if vc is loaded.

	* vc.el: Require dired-aux during compilation.
	(vc-name-assoc-file): Moved to vc-sccs.el.
	(with-vc-properties): New macro.
	(vc-checkin, vc-checkout, vc-revert, vc-cancel-version,
	vc-finish-steal): Use it.
	(vc-cancel-version): Moved RCS-specific code to vc-rcs.el.  The call
	to the backend-specific function is now supposed to do the checkout,
	too.
	(vc-log-edit): Handle FILE being nil and added a FIXME for log-edit.

	* vc-cvs.el (vc-cvs-checkin, vc-cvs-checkout): Don't bother to
	set file properties; that gets done in the generic code now.

	* vc-rcs.el (vc-rcs-uncheck): Renamed to `vc-rcs-cancel-version'.
	Changed parameter list, added code from vc.el that does the
	checkout, possibly with a double-take.

	* vc-sccs.el (vc-sccs-name-assoc-file): Moved here from vc.el.
	(vc-sccs-add-triple, vc-sccs-rename-file, vc-sccs-lookup-triple): Use
	the above under the new name.
	(vc-sccs-uncheck): Renamed to `vc-sccs-cancel-version'.  Changed
	parameter list, added checkout command.
	(vc-sccs-checkin, vc-sccs-checkout): Don't bother to set file
	properties; that gets done in the generic code now.

2000-09-05  Stefan Monnier  <monnier@cs.yale.edu>

	* vc.el: Docstring fixes (courtesy of checkdoc).

2000-09-05  Stefan Monnier  <monnier@cs.yale.edu>

	* vc.el (vc-checkout-writable-buffer-hook)
	(vc-checkout-writable-buffer): Remove.
	(vc-start-entry): Always call vc-log-edit, never vc-log-mode.
	(vc-log-mode): Make it into a clean derived major mode.
	(vc-log-edit): Mark buffer unmodified (as vc-log-mode did) and use
	vc-log-mode if log-edit is not available.
	(vc-dired-mode-map): Don't set-keymap-parent yet.
	(vc-dired-mode): Do set-keymap-parent here.
	(vc-dired-buffers-for-dir): Nop if dired is not loaded.
2000-09-05 20:08:22 +00:00
Gerd Moellmann
0e0d98319e Minor doc fixes.
(vc-default-mode-line-string): Show state
`needs-patch' as a `-' too.
(vc-after-save): Call vc-dired-resynch-file.
(vc-file-not-found-hook): Ask the user whether to
check out a non-existing file.
(vc-find-backend-function): If function doesn't
exist, return nil instead of error.
(vc-call-backend): Doc fix.
(vc-prefix-map): Move the autoload from vc.el.
(vc-simple-command): Removed.
(vc-handled-backends): Docstring change.
(vc-ignore-vc-files): Mark obsolete.
(vc-registered): Check vc-ignore-vc-files.
(vc-find-file-hook, vc-file-not-found-hook): Don't check
vc-ignore-vc-files.
(vc-parse-buffer): Lobotomize the monster.
(vc-simple-command): Docstring fix.
(vc-registered): Align the way the file-handler is called with the
way the function itself works.
(vc-file-owner): Remove.
(vc-header-alist): Move the dummy def from vc.el.
(vc-backend-hook-functions): Remove.
(vc-find-backend-function): Don't try to load vc-X-hooks anymore.
(vc-backend): Reintroduce the test for `file = nil' now that I
know why it was there (and added a comment to better remember).
 Update Copyright.
(vc-backend): Don't accept a nil argument any more.
(vc-up-to-date-p): Turn into a defsubst.
(vc-possible-master): New function.
(vc-check-master-templates): Use `vc-possible-master' and allow
funs in vc-X-master-templates to return a non-existent file.
(vc-loadup): Remove.
(vc-find-backend-function): Use `require'.  Also, handle the case
where vc-BACKEND-hooks.el doesn't exist.
(vc-call-backend): Cleanup.
(vc-find-backend-function): Return a cons cell if
using the default function.
(vc-call-backend): If calling the default function, pass it the
backend as first argument.  Update the docstring accordingly.
(vc-default-state-heuristic, vc-default-mode-line-string): Update
for the new backend argument.
(vc-make-backend-sym): Renamed from vc-make-backend-function.
(vc-find-backend-function): Use the new name.
(vc-default-registered): New function.
(vc-backend-functions): Remove.
(vc-loadup): Don't setup 'vc-functions.
(vc-find-backend-function): New function.
(vc-call-backend): Use above fun and populate 'vc-functions
lazily.
(vc-backend-defines): Remove.
(vc-backend-hook-functions, vc-backend-functions)
(vc-make-backend-function, vc-call): Pass names without leading
`vc-' to vc-call-backend so we can blindly prefix them with
vc-BACKEND.
(vc-loadup): Don't load vc-X-hooks if vc-X is requested.
(vc-call-backend): Always try to load vc-X-hooks.
(vc-registered): Remove vc- in call to vc-call-backend.
(vc-default-back-end, vc-buffer-backend): Remove.
(vc-kill-buffer-hook): Remove `vc-buffer-backend' handling.
(vc-loadup): Load files quietly.
(vc-call-backend): Oops, brain fart.
(vc-locking-user): If locked by the calling user,
return that name.  Redocumented.
(vc-user-login-name): Simplify the code a tiny bit.
(vc-state): Don't use 'reserved any more.  Just use the same
convention as the one used for vc-<backend>-state where the
locking user (as a string) is returned.
(vc-locking-user): Update, based on the above convention. The
'vc-locking-user property has disappeared.
(vc-mode-line, vc-default-mode-line-string): Adapt to new
`vc-state'.
(vc-backend-functions): Removed vc-toggle-read-only.
(vc-toggle-read-only): Undid prev change.
(vc-master-templates): Def the obsolete var.
(vc-file-prop-obarray): Use `make-vector'.
(vc-backend-functions): Add new hookable functions
vc-toggle-read-only, vc-record-rename and vc-merge-news.
(vc-loadup): If neither backend nor default functions exist, use
the backend function rather than nil.
(vc-call-backend): If the function if not bound yet, try to load
the non-hook file to see if it provides it.
(vc-call): New macro plus use it wherever possible.
(vc-backend-subdirectory-name): Use neither `vc-default-back-end'
nor `vc-find-binary' since it's only called from
vc-mistrust-permission which is only used once the backend is
known.
(vc-checkout-model): Fix parenthesis.
(vc-recompute-state, vc-prefix-map): Move to vc.el.
(vc-backend-functions): Renamed `vc-steal' to
`vc-steal-lock'.
(vc-call-backend): Changed error message.
(vc-state): Added description of state `unlocked-changes'.
(vc-backend-hook-functions, vc-backend-functions):
Updated function lists.
(vc-call-backend): Fixed typo.
(vc-backend-hook-functions): Renamed vc-uses-locking
to vc-checkout-model.
(vc-checkout-required): Renamed to vc-checkout-model.
Re-implemented and re-commented.
(vc-after-save): Use vc-checkout-model.
(vc-backend-functions): Added `vc-diff' to the list
of functions possibly implemented in a vc-BACKEND library.
(vc-checkout-required): Bug fixed that caused an error to be
signaled during `vc-after-save'.
(vc-backend-hook-functions): `vc-checkout-required'
updated to `vc-uses-locking'.
(vc-checkout-required): Call to backend function
`vc-checkout-required' updated to `vc-uses-locking' instead.
(vc-parse-buffer): Bug found and fixed.
(vc-backend-functions): `vc-annotate-command',
`vc-annotate-difference' added to supported backend functions.
 vc-state-heuristic added to
vc-backend-hook-functions.
 Implemented new state model.
(vc-state, vc-state-heuristic, vc-default-state-heuristic): New
functions.
(vc-locking-user): Simplified.  Now only needed if the file is
locked by somebody else.
(vc-lock-from-permissions): Removed.  Functionality is in
vc-sccs-hooks.el and vc-rcs-hooks.el now.
(vc-mode-line-string): New name for former vc-status.  Adapted.
(vc-mode-line): Adapted to use the above.  Removed optional
parameter.
(vc-master-templates): Is really obsolete.
Commented out the definition for now.  What is the right procedure
to get rid of it?
(vc-registered, vc-backend, vc-buffer-backend, vc-name): Largely
rewritten.
(vc-default-registered): Removed.
(vc-check-master-templates): New function; does mostly what the
above did before.
(vc-locking-user): Don't rely on the backend to set the property.
(vc-latest-version, vc-your-latest-version): Removed.
(vc-backend-hook-functions): Removed them from this list, too.
(vc-fetch-properties): Removed.
(vc-workfile-version): Doc fix.
(vc-consult-rcs-headers):
Moved into vc-rcs-hooks.el, under the name
vc-rcs-consult-headers.
(vc-master-locks, vc-master-locking-user):
Moved into both
vc-rcs-hooks.el and vc-sccs-hooks.el.  These properties and access
functions are implementation details of those two backends.
(vc-parse-locks, vc-fetch-master-properties): Split
into back-end specific parts and removed.  Callers not updated
yet; because I guess these callers will disappear into back-end
specific files anyway.
(vc-checkout-model): Renamed to vc-uses-locking.
Store yes/no in the property, and return t/nil.  Updated all
callers.
(vc-checkout-model): Punt to backends.
(vc-default-locking-user): New function.
(vc-locking-user, vc-workfile-version): Punt to backends.
(vc-rcsdiff-knows-brief, vc-rcs-lock-from-diff)
(vc-master-workfile-version): Moved from vc-hooks.
(vc-lock-file): Moved to vc-sccs-hooks and renamed.
(vc-handle-cvs, vc-cvs-parse-status, vc-cvs-status):
Moved to vc-cvs-hooks.
 Add doc strings in various places.  Simplify the
minor mode setup.
(vc-handled-backends): New user variable.
(vc-parse-buffer, vc-insert-file, vc-default-registered): Minor
simplification.
(vc-backend-hook-functions, vc-backend-functions):
New variable.
(vc-make-backend-function, vc-loadup, vc-call-backend)
(vc-backend-defines): New functions.
 Various doc fixes.
(vc-default-back-end, vc-follow-symlinks): Custom fix.
(vc-match-substring): Function removed.  Callers changed to use
match-string.
(vc-lock-file, vc-consult-rcs-headers, vc-kill-buffer-hook):
Simplify.
 vc-registered has been renamed
vc-default-registered.  Some functions have been moved to the
backend specific files.  they all support the
vc-BACKEND-registered functions.
 This is 1998-11-11T18:47:32Z!kwzh@gnu.org from the emacs sources
2000-09-04 19:47:25 +00:00
Gerd Moellmann
8321b22a93 (vc-parse-buffer): Handle mixtures of dates
before and after the year 2000.
2000-01-10 13:29:53 +00:00
André Spiegel
9fe89e7308 (vc-find-cvs-master): Set case-fold-search correctly. 1999-06-30 07:10:20 +00:00
Karl Heuer
ec44193a26 (vc-toggle-read-only): Doc fix. 1998-11-11 18:47:32 +00:00
Dave Love
b64ea3878b (vc-menu-map): Change the vc-directory label. Don't
use the menu-enable properties, pending doing it correctly and
acceptably fast.
1998-09-14 17:26:39 +00:00
Richard M. Stallman
5f42a1d493 (vc-file-not-found-hook): Call vc-file-clearprops. 1998-08-08 07:11:40 +00:00
André Spiegel
edad8a097f (vc-parse-cvs-status): Grok new form of conflict message. 1998-05-17 15:33:39 +00:00
Richard M. Stallman
b13a9b1b60 (vc-consult-rcs-headers): Fix previous change. 1998-05-07 21:34:54 +00:00
André Spiegel
0465c34f41 (vc-consult-rcs-headers): Avoid bug with ci -k in RCS 5.7. 1998-05-06 13:36:45 +00:00
André Spiegel
eaff65c86b (vc-parse-cvs-status): Optimized. Ignore "Locally Removed" files. 1998-05-02 16:41:44 +00:00
Dan Nicolaescu
cd32a7baa4 *** empty log message *** 1998-04-20 02:34:53 +00:00
André Spiegel
e27827ddcc (vc-prefix-map): Added "m" for vc-merge. 1998-04-05 18:44:35 +00:00
Richard M. Stallman
8aa81ea8c4 (vc-parse-cvs-status): New function.
(vc-fetch-master-properties): Moved cvs status retrieval to the above.
(vc-backend): If a file is not registered, remember that by setting
the property to `none'.
(vc-name): Use the mechanism of vc-backend to compute the value.
(vc-after-save): Don't access vc-backend property directly.
1998-04-04 05:21:44 +00:00
André Spiegel
809c22a297 (vc-sccs-project-dir, vc-search-sccs-project-dir): New functions.
(vc-master-templates): Add call to vc-search-sccs-project-dir.
1998-03-20 15:38:48 +00:00
André Spiegel
f4c7209704 Added version id. 1998-02-27 18:44:41 +00:00
Dave Love
b499b50bea (vc-ignore-vc-files): New variable.
(vc-file-hook, vc-file-not-found-hook): Use it.
1998-02-04 14:20:15 +00:00
Karl Heuer
50bec09179 Customized. 1997-12-04 05:56:22 +00:00
Karl Heuer
274c59c95c (vc-find-cvs-master): Added missing `throw' for
the case when TIMESTAMP is arbitrary text.
1997-09-30 07:33:35 +00:00
André Spiegel
9314395d3f (vc-menu-map): Replace entries for "Check In" and "Check Out" with
new entry "Check In/Out" (calling vc-next-action).
1997-08-03 12:48:31 +00:00
Richard M. Stallman
403d549cb7 (vc-checkout-model): For CVS, look at
permissions to see if a file is "watched".
1997-07-31 06:16:32 +00:00
André Spiegel
702220f3d8 (vc-find-cvs-master): Corrected parsing of CVS/Entries, according to CVS docs.
(vc-toggle-read-only): Also work in vc-dired buffers.
1997-07-18 16:06:22 +00:00
Richard M. Stallman
9bef02e187 (vc-menu-map): Add bindings for vc-retrieve-snapshot and vc-create-snapshot. 1997-06-23 02:19:40 +00:00
Richard M. Stallman
14aa11f4da (vc-annotate): Entry "Annotate" added to menu and
function `vc-annotate' to key-sequence `C-x v g'.
1997-06-06 05:33:13 +00:00
Richard M. Stallman
9f49ec7384 (vc-find-cvs-master): Accept ...+ in a normal entry. 1997-05-04 06:49:53 +00:00
Richard M. Stallman
c20369f06c (vc-master-templates): Doc fix. 1997-04-27 20:50:24 +00:00
Richard M. Stallman
70b760ed2d (vc-find-cvs-master): Handle a "New file!" entry.
(vc-fetch-master-properties): Match "New file!".
1997-04-22 01:04:48 +00:00