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

260 Commits

Author SHA1 Message Date
Richard M. Stallman
29fc1ce993 (vc-backend-checkout): Add if-statements to the shell cmds
to discard the extra arg some shells make.

(vc-rename-file): Add autoload cookie.

(vc-steal-lock): (1) Function should be non-interactive, because it
doesn't work when called directly by the user. (2) Don't display
revision "nil" when stealing lock if revision is unknown.  (3) Put
"Stolen lock on <file>" instead of just the file name in the Subject
of the notification message.
1994-09-24 00:58:07 +00:00
Richard M. Stallman
eadcb02c53 (vc-do-command): Temporarily add vc-path to the end of PATH. 1994-09-11 08:36:36 +00:00
Richard M. Stallman
c9ce5e2c7a (vc-backend-checkout): Don't use -G for SCCS. 1994-08-26 00:05:30 +00:00
Richard M. Stallman
6bcb1d4ede (vc-admin): Pass nil as last arg to vc-start-entry. 1994-08-18 00:38:13 +00:00
Richard M. Stallman
dbf87856a1 Comment change. 1994-07-26 20:37:32 +00:00
Richard M. Stallman
cdaf7a1a56 (vc-next-action): Even in 1-file case, get its name from FILES.
(vc-finish-logentry): Don't do vc-buffer-sync on the parent buffer
when that parent buffer is a dired buffer.
1994-07-26 20:34:16 +00:00
Richard M. Stallman
5c6f8be0d2 At compile time, require dired.
(vc-finish-logentry): Use the proper files buffer for vc-buffer-sync.
1994-07-19 22:30:06 +00:00
Richard M. Stallman
e2bef5c3a2 (vc-finish-logentry): Use the value of vc-log-after-operation-hook of
*VC-log* buffer instead of vc-parent-buffer.
1994-07-13 09:34:01 +00:00
Richard M. Stallman
b965445fdf (vc-start-entry): New arg after-hook.
Set vc-log-operation-hook locally.
(vc-next-action-on-file): Not here.
(vc-admin): Pass new arg.
(vc-checkin): Pass new arg instead of setting vc-log-operation-hook.
1994-07-06 22:08:03 +00:00
Richard M. Stallman
ce37bf2068 (vc-update-change-log): Pass a -n option to rcs2log. 1994-07-02 04:49:30 +00:00
Karl Heuer
d733c5ec03 Update copyright. 1994-05-03 22:46:37 +00:00
Richard M. Stallman
cec574b950 (vc-backend-diff): Test of cmp was backwards. 1994-04-22 04:31:27 +00:00
Richard M. Stallman
61446fe76f (vc-checkin): Undo previous change. 1994-03-30 02:14:11 +00:00
Roland McGrath
32eff0b035 (vc-checkin): Insert name of current defun in comment buffer. 1994-03-29 00:03:10 +00:00
Richard M. Stallman
4561b08b0a Comment change. 1994-02-18 19:46:53 +00:00
Paul Eggert
47ca02a62c (vc-lookup-triple): Yield nil, not "", if NAME is nil.
Otherwise vc-revert-buffer fails with SCCS.
1994-02-18 02:51:33 +00:00
Karl Heuer
412082915f (vc-comment-to-change-log): Load add-log before binding
add-log-current-defun-function.
1994-02-09 23:02:28 +00:00
Eric S. Raymond
1892807a4d vc-parse-buffer: arrange for old properties to get cleared when their
match string is not found in the master file.
1994-02-02 03:27:26 +00:00
Richard M. Stallman
d0b81713e0 Comment change. 1994-01-14 14:16:29 +00:00
Paul Eggert
b2396d1f39 (vc-finish-logentry): Sync the buffer in case the user modified it while
editing the comment.
1994-01-03 20:53:26 +00:00
Richard M. Stallman
97d3f95071 (vc-buffer-sync, vc-diff): New arg NOT-URGENT.
(vc-diff): Pass new arg.
1993-12-24 23:07:23 +00:00
Richard M. Stallman
7d847440c5 (vc-record-rename): Don't use replace-regexp. 1993-12-23 02:51:19 +00:00
Paul Eggert
9a51ed3ae4 (vc-workfile-unchanged-p): Add optional argument
specifying whether we want to compute the differences if the
file is changed.  Otherwise, use cmp instead of diff.
(vc-next-action-on-file): Use new vc-workfile-unchanged-p option;
this avoids recomputing the differences in some cases.
(vc-backend-diff): OLDVERS is now optional; all callers changed.
New optional argument CMP says to use `cmp' rather than `diff'.
1993-12-03 09:30:38 +00:00
Paul Eggert
73960ffd67 (vc-locking-user): Don't assume that the umask permits
group-write and other-write.
1993-12-02 07:47:48 +00:00
Richard M. Stallman
bbf97570e5 (vc-buffer-sync): Signal error if user says no. 1993-11-27 11:39:02 +00:00
Eric S. Raymond
ba5c3004d3 vc-static-header-alist shouldn't have been declared const. 1993-11-15 04:13:48 +00:00
Richard M. Stallman
d52f0de91e (vc-rename-file): Don't overwrite an existing file.
Fix test for unsaved files.
Calculate name of new master file properly.
1993-11-12 22:31:12 +00:00
Paul Eggert
219a7d3fd6 (vc-backend-checkout): Do not set umask to value that does not allow
user-write permission while `co' is running; some versions of `co'
won't work, because they can't write their temporaries.
1993-10-14 18:28:24 +00:00
Eric S. Raymond
9a47d40b55 (vc-next-action) Fix (throw ... ) invocation to work with 19; this
allows vc-next-action on all marked files in a dired buffer to work.

