Commit graph

374 commits

Author SHA1 Message Date
Richard M. Stallman
4c145b9e93 (vc-rename-file): After renaming, update VC info and modeline.
Preserve buffer-read-only.
1996-05-13 01:31:28 +00:00
Richard M. Stallman
c9b35eceec (vc-comment-ring): Initialise using make-ring.
(vc-clear-context): Initialise vc-comment-ring using make-ring.
(vc-finish-logentry): Don't initialise vc-comment-ring here.
1996-04-16 22:33:07 +00:00
Richard M. Stallman
b91916f330 (vc-update-change-log): Use add-log-full-name and
add-log-mailing-address only if non-nil.
1996-03-22 13:25:21 +00:00
Richard M. Stallman
9596811a3d Comment change. 1996-03-02 06:37:35 +00:00
Richard M. Stallman
48078f8f69 (vc-diff): Make NOT-URGENT default to t. 1996-01-26 19:36:34 +00:00
Karl Heuer
f008ca5831 * vc.el (vc-backend-checkout): Use let to restore default-directory.
(vc-next-action-dired): Likewise.
1996-01-24 23:32:49 +00:00
Erik Naggum
b578f267af Update FSF's address. 1996-01-14 07:34:30 +00:00
André Spiegel
ae2506d066 (vc-cancel-version): Use search-forward to scan error message. Added
comments.
1996-01-10 15:24:03 +00:00
Karl Heuer
449decf581 (vc-update-change-log): Use add-log-full-name and
add-log-mailing-address if they are defined.
1996-01-08 22:24:05 +00:00
Karl Heuer
a7acbbe4d4 Comment fixes. 1996-01-05 22:21:28 +00:00
André Spiegel
7e48e09205 (vc-cancel-version): Handle versions that start a new branch.
(vc-backend-checkout): SCCS case: handle empty revision number.
(vc-diff): Don't pop to the *vc-diff* buffer if file is unchanged.
Better doc strings for a few variables.
1996-01-04 16:00:05 +00:00
Erik Naggum
90681ae2ef (vc-backend-checkin): Use vc-checkin-switches. 1995-12-29 20:49:46 +00:00
Richard M. Stallman
e7ffe86a90 (vc-revert-buffer1): Pass t as preserve-modes to revert-buffer. 1995-12-25 21:07:12 +00:00
Richard M. Stallman
2c28ac43ed Fix error message style.
(vc-backend-checkout, vc-backend-checkin):
Allow vc-checkin-switches to be a string.
1995-12-25 18:46:17 +00:00
Richard M. Stallman
221cc4f4dc (vc-directory): Require dired.
(vc-revert-buffer): Ignore vc-suppress-confirm.
1995-11-13 20:24:46 +00:00
André Spiegel
99e76ddade (vc-backend-diff): Use new variable vc-rcsdiff-knows-brief. 1995-11-02 09:36:01 +00:00
André Spiegel
1ba1cade16 (vc-next-action-on-file): When locking the latest trunk version,
use empty version number.
1995-10-04 15:13:04 +00:00
André Spiegel
2f119435a6 (vc-dired-mode): Now a major mode derived from dired-mode.
(vc-directory): Take DIRNAME as an argument.  Ask for it in
the minibuffer.
Don't kill pre-existing vc-dired buffers (dired now re-uses the
right one).
(vc-file-tree-walk): New argument DIRNAME.  Updated all callers.
(vc-dired-update): New function.  `g' in vc-dired-mode calls it.
(vc-dired-reformat-line): Handle different ls -l formats.
1995-09-08 20:39:17 +00:00
André Spiegel
8dd7134575 (vc-dired-update-line): Don't use dired-do-redisplay.
(vc-next-action-dired): Adjust default-directory before calling
vc-next-action-on-file.
(vc-next-action-on-file): Handle CVS merge in vc-dired-mode correctly.
(vc-next-action): Ask for a check-in comment if there are "added" CVS files.
Don't special-case single files in vc-dired-mode.
(vc-file-clear-masterprops): Typo fix.
(vc-latest-on-branch-p): Always true for CVS.
(vc-directory): Header change.  Do display the buffer, even if no
locked/registered files were found.
1995-08-29 10:52:14 +00:00
André Spiegel
b0c9bc8c21 (vc-directory): Kill existing vc-dired buffers for this directory.
Provide a better header.  Corrected the check whether any files were
found at all (don't display a listing in this case).  Under CVS,
display cvs-status rather than vc-locking-user.
(vc-next-action-on-file): When doing a check-in in vc-dired-mode, find
the file in another window.
(vc-next-action-dired): Update dired listing while processing the
files.
(vc-next-action): Check whether a check-in comment is really needed
for this mass operation.
(vc-checkout): Resynch the buffer, even if it's not current.
(vc-dired-state-info, vc-dired-update-line): New functions.
(vc-dired-prefix-map): Added local definition for `g' and `='.
(vc-dired-reformat-line): Simplified.  Erase the hardlink count from
the listing, because it doesn't relate to version control.
(vc-rcs-release, vc-cvs-release, vc-sccs-release): New variables, may
be set by the user.
(vc-backend-release, vc-release-greater-or-equal, vc-backend-release-p):
New Functions.
(vc-do-command): Allow FILE to be nil.
(vc-backend-checkin): When creating a branch, don't bother to unlock
the old version if this is RCS 5.6.2 or higher.
(vc-next-action-on-file): Allow lock-stealing only if RCS 5.6.2 or
higher.
(vc-backend-admin, vc-backend-checkin): If available, use ci -i and -j.
Updated Developer's Notes.
1995-08-25 18:30:11 +00:00
André Spiegel
6b9d0764ce Removed the comment that said we assume strict locking.
(vc-next-action-dired): Don't switch to vc-parent-buffer, because that
was already done.
1995-08-22 17:53:14 +00:00
André Spiegel
8e7eda1a73 (vc-latest-on-branch-p): Under CVS, handle the case when the file is
added, but not yet committed.
(vc-backend-checkout): RCS case: In non-strict locking mode, force to
overwrite the writable workfile. CVS case: Do the right thing in
CVSREAD-mode.
1995-08-21 19:27:05 +00:00
Richard M. Stallman
4040437e1f (file-regular-p-18): Fix test for whether to use this. 1995-08-20 01:45:13 +00:00
André Spiegel
61dee1e7cf (vc-next-action-on-file): Changed doc string, CVS case.
(vc-backend-checkin): Clear master properties before doing the
check-in.  In the CVS case, catch error and display an appropriate
message in the echo area.
(vc-backend-revert): Clear master properties, because some might get
outdated by the operation.
(vc-backend-merge-news): Scan the output of "cvs update" and find out
whether conflicts have occurred.
(vc-finish-logentry): Delete the *VC-log* buffer *before* doing the
actual check-in. That leads to a better display in case the check-in
fails.
(vc-latest-on-branch-p): Defined it for CVS in the obvious way.
(vc-next-action-on-file): Removed special CVS cases. At this level,
CVS is now mostly handled like the other backends.
(vc-backend-checkout): CVS case: Clear sticky tag as default when
doing a verbose checkout. (This used to be done in
vc-next-action-on-file.)
1995-08-18 20:29:14 +00:00
André Spiegel
e163b283fe (vc-next-action-on-file): Moved the setting of the default branch to
vc-backend-checkout, where it belongs.
(vc-backend-checkout): If an explicit version was specified, adjust
the default branch accordingly.
1995-08-17 14:10:09 +00:00
André Spiegel
7d88be5279 Changed references to vc-top-version into vc-master-workfile-version. 1995-08-17 13:50:33 +00:00
André Spiegel
9341ff29bc (vc-next-action-on-file): Query when trying to lock non-latest
version.
1995-08-17 13:08:36 +00:00
André Spiegel
c8de1d9112 (vc-revert-buffer1): Split part of the function into vc-buffer-context
and vc-restore-buffer-context, so we can use it also in other
circumstances.
(vc-buffer-context, vc-restore-buffer-context): New functions.
(vc-clear-headers): New function, uses the above.
(vc-cancel-version): When `norevert', locks the most recent remaining
version.  Also, refuse to work on anything but the latest version of
a branch.  Removed the check whether the version is the user's,
because that is difficult to decide, now that multiple branches are
possible.
(vc-latest-on-branch-p): New function.
(vc-head-version): New access function to the already existing
property.
(vc-trunk-p, vc-branch-part): Functions moved before first use.
1995-08-17 12:40:03 +00:00
Richard M. Stallman
8cc8dc43f7 (vc-dired-reformat-line): Display eight character user names correctly. 1995-08-10 19:46:16 +00:00
Richard M. Stallman
fab2e906ba (vc-revert-buffer): In a dedicated solitary window,
make the frame invisible instead of trying to delete window.
1995-08-08 21:18:36 +00:00
Richard M. Stallman
503b5c8591 (vc-resynch-buffer): New function.
(vc-locked-example): Renamed to vc-snapshot-precondition. It now also
checks whether any of the files are visited.
(vc-retrieve-snapshot): If any files are visited, ask whether to
revert their buffers. Use vc-backend-checkout and vc-resynch-buffer
to do that, instead of vc-checkout.

(vc-backend-checkout): Adjust default-directory so that the
checked-out file goes to the right place.
1995-07-29 01:40:43 +00:00
Richard M. Stallman
6aa1372974 (vc-do-command): Added parameter BUFFER (the default,
if nil, is *vc*). Updated all callers.
(vc-next-action-on-file, vc-diff, vc-version-diff, vc-backend-diff):
Use buffer *vc-diff* for diff output instead of *vc*.
1995-07-18 20:52:39 +00:00
Karl Heuer
25b80ac146 (vc-backend-merge-news): Force to refetch the
properties after the merge.
1995-07-17 23:04:30 +00:00
Richard M. Stallman
7e86965908 (vc-start-entry): Prevent lossage when doing a mass checkin from
a VC-dired buffer (Andre Spiegel's code change was slightly wrong).
1995-06-26 23:42:30 +00:00
Richard M. Stallman
9e0cc6e686 (vc-backend-admin, vc-backend-checkin): Assume that
comments are empty if they contain only white space.
1995-06-23 15:50:17 +00:00
Richard M. Stallman
993a1a444f (vc-register): Inhibit backups for the file's buffer
(vc-add-triple, vc-lookup-triple, vc-record-rename):
Use absolute file names to access the SCCS named configuration files
("VC-names").

(vc-retrieve-snapshot): Use vc-checkout instead of
vc-backend-checkout, as the former also updates the current buffer.
(vc-file-tree-walk, vc-file-tree-walk-internal): Use
expand-file-name, so that FUNC gets called with an unabbreviated name.
1995-06-19 13:36:45 +00:00
Richard M. Stallman
b7011339a2 (vc-lookup-triple): changed the code that used to call
vc-master-info, which no longer exists. Adapted to the new
parameter format of vc-parse-buffer.
1995-06-16 18:11:46 +00:00
Richard M. Stallman
d7eff0e04e (vc-backend-dispatch): Move definition before first use. 1995-06-16 18:04:47 +00:00
Richard M. Stallman
88a2ffaf93 Adapt to the changes in vc-hooks.el, namely, the new
'none-value of vc-locking-user, and the consistent caching
of all properties.  Especially, make the properties survive
check-ins and check-outs.  Various minor bug fixes.

(vc-file-clear-masterprops): New function.

(vc-backend-checkin, vc-backend-revert): Set vc-locking-user
to 'none if the file is unlocked.

(vc-backend-checkin, vc-backend-revert, vc-backend-checkout):
Use vc-file-clear-masterprops, and adjust those properties
that are not cleared.

(vc-resynch-window):  Temporarily remove vc-find-file-hook, so
that we don't lose the file properties during check-in/out.

(vc-resynch-window): Do not try to delete the current window if
`vc-keep-workfiles' is nil (doesn't make sense; killing the
buffer is enough.)

