1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-16 09:50:25 +00:00
Commit Graph

48 Commits

Author SHA1 Message Date
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
André Spiegel
4f14752851 (vc-rcs-fetch-master-state, vc-rcs-consult-headers): Pass FILE to
vc-user-login-name.
2006-01-27 19:12:13 +00:00
André Spiegel
b010f88755 (vc-rcs-state-heuristic): Use file-attributes with ID-FORMAT
`string'.  This allows us to get rid of `vc-user-login-name UID'.
2006-01-22 16:08:48 +00:00
Thien-Thi Nguyen
0d30b33766 Update years in copyright notice; nfc. 2005-08-06 22:13:43 +00:00
Lute Kamstra
086add1519 Update FSF's address. 2005-07-04 23:32:44 +00:00
Thien-Thi Nguyen
903d71fbde (vc-rcs-annotate-command):
Fix omission bug: Call `vc-setup-buffer'.
2004-12-29 01:56:13 +00:00
Thien-Thi Nguyen
3249f234b8 (vc-rcs-parse): New function.
(vc-rcs-annotate-command): Likewise.
(vc-rcs-annotate-current-time): Likewise.
(vc-rcs-annotate-time): Likewise.
(vc-rcs-annotate-extract-revision-at-line): Likewise.
2004-11-19 15:08:32 +00:00
Stefan Monnier
fa63cb6d0b Doc fix. 2004-09-07 04:48:04 +00:00
André Spiegel
8915c22048 (vc-rcs-checkout-model): Look at the version headers only if
vc-consult-headers is non-nil.
2004-07-02 07:26:21 +00:00
André Spiegel
69c33e5d78 (vc-rcs-print-log, vc-rcs-diff): Add optional BUFFER argument. 2004-03-21 15:46:23 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Stefan Monnier
3e6bab6512 (vc-rcs-register, vc-rcs-checkin, vc-rcs-checkout)
(vc-rcs-find-version, vc-rcs-diff): Use vc-switches.
2003-05-08 19:24:56 +00:00
Juanma Barranquero
f1180544bb Trailing whitespace deleted. 2003-02-04 12:29:42 +00:00
André Spiegel
a207e923bd (vc-rcs-checkout): Fix the check whether we are on a branch. 2003-01-07 08:28:15 +00:00
André Spiegel
4837cfbdd2 (vc-rcs-revert): Unlock only if the user does have the lock. 2003-01-03 15:27:35 +00:00
André Spiegel
e39bd8ac22 (vc-rcs-checkin): By default, always specify the
current branch of the working file for check-in.
2002-12-26 14:38:20 +00:00
André Spiegel
a3294a807b (vc-rcs-checkout): Handle t argument for REV. 2002-12-26 14:06:33 +00:00
André Spiegel
736e0fd11b (vc-rcs-registered): Improve comment. 2002-11-13 12:38:20 +00:00
Markus Rost
0d2c82c731 (vc-rcs-registered): Handle the autoload cookie so that the definition
is found by `find-function-search-for-symbol' and etags.
2002-11-12 19:46:47 +00:00
Stefan Monnier
831afb58a4 (vc-rcs-find-version): Fix vc-checkout-switches use. 2002-10-08 20:23:36 +00:00
Stefan Monnier
88388365b0 (vc-rcs-find-version): New fun.
(vc-rcs-checkout): Remove `workfile' arg and simplify.
2002-10-08 15:33:18 +00:00
Stefan Monnier
27373ce118 (vc-rcs-show-log-entry): Delete. 2002-10-04 18:38:04 +00:00
André Spiegel
ef1a388cb3 (vc-rcs-state): Don't require vc.el. 2002-09-04 20:49:35 +00:00
André Spiegel
ea28aa358e (vc-rcs-fetch-master-state): Be more careful to check
if this is really an RCS master file.
2002-07-19 13:27:44 +00:00
André Spiegel
c9a1f2af3d (vc-rcs-register): Fix handling of vc-[rcs-]register-switches.
(vc-rcs-checkin-switches, vc-rcs-checkout-switches): Removed, since
they weren't used yet.
2002-03-18 17:17:38 +00:00
André Spiegel
2e87226170 (vc-rcs-diff): Use consistent parameter format for
vc-diff-switches-list.
2002-02-25 22:04:29 +00:00
André Spiegel
7735770bb4 (vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
that we see expanded headers.
(vc-rcs-trunk-p, vc-rcs-branch-part, vc-rcs-branch-p,
vc-rcs-minor-part, vc-rcs-previous-version): Removed.  These are
available from vc.el.  Updated all callers.
2002-01-05 17:21:06 +00:00
André Spiegel
99739bbf42 (vc-*-revert-file): Handle new optional arg CONTENTS-DONE. 2001-08-28 17:06:36 +00:00
Pavel Janík
e8af40eed4 Some fixes to follow coding conventions. 2001-07-16 12:23:00 +00:00
André Spiegel
cdc2fe43d4 (vc-rcs-print-log): Output to buffer *vc*, not the current buffer.
(vc-rcs-diff): Output to buffer *vc-diff*, not the current buffer.
2001-03-10 10:50:16 +00:00
Dave Love
891b8b69b4 Copyright up-date. 2001-02-01 17:42:44 +00:00
André Spiegel
10489ed706 (vc-rcs-diff-switches): New customization option.
(vc-rcs-diff): Use it via vc-diff-switches-list.
2001-02-01 15:11:05 +00:00
Dave Love
f0e7c067eb (vc-rcs-header): Fix :type. 2001-01-09 14:53:56 +00:00
André Spiegel
fe96236468 (vc-rcs-checkout, vc-rcs-cancel-version): Renamed arg WRITABLE to EDITABLE. 2001-01-08 16:25:43 +00:00
André Spiegel
ceaa99745a (vc-rcs-state): Before calling vc-workfile-unchanged-p, require vc. 2000-11-20 14:14:25 +00:00
André Spiegel
036f45faec (vc-rcs-state): Call vc-workfile-unchanged-p only here, and
differentiate according to checkout model.
(vc-rcs-fetch-master-state): Don't call vc-workfile-unchanged-p, since
this function is only concerned with master state.
2000-11-19 09:46:04 +00:00
André Spiegel
8f98485f77 Functions reordered. 2000-11-16 18:14:41 +00:00
André Spiegel
fb0d6a7904 (vc-rcs-receive-file): Rewritten to contain only backend-specific
code.
2000-10-03 12:08:40 +00:00
André Spiegel
a7e98271c7 (vc-rcs-fetch-master-state): Parse and remember default branch
unconditionally.
(vc-rcs-set-default-branch): New function.
(vc-rcs-cancel-version, vc-rcs-checkin, vc-rcs-checkout): Use it.
(vc-rcs-checkin): If an appropriate default branch has been set,
force creation of that branch.
2000-10-03 11:33:59 +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
b6969bdbd6 (vc-rcs-receive-file): Call comment-history unconditionally. Use the
comments as initial contents of the log entry buffer.  Document the
trick to force branch creation with no changes.
2000-10-01 11:17:42 +00:00
Gerd Moellmann
0bc5875628 (toplevel): Require `vc' when compiling. 2000-09-22 11:57:30 +00:00
André Spiegel
ed70380d9d (vc-rcs-checkin): Fix bug that prevented check-in without explicit
revision number.
2000-09-22 07:48:08 +00:00
André Spiegel
0db2c43cde (vc-rcs-workfile-is-newer): New function.
(vc-rcs-state-heuristic): Use it to guess the state of files with
non-strict locking.
(vc-rcs-find-most-recent-rev): Handle the case when a branch has been
set with -b, but not created yet.
(vc-rcs-fetch-master-state): With non-strict locking, compare file
contents in order to find the state.
(vc-rcs-checkin): Allow creation of branches with no changes.
(vc-rcs-unregister, vc-rcs-receive-file,
vc-rcs-set-non-strict-locking): New functions.
2000-09-21 13:21:41 +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
33c1b7a13a Doc fixes.
(vc-rcs-register-switches, vc-rcs-checkin-switches)
(vc-rcs-checkout-switches, vc-rcs-header)
(vc-rcs-master-templates): Add or change :version.
2000-09-07 20:02:38 +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
d8aff0773f (vc-rcs-show-log-entry): New function.
(vc-rcs-checkin, vc-rcs-checkout): Don't set all properties.
(vc-rcs-register): If there is no RCS subdir, ask the
user whether to create one.
(vc-rcs-state-heuristic): Use
file-ownership-preserved-p.
(vc-rcs-checkout): Remove the error-handling for missing-rcs.
(vc-rcs-state-heuristic): Don't use file-writable-p.
(vc-rcs-print-log): Insert in the current buffer.
(vc-rcs-diff): Insert in the current buffer and remove unused arg
CMP.
(vc-rcs-workfile-unchanged-p): Use vc-do-command
instead of vc-simple-command.
(vc-rcs-fetch-master-state): Removed check for unlocked-changes to
avoid doing a diff when opening a file.
(vc-rcs-state): Added check for unlocked-changes.
(vc-rcs-header): Escape Id.
(vc-rcs-workfile-unchanged-p): Remove optional arg VERSION.
(vc-rcs-state): Call vc-workfile-unchanged-p, not the RCS-specific
version.
(vc-rcs-state-heuristic): Use file-writable-p instead
of comparing userids.
(vc-rcs-fetch-master-state): Handle the case where rcs is missing.
Simplify the logic by eliminating unreachable code.
(vc-rcs-diff): Only pass `2' to vc-do-command if necessary and
just do a recursive call if we need to retry.
(vc-rcs-checkout): Handle the case where rcs is missing by making
the buffer read-write if requested and re-signalling the error.
(vc-rcs-find-most-recent-rev): New function.  The code
derives from the old vc-parse-buffer but uses the revision number
rather than the date (much easier to compare robustly).
(vc-rcs-fetch-master-state): Use `with-temp-buffer'.  Adapt to the
new vc-parse-buffer (and vc-rcs-find-most-recent-rev).  Find the
locking-user more directly.  Check strict locking and set
checkout-model appropriately.
(vc-rcs-parse-locks): Remove.
(vc-rcs-latest-on-branch-p): Use with-temp-buffer and adapt to the
new vc-parse-buffer (and vc-rcs-find-most-recent-rev).
(vc-rcs-system-release): Use with-current-buffer and
vc-parse-buffer.
(vc-rcs-register, vc-rcs-checkout): Use with-current-buffer.
 Merge in code