(vc-finish-logentry) There isn't necessarily a *VC-log-entry* buffer
to remove if this function was called from within a dired buffer.  Fix
its handling of this case.
1993-10-04 20:51:01 +00:00
Paul Eggert
deb9ebc6cb (vc-find-binary): Fix bug; it always claimed success. 1993-09-27 04:36:31 +00:00
Brian Fox
4805f679cd (vc-do-command): Remove debugging output. Use (forward-line -1) instead
of (previous-line 1).
(vc-print-log): Delete extraneous lines of RCS output if present.
1993-09-21 07:51:53 +00:00
Paul Eggert
f181899408 (vc-version-other-window): New function.
(vc-backend-checkout): Add optional arg workfile, which specifies where
to put the working file.
1993-09-15 23:19:13 +00:00
Paul Eggert
fd6217ac0c (vc-backend-steal): Fix typo when invoking the 'rcs' command
to steal the lock.
1993-09-08 19:06:01 +00:00
Paul Eggert
1dabb4e676 (vc-locked-example): Renamed from vc-quiescent-p. Now yields example of
why current directory is not quiescent.  All callers changed to use this.
1993-08-27 03:55:16 +00:00
Paul Eggert
c6bfcd1295 (vc-previous-comment): Use mod', not ring-mod'. 1993-08-10 04:14:17 +00:00
Jim Blandy
064726ac89 * vc.el (vc-diff, vc-directory-18): Add missing paren to end of
vc-diff, and remove extra paren from vc-directory-18.
1993-08-08 00:44:26 +00:00
Richard M. Stallman
4c2d8cf9b5 (vc-shrink-to-fit): Deleted. All callers changed to use
the new, fixed `shrink-window-if-larger-than-buffer' instead.
In some places move it after a (goto-char (point-min)).
1993-07-31 01:05:33 +00:00
Richard M. Stallman
af1b8606a7 (vc-backend-steal): Pass arg omitted in last change. 1993-07-25 22:36:03 +00:00
Paul Eggert
d76b8d38bc > (vc-backend-revert): Use `co -f' instead of deleting the
working file ourselves; that way, if `co' fails, we won't have
deleted the working file.
(vc-backend-steal):  Don't delete the working file.  Use `rcs -u -l',
not `rcs -u ; rcs -l'; it's faster.  Use vc-backend-dispatch -- the
old code couldn't have possibly worked.
1993-07-22 10:57:46 +00:00
Roland McGrath
43cea1ab61 (vc-comment-to-change-log): Copy interactive spec from
add-change-log-entry-other-window.  Call add-change-log-entry instead of
add-change-log-entry-other-window; pass it t for OTHER-WINDOW and NEW-ENTRY
args.  Go to bol before filling.
1993-07-19 01:01:17 +00:00
Roland McGrath
c124b1b47a (vc-comment-to-change-log): Canonicalize following whitespace after
filling, not before.  Set END to point at end of indentation.
Skip whitespace chars up to END before skipping back to delete.
1993-07-19 00:06:14 +00:00
Roland McGrath
3b4dd9a931 (vc-comment-to-change-log): Complete rewrite. Do not use
vc-update-change-log.  Instead, snarf last comment from vc-comment-ring and
insert it with add-change-log-entry-other-window.
1993-07-18 23:54:45 +00:00
Jim Blandy
cf50f71757 * vc.el (vc-start-entry): Don't call file-name-nondirectory on
FILE before passing it to vc-mode-line.  Everyplace else passes
	vc-mode-line full filenames, and vc-mode-line now needs the real
	file name to decide which version-control system the file is under.
1993-07-06 06:18:50 +00:00
Paul Eggert
2bd5041b8e (vc-name): Move to vc-hooks.el. 1993-07-05 03:20:12 +00:00
Paul Eggert
d64ca902f7 (vc-backend-diff): Undo "-q" change. This was fixed instead by adding
-q support to vcdiff.
1993-07-04 18:54:59 +00:00
Richard M. Stallman
282aa6a2d2 (vc-path): New variable.
(vc-do-command): Use vc-path.
1993-07-02 21:46:42 +00:00
Jim Blandy
21526a531d * vc.el (vc-backend-diff): Pass the "-q" flag only if we're using
rcsdiff.
1993-07-02 20:07:55 +00:00
Paul Eggert
4b40fdea8f (vc-update-change-log): Ensure that file names inserted into a ChangeLog
are relative to that ChangeLog.
1993-06-30 21:35:59 +00:00
Richard M. Stallman
41dfb835db (vc-update-change-log): Restore previous default-directory
for running rcs2log.
1993-06-28 00:56:54 +00:00
Richard M. Stallman
b246f57185 (vc-diff): If `diff' gives empty output, return nil. 1993-06-25 21:30:54 +00:00
Richard M. Stallman
590cc44988 (vc-rename-file): Remove periods from error messages.
(vc-backend-logentry-check, vc-revert-buffer): Likewise.
(vc-retrieve-snapshot, vc-create-snapshot): Likewise.
(vc-diff, vc-finish-logentry, vc-steal-lock): Likewise.
(vc-register, vc-next-action-on-file, vc-registration-error): Likewise.
(vc-cancel-version): Add space to end of question.
1993-06-17 05:08:23 +00:00
Richard M. Stallman
c4f4f2d12f (vc-backend-diff): Always use -q option. 1993-06-12 02:18:02 +00:00
Richard M. Stallman
4c33756c1b (vc-finish-logentry): Use delete-windows-on. 1993-05-29 03:47:48 +00:00
Richard M. Stallman
820bde8d49 (vc-steal-lock, vc-insert-headers): Fix question whitespace. 1993-05-29 03:10:35 +00:00
Roland McGrath
69268c787f (vc-comment-to-change-log): Don't take FILE argument, since
vc-update-change-log doesn't support it anyway.
Don't bind default-directory.  Instead pass second arg to file-relative-name.
(vc-update-change-log): Use find-change-log instead of hardcoding.
1993-05-22 22:33:19 +00:00
Richard M. Stallman
fb8b7b6bba Don't require sendmail, compile, or dired. 1993-05-16 18:57:37 +00:00
Jim Blandy
24f1977f70 * vc.el (vc-version-diff): Match parens. 1993-05-14 15:21:50 +00:00
Richard M. Stallman
6fb6ab11e1 (vc-revert-buffer1): Don't assume that compilation-error-list
is a list; it might be t.
1993-05-14 03:57:45 +00:00
Richard M. Stallman
36bed8bc8c (vc-version-diff): Don't move point in current buffer. 1993-05-13 12:05:52 +00:00
Richard M. Stallman
4f6e4ad6cd (Setting minor-mode-map-alist):
Put the map directly in the alist, not a variable name.
1993-05-13 03:14:07 +00:00
Richard M. Stallman
34291cd2f7 Improve doc strings and prompt strings.
(vc-cancel-version): Ask whether to revert buffer.
1993-05-12 21:30:35 +00:00
Richard M. Stallman
7ef84cf98f (vc-diff): Report an error if the buffer isn't registered.
(vc-registration-error): New function.
(vc-next-action, vc-diff, vc-print-log, vc-backend-diff): Use it to
make VC's error messages more uniform.