(vc-backend-checkin): Rewrote the code that adjusts the default
branch and removes any locks that might remain after check-in.

(vc-cancel-version): Abort with error message in the CVS case.
(The error used to be signalled in vc-backend-uncheck, which is
a little too late.)

(vc-minor-revision): Function removed.
1995-06-16 18:02:51 +00:00
Richard M. Stallman
7d66500869 (vc-backend-checkin): Provide an explicit string saying
the log message is empty instead of providing it as empty.
Always use -m option for ci.
1995-06-14 11:16:17 +00:00
Karl Heuer
d144b02862 (vc-backend-checkin): Handle RCS `co'-output in the event
that a check-in only results in reverting to the previous version.
Also be more robust if the new version number cannot be told from
what `co' says.
1995-06-09 01:21:18 +00:00
Karl Heuer
f1b82fc8cf (vc-register): Check for a visited file first thing. 1995-06-09 01:17:59 +00:00
Karl Heuer
f7aabd88d8 (vc-register): Clean error message if no visited file. 1995-06-07 20:50:55 +00:00
Karl Heuer
c8502397cc (vc-revert-buffer1): Delete the special code for font-lock. 1995-05-29 07:00:06 +00:00
Karl Heuer
f3c61d82f2 (vc-next-action-on-file): Add missing let-binding.
(vc-default-backend, vc-keep-workfiles, vc-consult-headers):
(vc-mistrust-permissions, vc-path): Vars moved to vc-hooks.el.
(vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info):
(vc-log-info, vc-consult-rcs-headers, vc-fetch-properties):
(vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user):
(vc-latest-version, vc-your-latest-version, vc-branch-version):
(vc-workfile-version): Functions moved to vc-hooks.el.
(vc-trunk-p, vc-minor-revision, vc-branch-part): Functions moved
here from vc-hooks.el.
1995-04-26 21:47:35 +00:00
Richard M. Stallman
c6d4f6288a (vc-backend-checkout): Pass vc-checkout-switches arg
properly to vc-do-command.

