summaryrefslogtreecommitdiff
path: root/lisp/vc-rcs.el
Commit message (Collapse)AuthorAgeFilesLines
* Update years in copyright notice; nfc.Thien-Thi Nguyen2006-02-061-1/+1
|
* (vc-rcs-fetch-master-state, vc-rcs-consult-headers): Pass FILE toAndré Spiegel2006-01-271-2/+3
| | | | vc-user-login-name.
* (vc-rcs-state-heuristic): Use file-attributes with ID-FORMATAndré Spiegel2006-01-221-3/+3
| | | | `string'. This allows us to get rid of `vc-user-login-name UID'.
* Update years in copyright notice; nfc.Thien-Thi Nguyen2005-08-061-2/+2
|
* Update FSF's address.Lute Kamstra2005-07-041-2/+2
|
* (vc-rcs-annotate-command):Thien-Thi Nguyen2004-12-291-0/+1
| | | | Fix omission bug: Call `vc-setup-buffer'.
* (vc-rcs-parse): New function.Thien-Thi Nguyen2004-11-191-2/+464
| | | | | | | (vc-rcs-annotate-command): Likewise. (vc-rcs-annotate-current-time): Likewise. (vc-rcs-annotate-time): Likewise. (vc-rcs-annotate-extract-revision-at-line): Likewise.
* Doc fix.Stefan Monnier2004-09-071-4/+5
|
* (vc-rcs-checkout-model): Look at the version headers only ifAndré Spiegel2004-07-021-5/+9
| | | | vc-consult-headers is non-nil.
* (vc-rcs-print-log, vc-rcs-diff): Add optional BUFFER argument.André Spiegel2004-03-211-5/+5
|
* Add arch taglinesMiles Bader2003-09-011-1/+2
|
* (vc-rcs-register, vc-rcs-checkin, vc-rcs-checkout)Stefan Monnier2003-05-081-22/+8
| | | | (vc-rcs-find-version, vc-rcs-diff): Use vc-switches.
* Trailing whitespace deleted.Juanma Barranquero2003-02-041-13/+13
|
* (vc-rcs-checkout): Fix the check whether we are on a branch.André Spiegel2003-01-071-2/+2
|
* (vc-rcs-revert): Unlock only if the user does have the lock.André Spiegel2003-01-031-2/+3
|
* (vc-rcs-checkin): By default, always specify theAndré Spiegel2002-12-261-1/+3
| | | | current branch of the working file for check-in.
* (vc-rcs-checkout): Handle t argument for REV.André Spiegel2002-12-261-7/+19
|
* (vc-rcs-registered): Improve comment.André Spiegel2002-11-131-3/+7
|
* (vc-rcs-registered): Handle the autoload cookie so that the definitionMarkus Rost2002-11-121-3/+4
| | | | is found by `find-function-search-for-symbol' and etags.
* (vc-rcs-find-version): Fix vc-checkout-switches use.Stefan Monnier2002-10-081-2/+4
|
* (vc-rcs-find-version): New fun.Stefan Monnier2002-10-081-63/+46
| | | | (vc-rcs-checkout): Remove `workfile' arg and simplify.
* (vc-rcs-show-log-entry): Delete.Stefan Monnier2002-10-041-32/+1
|
* (vc-rcs-state): Don't require vc.el.André Spiegel2002-09-041-2/+1
|
* (vc-rcs-fetch-master-state): Be more careful to checkAndré Spiegel2002-07-191-2/+5
| | | | if this is really an RCS master file.
* (vc-rcs-register): Fix handling of vc-[rcs-]register-switches.André Spiegel2002-03-181-24/+2
| | | | | (vc-rcs-checkin-switches, vc-rcs-checkout-switches): Removed, since they weren't used yet.
* (vc-rcs-diff): Use consistent parameter format forAndré Spiegel2002-02-251-2/+2
| | | | vc-diff-switches-list.
* (vc-rcs-steal-lock): Do a real checkout after stealing the lock, soAndré Spiegel2002-01-051-44/+14
| | | | | | | 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.
* (vc-*-revert-file): Handle new optional arg CONTENTS-DONE.André Spiegel2001-08-281-2/+2
|
* Some fixes to follow coding conventions.Pavel Janík2001-07-161-2/+4
|
* (vc-rcs-print-log): Output to buffer *vc*, not the current buffer.André Spiegel2001-03-101-3/+3
| | | | (vc-rcs-diff): Output to buffer *vc-diff*, not the current buffer.
* Copyright up-date.Dave Love2001-02-011-2/+2
|
* (vc-rcs-diff-switches): New customization option.André Spiegel2001-02-011-11/+18
| | | | (vc-rcs-diff): Use it via vc-diff-switches-list.
* (vc-rcs-header): Fix :type.Dave Love2001-01-091-2/+2
|
* (vc-rcs-checkout, vc-rcs-cancel-version): Renamed arg WRITABLE to EDITABLE.André Spiegel2001-01-081-9/+9
|
* (vc-rcs-state): Before calling vc-workfile-unchanged-p, require vc.André Spiegel2000-11-201-8/+9
|
* (vc-rcs-state): Call vc-workfile-unchanged-p only here, andAndré Spiegel2000-11-191-8/+5
| | | | | | 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.
* Functions reordered.André Spiegel2000-11-161-409/+443
|
* (vc-rcs-receive-file): Rewritten to contain only backend-specificAndré Spiegel2000-10-031-31/+7
| | | | code.
* (vc-rcs-fetch-master-state): Parse and remember default branchAndré Spiegel2000-10-031-40/+48
| | | | | | | | 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.
* * vc.el (vc-editable-p): Minor optimization.Stefan Monnier2000-10-011-13/+15
| | | | | | | | | | | | | | | | | | (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'.
* (vc-rcs-receive-file): Call comment-history unconditionally. Use theAndré Spiegel2000-10-011-8/+7
| | | | | comments as initial contents of the log entry buffer. Document the trick to force branch creation with no changes.
* (toplevel): Require `vc' when compiling.Gerd Moellmann2000-09-221-1/+4
|
* (vc-rcs-checkin): Fix bug that prevented check-in without explicitAndré Spiegel2000-09-221-2/+2
| | | | revision number.
* (vc-rcs-workfile-is-newer): New function.André Spiegel2000-09-211-7/+90
| | | | | | | | | | | | (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.
* * vc-sccs.el (vc-sccs-register):Stefan Monnier2000-09-091-2/+1
| | | | | | * 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.
* Doc fixes.Dave Love2000-09-071-24/+28
| | | | | | (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-05 Stefan Monnier <monnier@cs.yale.edu>Stefan Monnier2000-09-051-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* (vc-rcs-show-log-entry): New function.Gerd Moellmann2000-09-041-0/+737
(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.