1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-21 05:00:47 -08:00
Commit graph

277 commits

Author SHA1 Message Date
Richard M. Stallman
26174ef4fe (vc-update-change-log): Use temporary-file-directory.
Use expand-file-name on it.
1998-05-16 17:53:32 +00:00
Richard M. Stallman
38f30d582d (vc-update-change-log): Use system-tmp-directory. 1998-05-16 03:44:16 +00:00
André Spiegel
eccceb78ec (vc-fetch-cvs-status): Don't specify DIR on the command line.
(vc-dired-hook): Optimized for CVS.
1998-05-02 16:41:08 +00:00
Dan Nicolaescu
cd32a7baa4 *** empty log message *** 1998-04-20 02:34:53 +00:00
André Spiegel
edcb979fe4 (vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
(vc-dired-reformat-line): Streamlined.  Should handle all sorts of
date formats now.
1998-04-15 10:13:07 +00:00
Andreas Schwab
ae4c702967 (vc-backend-revert): Fix missing argument for
vc-file-setprop.
1998-04-15 09:48:04 +00:00
André Spiegel
4b81132caf (vc-next-action-on-file): Don't check out after registering. This is
two steps instead of one, and the second does not make sense under
CVS.
(vc-next-action): Changed doc string to reflect the above.
1998-04-14 12:38:25 +00:00
André Spiegel
dc08a6b5d0 (vc-next-action): Fixed bug that prevented registering files using C-x v v. 1998-04-09 13:45:44 +00:00
André Spiegel
421f0bfe8e (vc-dired-mode): Make dired-after-readin-hook a local hook, not a local variable. 1998-04-05 18:54:35 +00:00
André Spiegel
ccb141e8e1 (vc-merge, vc-backend-merge): New functions.
(vc-resolve-conflicts): Added optional parameters for buffer names.
(vc-branch-p): New function.
1998-04-05 18:45:06 +00:00
André Spiegel
b690900731 (vc-ensure-vc-buffer): New function.
(vc-registration-error): Replaced by the above.  Updated all callers.
(file-executable-p-18, file-regular-p-18): Removed.
1998-04-05 18:43:15 +00:00
Richard M. Stallman
3d30b8bc56 (vc-next-action-dired): Use dired-do-redisplay. Handle
window configuration correctly.
(vc-next-action): Save window configuration for vc-next-action-dired.
(vc-finish-logentry): Only kill log buffer if it does exist.
(vc-dired-mode): Rewritten so that it works entirely through
dired-after-readin-hook.  Subdirectories are handled just as in
ordinary dired.
(vc-dired-hook): New function.
(vc-state-info, vc-dired-reformat-line): Adapted.
(vc-dired-update, vc-dired-update-line): Removed.
(vc-directory): Rewritten.
(vc-directory-18): Removed.
(vc-dired-mark-locked): New function, bound to "*l" in vc-dired-mode.
(vc-do-command): Only compute vc-name if it is really needed.
(vc-fetch-cvs-status): New function.
(vc-dired-hook): Use it.
1998-04-04 05:22:37 +00:00
André Spiegel
751fa74742 (vc-revert-buffer): Rewrote handling of vc-diff buffer,
so that the file's buffer is always current when the actual
        revert is done.
1998-04-01 12:26:43 +00:00
André Spiegel
7f050cc85e (vc-backend-revert): CVS bug fix. 1998-03-31 18:08:36 +00:00
André Spiegel
18483cf000 * vc.el (vc-resolve-conflicts): New function.
(vc-next-action-on-file): Use it.
        (vc-backend-revert): For CVS, revert to the version the buffer was
        based on, not the latest on the current branch (same behavior as
        for RCS).  For SCCS, forget vc-workfile-version so that it gets
        recomputed.
        (vc-revert-buffer): Rewrote doc string to explain the above.
        (vc-finish-logentry): Don't add extra newline.
1998-03-31 17:19:32 +00:00
André Spiegel
a0b87bc1f9 (vc-next-action-on-file): Properly handle the case when user tries to
check-in, but file on disk has changed.
(vc-do-command): Consider LAST argument only if FILE is non-nil.
(vc-add-triple, vc-record-rename, vc-lookup-file): Find
vc-name-assoc-file based on vc-name of FILE.
(vc-backend-admin, vc-rename-file): Handle the SCCS PROJECTDIR feature.
(vc-do-command): Rewrote doc string.
1998-03-20 15:40:24 +00:00
André Spiegel
01e02ab387 (vc-restore-buffer-context): Only try to restore mark if it is active. 1998-03-18 13:25:00 +00:00
André Spiegel
4b398f5de9 (vc-context-matches-p): New function.
(vc-restore-buffer-context): Restore point and mark only if they don't
match the context.
(vc-revert-buffer1, vc-clear-headers): Use save-excursion to relocate
point and mark, and vc-restore-buffer-context as a backup.
(vc-resynch-buffer): When operating on the current buffer, don't use
save-excursion, because that would undo the effects of the above
functions.
(vc-resynch-window): Deleted code that removed vc-find-file-hook
temporarily.  This was unnecessary, because find-file-hooks are not
called when the buffer is reverted.
(vc-register): Added comment for prev change.
1998-03-08 10:03:50 +00:00
André Spiegel
0d53f4669d (vc-default-init-version): New variable.
(vc-register): Use it.  Also use COMMENT argument.
1998-02-27 18:44:14 +00:00
Karl Heuer
c863c92df3 (vc-register): Update vc-buffer-backend. 1998-02-25 22:53:17 +00:00
Dave Love
861f3c2917 (vc-checkin-hook): Add :options.
(vc-checkin, vc-comment-to-change-log): Doc fix.
1998-02-24 12:54:05 +00:00
Richard M. Stallman
f70419a8ac (vc-annotate-compcar): Iterate instead of recursing.
(vc-annotate-car-last-cons, vc-annotate-time-span):
Rename arg assoc-list to a-list.

(vc-annotate-display): All support for XEmacs extents removed.
Functions `set-face-*' are called only when a face is created.
1998-01-22 09:04:36 +00:00
Karl Heuer
df1e7b9120 (vc-finish-logentry): Move killing the log buffer after
the operation in case that fails.
1998-01-18 03:27:05 +00:00
André Spiegel
f8791ebe79 (vc-resynch-window): Behave properly when view-read-only is non-nil. 1998-01-07 14:33:37 +00:00
Richard M. Stallman
79d00189f1 (vc-version-diff): Mention that default file is visited file. 1997-08-23 06:17:08 +00:00
Richard M. Stallman
ba27415c3e (vc-version-diff): Change the Newer version prompt. 1997-08-05 21:38:52 +00:00
Richard M. Stallman
8e710301e0 (vc-version-diff): Use defaults, not initial input,
for reading the arguments.
1997-08-04 04:29:53 +00:00
Richard M. Stallman
c0d66cb21b (vc-backend-checkin): For CVS, forget the checkout model after commit.
(vc-backend-checkout): Use "cvs edit" for files with manual checkout.
(vc-minor-part, vc-previous-version): New functions.
(vc-diff): Don't ask or guess version numbers.
(vc-version-diff): Suggest default versions based on the file state.
1997-07-31 06:23:19 +00:00
Richard M. Stallman
b6e7b3c6ca (vc-diff): Turn off previous change. 1997-07-18 19:03:30 +00:00
André Spiegel
d5859f32d9 (vc-diff): If file is unchanged, ask for the version
number to compare with.
(vc-retrieve-snapshot): If no NAME is specified, check out
latest versions of all unlocked files.
(vc-next-action-on-file): For CVS files with implicit checkout: if
unmodified, don't do anything.
(vc-clear-headers): Regexp more restricted, so as not to destroy file
contents by mistake.
(vc-backend-merge-news): Better analysis of status reported by CVS.
Set file properties accordingly.
1997-07-18 16:06:57 +00:00
Richard M. Stallman
4bc504c88c (vc-steal-lock): Use yes-or-no-p for confirmation. 1997-06-15 23:03:18 +00:00
Richard M. Stallman
f80f7bc21f (vc-annotate-mode-variables): Init vc-annotate-mode-menu
and put it into vc-annotate-mode-map.
(vc-annotate-add-menu): Don't init vc-annotate-mode-menu,
just add the bindings to it.  Display progress messages.
(vc-annotate-mode-menu): New defvar.
(vc-annotate-ratio): Move defvar, add initial value.
(vc-annotate-display-default): Display progress messages.
(vc-annotate-display): Use vc-annotate-color-map.
1997-06-14 17:29:10 +00:00
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