Commit graph

395 commits

Author SHA1 Message Date
Richard M. Stallman
7d2d948212 (diff-switches): defvar deleted.
(vc-annotate-*): New functions and variables.
1997-06-09 06:01:12 +00:00
André Spiegel
a1d713ef1e (vc-backend-admin): If there is no SCCS subdirectory yet, create it. 1997-05-21 14:42:09 +00:00
Richard M. Stallman
0101cc4045 Use defgroup and defcustom.
Doc fixes.
1997-05-05 20:56:20 +00:00
Richard M. Stallman
124c852b0a (vc-update-change-log): Run `rcs2log' in the correct
directory when ChangeLog is found elsewhere.  Display any error
output from rcs2log.
1997-04-12 03:14:16 +00:00
Richard M. Stallman
f0b188ed3d (vc-checkin-hook): Doc fix.
(vc-before-checkin-hook): New hook.
(vc-start-entry): Use it.
1997-04-01 21:47:17 +00:00
Richard M. Stallman
4cbeb71c2a (vc-next-action-on-file): With implicit checkout, make
sure not to lose unsaved changes.
1997-03-21 20:06:04 +00:00
André Spiegel
eb302e54e9 (vc-backend-diff): Handle RCS and SCCS separately. 1997-03-04 18:00:30 +00:00
Karl Heuer
37667a5cd2 (vc-log-mode): New optional arg FILE. Set vc-log-file here.
(vc-start-entry): Not here.
(vc-finish-logentry): Run vc-finish-logentry-hook.
1997-02-27 01:21:24 +00:00
Richard M. Stallman
2bb00bdd36 (vc-do-command): If OKSTATUS is nil, ignore errors.
(vc-backend-release): For RCS, pass nil for OKSTATUS.
1997-02-10 20:43:37 +00:00
André Spiegel
28a25aa5ea Changed my e-mail address in the header. 1997-01-03 13:51:36 +00:00
André Spiegel
8172cd867b (vc-next-action-on-file, vc-update-change-log,
vc-backend-checkout, vc-backend-steal): Use `vc-user-login-name'
instead of `user-login-name'.
(vc-update-change-log): If `user-full-name' is nil, try
`user-login-name'.  Failing that, use uid as a string.
(vc-make-buffer-writable-hook): Removed (was unused).
1996-12-26 12:07:05 +00:00
Geoff Voelker
b86b9918dd Use w32 instead of ms-windows for window-system symbol 1996-11-19 06:59:17 +00:00
Richard M. Stallman
81b8f0e64b (vc-backend-print-log): Use "cvs log" to get log entries, not "cvs rlog". 1996-11-07 03:17:16 +00:00
André Spiegel
010d626940 (vc-dired-reformat-line): Discard check for numerical value of
vc-locking-user.
1996-10-17 20:35:46 +00:00
André Spiegel
b667752da8 (vc-print-log): Set the display window so that it shows
the current log entry completely.
1996-09-16 14:43:29 +00:00
André Spiegel
6dfe5fe02d (vc-print-log): Move point to the log entry of the current version. 1996-09-08 11:52:05 +00:00
Richard M. Stallman
a633d9afc2 (vc-register-switches): New variable.
(vc-backend-admin): Use vc-register-switches.
1996-09-01 18:33:12 +00:00
Richard M. Stallman
d68e699042 (vc-update-change-log): Doc fix. 1996-08-30 18:42:29 +00:00
Richard M. Stallman
73a9679c91 (vc-update-change-log): Remove code which found RCS files
only in RCS directory; leave this to rcs2log, which will find
entries for CVS or RCS/*,v and *,v.  Lose sub-process' stderr
output.  Doc fix.
1996-08-29 21:22:07 +00:00
Richard M. Stallman
bcbe4d5724 (vc-do-command): Bind win32-quote-process-args. 1996-07-26 21:22:34 +00:00
Richard M. Stallman
1694bd1603 (vc-cancel-version): Fix paren error. 1996-06-05 17:57:26 +00:00
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