(vc-directory, vc-revert-buffer1): Quote lambdas with (function ...)
for Emacs 18.
(compilation-old-error-list): Set if undefined, for Emacs 18.
1993-05-11 21:15:54 +00:00
Richard M. Stallman
4c2c1de1fd (vc-backend-diff): Handle either string or list. 1993-05-09 14:29:33 +00:00
Richard M. Stallman
2e810285eb (diff-switches): Define var here as well as in diff.el. 1993-05-09 14:27:02 +00:00
Richard M. Stallman
0ee7d6239a (vc-directory-18): cd to the directory in question before the file tree walk. 1993-05-08 16:17:01 +00:00
Richard M. Stallman
6ed5075cab (vc-directory-18): New function.
If Emacs 18, make vc-directory alias to this.
1993-05-08 16:14:11 +00:00
Richard M. Stallman
e8ee1ccf68 (vc-backend-diff): Use diff-switches, not vc-diff-options.
(vc-diff-options): Variable deleted.
1993-05-04 19:52:02 +00:00
Richard M. Stallman
cdd8203f4e Doc fix. 1993-05-04 19:33:17 +00:00
Richard M. Stallman
1434b7aabc (minor-mode-map-alist): Don't use it if it's void. 1993-05-04 16:42:57 +00:00
Richard M. Stallman
ee7e9c886a (vc-dired-prefix-map): New keymap.
Use it in minor-mode-map-alist for vc-dired-mode.
1993-05-04 16:40:24 +00:00
Richard M. Stallman
a1bda481b9 (vc-revert-buffer1): Fix format of compilation-error-list. 1993-05-01 03:09:16 +00:00
Richard M. Stallman
caf15d4f18 (vc-match-substring): Renamed from match-substring.
(vc-parse-buffer): Use new name.
1993-04-29 17:58:37 +00:00
Roland McGrath
e9c8e24886 (vc-revert-buffer1): Ignore non-marker elts of compilation-error-list. 1993-04-28 22:48:52 +00:00
Eric S. Raymond
8c0aaf4075 (vc-diff): Get proper error message when you run this with no prefix
arg on an empty buffer.

