1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-15 09:47:20 +00:00
Commit Graph

260 Commits

Author SHA1 Message Date
Gerd Moellmann
a2272f321b (vc-backend-diff): Return the correct status if we had to
retry the rcsdiff command without the --brief option.
2000-04-01 12:19:35 +00:00
Gerd Moellmann
4e6473c81e (vc-version-diff): Make sure file name is expanded. 2000-01-26 10:32:38 +00:00
Gerd Moellmann
fb29efe93f (vc-update-change-log): Look for rcs2log under
exec-directory.
1999-12-02 14:24:07 +00:00
Stefan Monnier
767d12f23e Use make-temp-file. 1999-10-15 16:03:59 +00:00
André Spiegel
3b9dc2bca5 (vc-backend-checkout): Use coding system 'no-conversion when doing
with-temp-file.
1999-10-02 10:53:18 +00:00
André Spiegel
d76a596e39 (vc-backend-checkout): Use with-temp-file to check out into arbitrary
file names.
1999-09-22 12:58:49 +00:00
Richard M. Stallman
8f0ab35865 (vc-annotate-display): Use < 69 not < 70 to distinguish 20YY from 19YY. 1999-09-06 22:15:10 +00:00
Richard M. Stallman
fc1d66a4d7 (vc-annotate-display): Treat 2-digit years under 70 as 20YY. 1999-09-06 03:46:33 +00:00
Eli Zaretskii
57c298c426 (vc-update-change-log): Use small-temporary-file-directory when non-nil. 1999-09-02 12:50:28 +00:00
Andreas Schwab
051848e498 (vc-backend-merge-news): Fix regexp to also match P marker
from cvs update.
1999-08-27 07:59:22 +00:00
André Spiegel
2b4603f465 (vc-fetch-cvs-status): Use "-l" option for "cvs status", to make it
non-recursive.
1999-06-30 07:16:14 +00:00
Karl Heuer
61d6c25dbd Undo previous undo -- spiegel's change already corrected rms's. 1999-06-15 17:40:09 +00:00
Karl Heuer
5c2ae5cab2 (vc-dired-mode): Undo previous two changes. 1999-06-15 05:48:18 +00:00
André Spiegel
fdc3f606b1 (vc-dired-mode): Don't match anything before the date in
dired-move-to-filename-regexp.
1999-06-09 16:52:56 +00:00
Richard M. Stallman
e4f95b80d8 (vc-dired-mode): Make the dired-move-to-filename-regexp
regexp match the date, to avoid treating date as file size.
Add YYYY S option to WESTERN/
1999-05-23 05:34:53 +00:00
André Spiegel
b9482d15fc (vc-backend-revert): For CVS files that were made writeable with "cvs
edit", call "cvs unedit" to undo that.
1999-04-08 12:43:48 +00:00
Karl Heuer
2c4eea90f8 (vc-delete-logbuf-window): New var.
(vc-finish-logentry): Use it.
1999-03-13 05:04:24 +00:00
André Spiegel
05dad1e652 (vc-annotate-display): Delete old overlays. Fix check for major-mode.
(vc-annotate-mode): Delete variable.
1999-01-22 16:28:12 +00:00
Richard M. Stallman
ac3db2e429 (vc-backend-diff): Use `diff-switches-list' throughout. 1999-01-02 21:54:32 +00:00
Markus Rost
8816386c05 (vc-rcs-release): Fix Type.
(vc-sccs-release): Fix Type.
(vc-cvs-release): Fix Type.
1998-12-08 16:04:52 +00:00
André Spiegel
beba4bd9f6 (vc-dired-window-configuration, vc-ediff-windows,
vc-ediff-result, vc-dired-switches, vc-dired-terse-mode):
Added defvars to suppress compilation warnings.
1998-12-02 13:34:59 +00:00
André Spiegel
709822e813 (with-vc-file, edit-vc-file): New macros. 1998-11-04 15:09:38 +00:00
Dave Love
927d7566ff (vc-backend-merge-news): Check for "P" output. 1998-10-30 19:11:08 +00:00
Dave Love
b524ce9fc5 (vc-insert-headers): Doc fix. 1998-09-10 21:50:05 +00:00
André Spiegel
b73820b00c (vc-backend-merge-news): Account for `already contains the
differences' state.
1998-08-04 13:14:41 +00:00
Richard M. Stallman
262c8ceae7 Comment change. 1998-07-09 03:47:06 +00:00
Richard M. Stallman
4e8b7ae5c1 (vc-finish-logentry): Only delete windows in the selected frame
displaying the *VC-log* buffer, in case another frame is dedicated to
it (which will then be deleted via kill-buffer).
1998-07-08 02:55:50 +00:00
Eli Zaretskii
87a00c4f91 (vc-binary-suffixes): New variable.
(vc-find-binary): Append every suffix from vc-binary-suffixes when
looking for executable files.
1998-06-21 14:29:07 +00:00
Richard M. Stallman
0c8b57ade8 (vc-find-binary): Accept only non-directories. 1998-06-16 16:38:47 +00:00
André Spiegel
633cee4683 (vc-dired-hook): Don't use dired-kill-line to remove directory lines
in terse mode.
(vc-dired-purge): If the top level dir is empty, make it look a little
nicer.
1998-06-12 11:13:37 +00:00
André Spiegel
3b57457337 (vc-dired-recurse, vc-dired-terse-display): New user options.
(vc-next-action-dired): Cleanup.  Let vc-dired-terse-mode be nil here,
so that checked-in files don't vanish.
(vc-dired-toggle-terse-mode): New function.
(vc-dired-hook): Handle terse mode.
(vc-dired-purge): New function.
(vc-directory): Handle vc-dired-recurse.
(vc-dired-hook): Don't show "." and "..".
1998-06-11 15:33:13 +00:00
André Spiegel
a0019b45b9 (vc-directory): Bind vc-dired-switches in order to pass switches to vc-dired-mode.
(vc-dired-mode): Check for vc-dired-switches.
1998-06-05 12:46:29 +00:00
André Spiegel
c06b6e6f7b (vc-dired-hook): Kill excluded directories recursively. 1998-06-03 15:07:04 +00:00
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