from vc-rcs-hooks.el.  Don't require 'vc anymore.
(vc-rcs-responsible-p): Use expand-file-name instead of concat and
file-directory-p instead of file-exists-p.
(vc-rcs-exists): Remove.
(vc-rcs-header): New var.
 Update Copyright.
(vc-rcs-rename-file): New function.
(vc-rcs-diff): Remove unused `backend' variable.
(vc-rcs-clear-headers): New function; code moved here
from vc-clear-headers in vc.el.
(tail): Provide vc-rcs and remove vc-rcs-logentry-check.
(vc-rcs-register): Parse command output to find master
file name and workfile version.
(vc-rcs-checkout): Removed call to vc-file-clear-masterprops.
 Require vc and vc-rcs-hooks.
(vc-rcs-trunk-p, vc-rcs-branch-part): Move to vc-rcs-hooks.
(vc-rcs-backend-release-p): Remove (use vc-rcs-release-p).
(vc-release-greater-or-equal-p): Move from vc.
(vc-rcs-trunk-p, vc-rcs-branch-p, vc-rcs-branch-part,
vc-rcs-minor-part, vc-rcs-previous-version): Remove duplicates.
(vc-rcs-checkout): Add a missing `new-version' argument in the
call to vc-rcs-latest-on-branch-p.  Hopefully that was the right
one.
(vc-rcs-steal-lock): Renamed from `vc-rcs-steal'.
 Updated everything to use `vc-checkout-model'.