(vc-update-change-log): Use vc-buffer-backend in menu-enable.

(vc-file-clearprops, vc-workfile-version): Functions moved to vc-hooks.el.

Add branch support for RCS; treat CVS more like RCS and SCCS.
(vc-next-action-on-file): changed CVS handling, such that C-x C-q
works as with RCS and SCCS.
(vc-consult-rcs-headers): New function.
(vc-branch-version): New per-file property, refers
to the RCS version selected by `rcs -b'.
(vc-workfile-version): New function.  Also new per-file property
(vc-consult-headers): New parameter variable.
(vc-mistrust-permissions): Default set to `nil'.
(vc-locking-user): Property is now cached.  The other functions
update it as necessary.  Attempts to use RCS headers if enabled.
(vc-log-info, vc-parse-buffer): Various bug fixes.  Added support
for property `vc-branch-version'.
(vc-backend-checkout): RCS case: if no explicit version
is specified, check out `vc-workfile-version'.  After check-out,
set `vc-workfile-version' according to the version number
reported by "co".
(vc-backend-checkin): RCS case: remove any remaining locks
if a new branch was created.  After every check-in, adjust
the current branch using `rcs -b' (this cannot be avoided).
CVS case: allow for explicit checkin, but only on the trunk.
(vc-next-action-on-file, vc-backend-checkout, vc-backend-checkin,
vc-backend-revert, vc-backend-diff): Explicitly use
vc-workfile-version as the default version to operate on.
1995-04-26 10:12:24 +00:00
Richard M. Stallman
243a81f524 (vc-update-change-log): Use new -u option for rcs2log. 1995-03-21 20:22:41 +00:00
Richard M. Stallman
b75f9a7686 (vc-path): Use /usr/sccs only if it is a dir. 1995-03-11 02:17:04 +00:00
Boris Goldowsky
6b60c5d19f (vc-comment-to-change-log): Remove ^ from paragraph-start & paragraph-separate. 1995-03-02 15:55:09 +00:00
Richard M. Stallman
46cd263f61 (vc-do-command): Search vc-path first, not last. 1995-03-01 08:30:54 +00:00