(vc-directory): Better directory format --- replace the user and group IDs
with locking-user (if any).

(vc-finish-logentry, vc-next-comment, vc-previous-comment):  Replace
*VC-comment-buffer* with a ring vector.
1993-04-25 22:26:40 +00:00
Roland McGrath
27f2f10b21 (vc-revert-buffer1): Typo fix in last change. 1993-04-19 21:29:48 +00:00
Roland McGrath
f495d400ea (vc-comment-to-change-log): Restored interactive spec. Why was it
removed?  Why does the only log entry mentioning this function contain
no actual information?
1993-04-19 21:19:10 +00:00
Roland McGrath
ab8775832a (vc-revert-buffer1): Completely rewrote compilation reparsing code. 1993-04-19 21:13:47 +00:00
Eric S. Raymond
124250cf9a (vc-comment-to-change-log): Merged in the remainder of jimb's last
change.
1993-04-08 16:51:04 +00:00
Eric S. Raymond
e1f297e66c (vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
The vc-directory listing is now in an augmented Dired mode that supports
vc-next-action on all marked files.
1993-04-08 16:35:52 +00:00
Roland McGrath
594be62efd (vc-comment-to-change-log): Renamed from vc-comment-to-changelog.
Take optional arg and pass it to find-change-log.
Added docstring and interactive spec.
1993-04-05 23:52:16 +00:00
Eric S. Raymond
8ac8c82f02 (vc-next-action, vc-peint-log, vc-diff, vc-revert-buffer) improved
logic for parent buffer finding.
1993-03-29 15:38:31 +00:00
Eric S. Raymond
1a2f456b73 (vc-comment-to-changelog): A useful vc-checkin hook, added.
(vc-checkout): Now rejects attempts to check out files via FTP.

The `derived buffers' in the mode (the VC log buffer, status buffers,
and most buffer output commands) now know which file buffer was their
parent, and most commands will try to find such a parent buffer when
executed from within a special buffer.
1993-03-28 06:40:46 +00:00
Eric S. Raymond
7b4f934d8f (vc-header-strings) Name changed to vc-header-alist, to match the
docs.

(vc-finish-logentry, vc-next-comment, vc-previous-comment,
vc-comment-search-forward, vc-comment-search-backward) The VC comment
ring is now a separate buffer from *VC-log*; editing of old comments
is no longer destructive.
1993-03-17 13:58:48 +00:00
Paul Eggert
a9a5976656 (vc-version-diff): Use (message ...), not (message (format ...)).
(vc-backend-checkout, vc-backend-assign-name): Correct bogus messages.
1993-03-16 21:09:56 +00:00
Eric S. Raymond
2dd8d31b2f vc-error-occurred needs to be in vc-hooks. 1993-03-16 15:44:52 +00:00
Eric S. Raymond
91463d45d0 Bug fix. 1993-03-11 07:45:02 +00:00
Eric S. Raymond
00b3f57b23 Fix typo. 1993-03-09 23:02:40 +00:00
Eric S. Raymond
3234e2a32f Version 5 baseline. 1993-03-09 22:56:29 +00:00
Paul Eggert
02da625312 (vc-update-change-log): Check that ChangeLog is writable
before starting the expensive rcs2log process.
Use call-process instead of shell-command to invoke rcs2log;
this avoids undesired shell escapes and is more robust about errors.
Put mark at point-min, so that the new insertion is in the region.
(vc-checkin-hook): Fix `runs-hooks' typo.
(vc-checkout-writeable-buffer-hook): New var.
(vc-next-action): Fix bug: initial checkin was botched when C-x v v
was applied to a new file while vc-initial-comment was non-nil.
(vc-register): Don't barf when registering a new, empty buffer.
(vc-directory): The `No files are currently registered'
message was wrongly worded, because sometimes the message talks
about locked files, not registered files.
(vc-file-tree-walk): Change (apply 'funcall ...) to (apply
...), since the 'funcall is redundant.
When traversing a directory tree, message
"Traversing directory XXX" so that the user can see what progress is
being made.  Traversal can take a long time.  Omit first argument,
since it is always the current directory.  All callers changed.
(vc-file-tree-walk-internal): New function.
(vc-do-command, vc-diff, vc-version-diff, vc-backend-diff):
Remove redundant calls to `format'.
(vc-diff): Remove unused variable `old'.
(vc-version-diff): When recursively generating a difference
listing, don't append the latest output unless diff was actually run;
otherwise, you'll get the output from the previous file by mistake.
1993-03-07 18:20:54 +00:00
Richard M. Stallman
cfadef6306 (vc-revert-buffer1): Use mark-marker; don't alter mark-active. 1993-03-07 07:44:46 +00:00
Jim Blandy
1ab31687d4 * files.el (revert-buffer): Reverse the sense of the first
argument, but leave interactive usage the same.
	* vc.el (vc-resynch-window): Call vc-revert-buffer1 with the newly
	appropriate arguments.  This seems to be the only file which was
	adjusted for the new meaning of the revert-buffer arguments.
1993-02-22 14:17:16 +00:00
Jim Blandy
315e49edd0 * vc.el (vc-do-command): Set the default directory of the *vc*
buffer to the directory containing FILE.
1992-12-12 15:22:26 +00:00
Richard M. Stallman
9549c46d0b (vc-next-action): Undo previous change. 1992-11-20 19:33:38 +00:00
Jim Blandy
c4ae7096b6 Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
* vc.el (vc-next-action): Pass t as NOQUERY argument to
	vc-resynch-window here too.  This means that all uses of
	vc-resynch-window pass t; I'm going to wait until I understand the
	situation better before I rip out the NOQUERY argument
	altogether.

	* vc.el (vc-revert-buffer1): Try to preserve the position of mark
	as well as point.
	(vc-position-context, vc-find-position-by-context): New functions
	to help with that, made out of the old innards of vc-revert-buffer1.
1992-11-20 17:23:45 +00:00
Richard M. Stallman
13b705c88d (vc-cancel-version): Use yes-or-no-p. 1992-11-08 18:58:17 +00:00
Richard M. Stallman
db59472c27 (vc-admin): Pass t as noquery arg to vc-resynch-window. 1992-10-28 09:33:04 +00:00
Richard M. Stallman
624b466297 (vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
(vc-checkout, vc-finish-logentry, vc-revert-buffer, vc-finish-steal):
Supply t as NOQUERY arg for vc-resynch-window.
(vc-next-action): Don't revert workfile from master if buffer is modified.
1992-10-26 05:33:20 +00:00
Richard M. Stallman
d743a3c876 (vc-backend-steal): Delete the workfile after the rcs -M -u. 1992-10-06 08:59:39 +00:00
Richard M. Stallman
73ce90464c (vc-backend-steal): Put filename after options in rcs commands. 1992-10-05 22:03:53 +00:00
Richard M. Stallman
ad0146295e (vc-steal-lock): Use mail-setup, and do like `mail'.
Supply vc-finish-steal as an action on sending.
(vc-finish-steal): Delete the code to send the message.
1992-10-05 21:09:26 +00:00
Roland McGrath
2ea8ce47dd (vc-backend-checkin): Change buffers to get local value of vc-checkin-switches. 1992-10-05 05:49:27 +00:00
Roland McGrath
d59e5e8c3c (vc-backend-checkin): Use apply on vc-do-command: vc-checkin-switches is a
list.
1992-10-05 05:20:52 +00:00
Roland McGrath
666a0ebb67 (vc-checkin-switches): New defvar.
(vc-backend-checkin): Pass vc-checkin-switches to prog.
1992-10-05 05:17:21 +00:00
Richard M. Stallman
60213ed03b (vc-rename-file): Use OLD, not FILE which is unbound. 1992-09-28 13:01:53 +00:00
Roland McGrath
f480bf4b74 (vc-update-change-log): Use file-relative-name. 1992-09-27 02:42:08 +00:00
Roland McGrath
67242a23d0 (vc-checkin-hook): New user hook variable.
(vc-log-after-operation-hook): New internal defvar.
(vc-checkin): Set vc-log-after-operation-hook to 'vc-checkin-hook.
(vc-finish-logentry): (run-hooks vc-log-after-operation-hook) at end.

(vc-update-change-log): When doing all visited files, remove directory
names from file names that are in default-directory.
1992-09-27 01:51:04 +00:00
Roland McGrath
f35ecf8813 (vc-update-change-log): Use shell-command, not shell-command-on-region.
Take optional args to pass to script.
Add fancy interactive spec: C-u for current file only; M-0 for all visited.
1992-09-27 01:31:15 +00:00
Richard M. Stallman
9c95ac442f entered into RCS 1992-08-08 22:58:39 +00:00
Jim Blandy
637a8ae9ce *** empty log message *** 1992-08-04 07:27:12 +00:00
Eric S. Raymond
594722a807 Initial revision 1992-07-31 22:24:03 +00:00