(vc-rcs-backend-release-p): function added.  other
stuff updated to reference this function instead of the old
`vc-backend-release-p'.
(vc-rcs-logentry-check): Function added.
(vc-rcs-checkin, vc-rcs-previous-version)
(vc-rcs-checkout): Name space cleaned up.  No more revision number
crunching function names that are not prefixed with vc-rcs.
(vc-rcs-checkout-model): Function added.  References to
`vc-checkout-model' replaced.
(vc-rcs-admin): Added the query-only option as
required by the vc.el file.
(vc-rcs-exists): Function added.
(vc-*-checkout):
Use with-temp-file instead of /bin/sh.  Merged from mainline
(vc-rcs-latest-on-branch-p): Moved to vc-rcs-hooks.el.
(vc-rcs-latest-on-branch-p, vc-rcs-trunk-p)
(vc-rcs-branch-p, vc-rcs-branch-part, vc-rcs-minor-part)
(vc-rcs-previous-version): Functions added.
(vc-rcs-diff): Function added.
(vc-rcs-checkout) Bug (typo) found and fixed.
(vc-rcs-register-switches) Variable `vc-rcs-register-switches' added.
 Require vc when compiling.
(vc-rcs-print-log, vc-rcs-assign-name, vc-rcs-merge)
(vc-rcs-check-headers, vc-rcs-steal, vc-rcs-uncheck, vc-rcs-revert)
(vc-rcs-checkin): New functions (code from vc.el).
(vc-rcs-previous-version, vc-rcs-system-release, vc-rcs-checkout):
Doc fix.
(vc-rcs-release): Deleted.  (Duplicated vc-rcs-system-release).
(vc-rcs-trunk-p, vc-rcs-branch-p, vc-rcs-branch-part)
(vc-rcs-minor-part, vc-rcs-previous-version, vc-rcs-release)
(vc-rcs-release-p, vc-rcs-admin, vc-rcs-checkout): New functions
from vc.el.
(vc-rcs-system-release):
Renamed from vc-rcs-backend-release.
2000-09-04 19:47:43 +00:00