1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-03 08:30:09 +00:00
Commit Graph

50 Commits

Author SHA1 Message Date
André Spiegel
83220ab07a (vc-cvs-checkout): Handle t argument for REV. 2002-12-26 14:05:48 +00:00
Juanma Barranquero
aa4af0714e (vc-cvs-sticky-tag-display): Fix typo. 2002-10-17 15:43:48 +00:00
Miles Bader
6c150da9f5 (vc-cvs-parse-entry): Don't barf when an `Entries' files contains an
invalid timestamp.
2002-10-11 06:49:49 +00:00
André Spiegel
15d85d9205 (vc-cvs-parse-entry): Parse the time stamp found in CVS/Entries,
rather than comparing it textually.
2002-10-10 08:44:58 +00:00
Markus Rost
cfb0dbdcee (vc-cvs-registered): In the autoload version use load instead of
require to avoid loops when loaddefs.el is loaded after vc-cvs.el.
2002-10-09 15:59:39 +00:00
Stefan Monnier
23b0a67405 (vc-cvs-find-version): Fix vc-checkout-switches use. 2002-10-08 20:25:21 +00:00
Stefan Monnier
ea05db0198 (vc-cvs-find-version): New fun. 2002-10-08 15:38:28 +00:00
Stefan Monnier
65cc83218f (vc-cvs-show-log-entry): Delete. 2002-10-04 18:38:53 +00:00
Juanma Barranquero
e6608c1233 Fix typo. 2002-07-03 14:26:51 +00:00
Eli Zaretskii
89e7ad5946 Change all post-21.1 :version attributes to 21.4. 2002-05-12 17:30:42 +00:00
Sam Steingold
93bcb353e7 (vc-cvs-valid-version-number-p): New function.
(vc-cvs-checkin): Use it.
2002-04-09 17:13:51 +00:00
Sam Steingold
968b980cd8 (vc-cvs-checkin): Pass the required argument to `error'. 2002-04-08 13:38:48 +00:00
André Spiegel
bbce041718 (vc-cvs-global-switches): New user option.
(vc-cvs-command): New function.  Update all callers of `vc-do-command'
in vc-cvs.el to use this instead.
2002-03-28 14:29:06 +00:00
Stefan Monnier
839daccae7 (vc-cvs-registered, vc-cvs-dir-state-heuristic):
Don't consider cvs-removed files as under VC control.
VC wouldn't handle them properly anyway and it confuses
vc-file-not-found-hook.
2002-03-22 23:10:01 +00:00
André Spiegel
4897ff21e9 (vc-cvs-register): Fix handling of vc-[cvs-]register-switches. 2002-03-18 17:19:45 +00:00
André Spiegel
044504d226 (vc-cvs-diff-tree): Fix typo in parameter names. 2002-03-05 13:30:50 +00:00
André Spiegel
df8e0a91a1 (vc-cvs-diff, vc-cvs-diff-tree): Use consistent parameter format for
vc-diff-switches-list.
2002-02-25 22:03:24 +00:00
André Spiegel
51af12fc20 Patch by Martin.Lorentzson@telia.com.
(vc-cvs-sticky-date-format-string): New variable.
(vc-cvs-sticky-tag-display): New variable.
(vc-cvs-mode-line-string): Add sticky-tag to the mode-line.
(vc-cvs-checkin): If the input revision is a valid symbolic tag
name, we create it as a branch, commit and switch to it.
(vc-cvs-retrieve-snapshot): Set file-property sticky-tag.
(vc-cvs-valid-symbolic-tag-name-p): New function.
(vc-cvs-parse-sticky-tag): New function.
(vc-cvs-parse-entry): Added parsing of sticky tags.
2002-02-21 20:16:47 +00:00
André Spiegel
4a96a5e96a This is a restore to version 1.29; the patch was taken out awaiting
copyright assignment.
2002-01-11 21:09:39 +00:00
André Spiegel
6223f0976f Fix prev change. 2002-01-08 20:00:19 +00:00
André Spiegel
a9f81d67cb Patch by Martin.Lorentzson@telia.com.
(vc-cvs-sticky-date-format-string): New variable.
(vc-cvs-sticky-tag-display): New variable.
(vc-cvs-mode-line-string): Add sticky-tag to the mode-line.
(vc-cvs-checkin): If the input revision is a valid symbolic tag
name, we create it as a branch, commit and switch to it.
(vc-cvs-retrieve-snapshot): Set file-property sticky-tag.
(vc-cvs-valid-symbolic-tag-name-p): New function.
(vc-cvs-parse-sticky-tag): New function.
(vc-cvs-parse-entry): Added parsing of sticky tags.
2002-01-08 19:57:57 +00:00
Pavel Janík
f0529b5b1a Doc fix. 2001-12-20 19:01:00 +00:00
André Spiegel
44f663a4de (vc-cvs-parse-status): Store file state in property, don't just return
it.
2001-11-30 13:47:39 +00:00
Stefan Monnier
4a9b4f3079 (vc-cvs-parse-entry): Rewrite, comparing the string-
rather than integer- representation of dates.
2001-11-25 23:52:51 +00:00
André Spiegel
8ba2df32b7 New scaling algorithm for vc-annotate.
From JD Smith <jdsmith@astro.cornell.edu>.
(vc-cvs-annotate-difference): Removed to generic
version in vc.el, with
(vc-cvs-annotate-current-time): Added, as override of default.
(vc-cvs-annotate-time) Added. Taken mostly from the (now removed)
`vc-cvs-annotate-difference'.
2001-10-22 07:57:00 +00:00
André Spiegel
5e0fdc5a86 (vc-cvs-diff-tree): New function. 2001-10-21 12:21:29 +00:00
André Spiegel
99739bbf42 (vc-*-revert-file): Handle new optional arg CONTENTS-DONE. 2001-08-28 17:06:36 +00:00
Stefan Monnier
c6a84d1750 (vc-cvs-stay-local): doc fix. 2001-07-04 15:51:18 +00:00
Eli Zaretskii
8f9ab4032f (vc-cvs-print-log, vc-cvs-diff): Don't invoke CVS as
an async subprocess if start-process is unavailable.  Suggested by
Tim Van Holder <tim.van.holder@pandora.be>.
2001-04-17 06:01:40 +00:00
André Spiegel
6e024fc80f (vc-cvs-checkin): When removing the sticky tag, make output go to
buffer *vc*, not the current buffer.
(vc-cvs-print-log): Output to buffer *vc*, not the current buffer.
(vc-cvs-diff): Output to buffer *vc-diff*, not the current buffer.
2001-03-10 10:49:05 +00:00
André Spiegel
54be33bc3f Remove autoloads. Require vc when compiling. 2001-02-02 07:21:21 +00:00
André Spiegel
633147f5a4 (vc-cvs-diff-switches): New customization option.
(vc-cvs-diff): Use it via vc-diff-switches-list.
2001-02-01 15:10:16 +00:00
Sam Steingold
ed5d446e77 replaced require with autoloads 2001-01-29 19:12:40 +00:00
Sam Steingold
89e658178a require vc 2001-01-25 21:02:37 +00:00
Sam Steingold
9b0630e57e doc&comment fix 2001-01-25 16:36:48 +00:00
Dave Love
ee3275dffa (vc-cvs-header): Fix :type. 2001-01-09 14:48:25 +00:00
André Spiegel
34abd98e0b (vc-cvs-latest-on-branch-p): Removed.
(vc-cvs-checkout): Renamed arg WRITABLE to EDITABLE.
2001-01-08 16:24:56 +00:00
André Spiegel
81d995bb87 (vc-cvs-checkout): Fix bug that broke C-x v ~-style checkouts. 2000-11-20 14:16:18 +00:00
André Spiegel
8f98485f77 Functions reordered. 2000-11-16 18:14:41 +00:00
André Spiegel
e5effdcc20 (vc-cvs-print-log, vc-cvs-diff): Use asynchronous mode only for remote
repositories.
2000-11-16 16:42:10 +00:00
André Spiegel
a8b6979f53 (vc-cvs-revert): Use cvs unedit' only if vc-cvs-use-edit' is on.
(vc-cvs-checkout): When this is used for reverting the workfile, make
a backup of the original contents and revert to that in case of error.
2000-11-16 15:29:40 +00:00
André Spiegel
ffe586ab5c (vc-cvs-annotate-command): New optional arg VERSION. Use
vc-do-command to perform the annotation, not call-process.
2000-11-16 13:38:03 +00:00
André Spiegel
e1483c3831 (vc-cvs-merge-news): Be prepared for no news at all. 2000-10-27 15:07:46 +00:00
André Spiegel
bee48f254b (vc-cvs-checkin): Check both status and error message after command.
If there's an unexpected error, signal it instead of being silent.
2000-10-27 11:37:17 +00:00
André Spiegel
c86ef81ce6 (vc-cvs-make-version-backups-p): Added `-p' suffix as expected by
vc[-hooks].el.
2000-10-22 15:31:11 +00:00
André Spiegel
b3d6528a4c (vc-cvs-make-version-backups): Return t if vc-cvs-stay-local-p. 2000-10-04 09:51:15 +00:00
Stefan Monnier
e1d95cc471 * vc-sccs.el (vc-sccs-register):
* vc-rcs.el (vc-rcs-register):
* vc-cvs.el (vc-cvs-register): Don't clear file's properties.
* vc.el (vc-register): Clear file's properties.
2000-09-09 00:48:41 +00:00
Dave Love
0d685c4f7b DOc fixes.
(vc-cvs-register-switches, vc-cvs-header, vc-cvs-use-edit)
(vc-cvs-stay-local): Add :version.
2000-09-07 20:01:53 +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
c1b2509982 (vc-cvs-show-log-entry): New function.
(vc-cvs-stay-local): Allow it to be a hostname regexp
as well.
(vc-cvs-remote-p): Renamed to vc-cvs-stay-local-p.  Handle
hostname regexps.  Updated all callers.
(vc-cvs-responsible-p): Handle directories as well.
(vc-cvs-could-register): New function.
(vc-cvs-retrieve-snapshot): Parse "cvs update" output, keep file
properties up-to-date.
(vc-cvs-checkout): Do the right thing when the
workfile does not exist.
(vc-cvs-registered): Use new function
vc-cvs-parse-entry to do the actual work.
(vc-cvs-remote-p): Allow FILE to be a directory, too.
(vc-cvs-dir-state): New function.
(vc-cvs-dir-state-heuristic): New function, subroutine of the
above.
(vc-cvs-parse-entry): New function, also to be used in
vc-cvs-registered.
(vc-cvs-checkout): Slight restructuring to make the
control-flow more clear and to avoid running `cvs' twice.
(vc-cvs-workfile-version): Removed comment that this
is not reached.  It is.
(vc-cvs-merge): Set state to 'edited after merge.
(vc-cvs-merge-news): Set workfile version to nil if not known.
(vc-cvs-latest-on-branch-p): Recommented.  Candidate for removal.
(vc-cvs-checkin): Raise the max-correct status from 0
to 1.  Make sure to switch to *vc* before looking for an error
message.  Use vc-parse-buffer.
(vc-cvs-create-snapshot): Swap DIR and NAME.
(vc-cvs-retrieve-snapshot): New function (untested).
(vc-cvs-stay-local): Default to t.
(vc-cvs-remote-p): New function and property.
(vc-cvs-state): Stay local only if the above is t.
(vc-handle-cvs): Removed.
(vc-cvs-registered): Don't check vc-handle-cvs -- it should all be
done via vc-handled-backends now.
(vc-cvs-header): Escape Id.
(vc-cvs-state, vc-cvs-fetch-status): Use
with-temp-file.  Use the new BUFFER=t argument to vc-do-command.
(vc-cvs-print-log, vc-cvs-diff): Insert in the current buffer.
(vc-cvs-state): Use vc-do-command instead of
vc-simple-command.
(vc-cvs-diff): Remove unused and unsupported argument CMP.
(vc-cvs-registered): Obey vc-handle-cvs.
(vc-cvs-registered): Use with-temp-buffer.  Reorder
extraction of fields and call to file-attributes because of a
temporary bug in rcp.el.
(vc-cvs-fetch-status): Use with-current-buffer.
 Merge in code
from vc-cvs-hooks.el.
(proto vc-cvs-registered): Require 'vc-cvs instead of
'vc-cvs-hooks.  Don't require 'vc anymore.
(vc-cvs-responsible-p): Use expand-file-name instead of concat and
file-directory-p instead of file-exists-p.
(vc-cvs-create-snapshot): New function, replacing
vc-cvs-assign-name.
(vc-cvs-assign-name): Remove.
(vc-cvs-header): New var.
 Update Copyright.
(vc-cvs-diff): Remove unused `backend' variable.
(vc-cvs-checkout): Only toggle read-only if the buffer is setup
right.
(tail): Provide vc-cvs.
(vc-cvs-merge-news, vc-cvs-checkout): Removed call to
vc-file-clear-masterprops.
(vc-cvs-state): Typo.
(vc-cvs-merge-news): Return the status code rather than the error
msg.
(vc-cvs-state): Don't overwrite a non-heuristic state
with a heuristic one.
(vc-cvs-merge-news): Just use 'edited for the case with conflicts.
(vc-cvs-checkin): Do a trivial parse to set the state in case of
error.  That allows us to get to 'needs-merge even in the
stay-local case.  There's still no way to detect 'needs-patch in
such a setup (or to force an update for that matter).
(vc-cvs-logentry-check): Remove, the default works as well.
(vc-cvs-print-log, vc-cvs-diff): Run cvs
asynchronously.
(vc-cvs-stay-local): Renamed from
vc-cvs-simple-toggle.  Redocumented.
(vc-cvs-state): If locality is wanted, use vc-cvs-state-heuristic.
(vc-cvs-toggle-read-only): Removed.
(for compiler
warnings).
(vc-cvs-release, vc-cvs-system-release): Remove.
(vc-cvs-use-edit, vc-cvs-simple-toggle): New config variables.
(vc-cvs-dired-state-info): Use `cvs-state' and slightly different
status symbols.
(vc-cvs-parse-status, vc-cvs-state): Move from vc-cvs-hooks.el.
(vc-cvs-toggle-read-only): First cut at a function to allow a
cvs-status-free vc-toggle-read-only.
(vc-cvs-merge-news): Move from cvs-merge-news in vc.el.
(vc-cvs-checkin): Use vc-recompute-state+vc-state instead of
vc-cvs-status.  Also set vc-state rather than vc-locking-user.
(vc-cvs-checkout): Modify access rights directly if the user
requested not to use `cvs edit'.  And refresh the mode line.
(if
workfile' that got lost when the code was extracted from vc.el.
And merged the tail with the rest of the code (not possible in the
old vc.el where the tail was shared among all backends).  And
explicitly set the state to 'edited if `writable' is set.
(vc-cvs-revert,vc-cvs-checkout): References to
`vc-checkout-model' updated to `vc-cvs-update-model'.
(vc-cvs-logentry-check): Function added.
(vc-cvs-revert,vc-cvs-checkout): Function calls to
`vc-checkout-required' updated to `vc-cvs-uses-locking'.
(vc-cvs-admin): Added the query-only option as
required by the vc.el file.
(vc-cvs-annotate-difference): Updated to handle
beginning of annotate buffers correctly.
 Rename `vc-uses-locking' to
`vc-checkout-required'.  Rename the `locked' state to `reserved'.
(vc-cvs-annotate-difference): Handle possible
millenium problem (merged from mainline).
 Split the annotate feature into a BACKEND-specific
part and moved the non-BACKEND stuff to vc.el.
(vc-cvs-latest-on-branch-p): Function added.
(vc-cvs-revert): Merged and adapted "unedit" patch
from main line.
(vc-cvs-diff): Function added.
(vc-cvs-checkout): Function `vc-cvs-checkout' added.
 Require vc when compiling.
(vc-cvs-register-switches): Doc fix.
(vc-annotate-color-map, vc-annotate-menu-elements): Fix custom type.
(vc-cvs-print-log, vc-cvs-assign-name, vc-cvs-merge)
(vc-cvs-check-headers, vc-cvs-steal, vc-cvs-revert, vc-cvs-checkin):
New functions (code from vc.el).
(vc-annotate-display-default): Fix interactive spec.
(vc-annotate-time-span): Doc fix.
 Moved the annotate functionality from vc.el.
(vc-cvs-admin, vc-cvs-fetch-status): Added from vc.el.
(vc-cvs-system-release):
Renamed from vc-cvs-backend-release.
(vc-cvs-release): Moved from vc.el.
(vc-cvs-backend-release): New function.
(vc-cvs-dired-state-info, vc-cvs-fetch-status): Moved
from vc.el and renamed.
2000-09-04 19:48:04 +00:00