1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-14 01:50:22 -08:00
Commit graph

302 commits

Author SHA1 Message Date
André Spiegel
f4c7209704 Added version id. 1998-02-27 18:44:41 +00:00
Dave Love
b499b50bea (vc-ignore-vc-files): New variable.
(vc-file-hook, vc-file-not-found-hook): Use it.
1998-02-04 14:20:15 +00:00
Karl Heuer
50bec09179 Customized. 1997-12-04 05:56:22 +00:00
Karl Heuer
274c59c95c (vc-find-cvs-master): Added missing `throw' for
the case when TIMESTAMP is arbitrary text.
1997-09-30 07:33:35 +00:00
André Spiegel
9314395d3f (vc-menu-map): Replace entries for "Check In" and "Check Out" with
new entry "Check In/Out" (calling vc-next-action).
1997-08-03 12:48:31 +00:00
Richard M. Stallman
403d549cb7 (vc-checkout-model): For CVS, look at
permissions to see if a file is "watched".
1997-07-31 06:16:32 +00:00
André Spiegel
702220f3d8 (vc-find-cvs-master): Corrected parsing of CVS/Entries, according to CVS docs.
(vc-toggle-read-only): Also work in vc-dired buffers.
1997-07-18 16:06:22 +00:00
Richard M. Stallman
9bef02e187 (vc-menu-map): Add bindings for vc-retrieve-snapshot and vc-create-snapshot. 1997-06-23 02:19:40 +00:00
Richard M. Stallman
14aa11f4da (vc-annotate): Entry "Annotate" added to menu and
function `vc-annotate' to key-sequence `C-x v g'.
1997-06-06 05:33:13 +00:00
Richard M. Stallman
9f49ec7384 (vc-find-cvs-master): Accept ...+ in a normal entry. 1997-05-04 06:49:53 +00:00
Richard M. Stallman
c20369f06c (vc-master-templates): Doc fix. 1997-04-27 20:50:24 +00:00
Richard M. Stallman
70b760ed2d (vc-find-cvs-master): Handle a "New file!" entry.
(vc-fetch-master-properties): Match "New file!".
1997-04-22 01:04:48 +00:00
André Spiegel
28a25aa5ea Changed my e-mail address in the header. 1997-01-03 13:51:36 +00:00
André Spiegel
2a11c6f32f (vc-user-login-name): New function.
(vc-fetch-master-properties, vc-lock-from-permissions, vc-file-owner,
vc-fetch-properties, vc-after-save, vc-mode-line, vc-status):  Use
`vc-user-login-name' instead of `user-login-name'.
1996-12-26 12:06:13 +00:00
André Spiegel
1525b5169d (vc-file-owner): Always return user name, using the optional argument
of user-login-name.
(vc-locking-user, vc-status): Discard checks for numerical value of
vc-locking-user.
1996-10-17 20:34:46 +00:00
André Spiegel
a93de381c1 (vc-find-cvs-master): Fixed handling of "locally added" files. 1996-09-16 14:44:22 +00:00
André Spiegel
79bdae7a23 (vc-file-owner): If the file is owned by somebody else, return the UID
as a string, so that the rest of VC can use it like a username.
1996-09-08 11:53:34 +00:00
Richard M. Stallman
defccde391 Comment changes. 1996-06-26 18:01:42 +00:00
Richard M. Stallman
9becbeca26 (vc-mode-line): If user is root, verify file really has user-writable bit. 1996-06-18 16:52:09 +00:00
Richard M. Stallman
227d2bed63 (vc-find-file-hook): Follow multiple links all the way. 1996-05-09 19:45:49 +00:00
Richard M. Stallman
566f2169f2 (vc-follow-link, vc-find-file-hook):
Use file-chase-links instead of file-truename.
(vc-find-file-hook): Follow a link without asking
if the target is already visited.
1996-05-05 03:52:13 +00:00
Richard M. Stallman
9596811a3d Comment change. 1996-03-02 06:37:35 +00:00
Paul Eggert
d5c8e97af5 (vc-find-cvs-master): Don't require a "/" after the modification time
in CVS/Entries, since the time may be followed by a conflict notice
(in CVS 1.7) or by some other value (in CVS 1.3).
1996-02-26 00:53:13 +00:00
Richard M. Stallman
d822195158 (vc-follow-link): Kill buffer before creating new one. 1996-02-26 00:19:35 +00:00
Richard M. Stallman
e7f5ddc2c8 (vc-follow-link): Simplify by taking advantage
of Feb 21 change in find-file-noselect.
1996-02-26 00:17:43 +00:00
André Spiegel
a3a3984834 (vc-follow-link): New function.
(vc-find-file-hook): Use it.
1996-02-22 13:07:58 +00:00
Karl Heuer
738efc8e5c Move all the put's for menu-enable props to top level.
(vc-next-action, vc-toggle-read-only): Enable whenever vc-mode.
1996-02-21 21:20:57 +00:00
Karl Heuer
555722598b (vc-consult-rcs-headers): Ignore text properties. 1996-02-14 04:32:55 +00:00
Paul Eggert
c18381d187 (vc-utc-string): Remove; it wasn't reliable near DST or leap-second
transitions.
(vc-find-cvs-master): Convert UTC string to encoded time and compare
the results to the file attributes, rather than attempting to convert
file attributes to UTC string (which wasn't reliable).
1996-01-20 20:42:06 +00:00
Erik Naggum
b578f267af Update FSF's address. 1996-01-14 07:34:30 +00:00
André Spiegel
b806321282 (vc-follow-symlinks): New variable.
(vc-find-file-hook): Use it.
1996-01-10 15:27:49 +00:00
Karl Heuer
a7acbbe4d4 Comment fixes. 1996-01-05 22:21:28 +00:00
André Spiegel
9542081161 Better doc strings for a few variables. 1996-01-04 16:00:45 +00:00
Richard M. Stallman
10aa933d49 (vc-locking-user): In CVS case, convert user number to a string. 1995-11-16 22:04:24 +00:00
André Spiegel
318880476e (vc-utc-string): Use timezone of TIMEVAL for the correction, not the
current one.
(vc-rcsdiff-knows-brief): New variable.
(vc-rcs-lock-from-diff): Use it.
1995-11-02 09:35:04 +00:00
André Spiegel
719dcee97b (vc-fetch-master-properties): Call "cvs status" in the right
directory, passing only the nondirectory part of the file name.
(vc-find-cvs-master): Bind `mtime' locally instead of using it as a
free variable.
1995-09-14 07:23:43 +00:00
André Spiegel
aadce164da (vc-locking-user): Fixed wrong parentheses. 1995-09-08 20:38:53 +00:00
André Spiegel
b23a2306f7 (vc-utc-string): New function.
(vc-find-cvs-master): Use it to compare mtime and checkout time.
(vc-locking-user): CVS case: *only* use checkout time.
(vc-find-cvs-master): Don't attempt to find the RCS master file.
Throw the full name of CVS/Entries.
(vc-name): Doc change (special CVS case).
(vc-after-save): Handle the case when a file is saved in the very
second in which it was checked out.
1995-08-29 10:47:45 +00:00
André Spiegel
d270fe6e2d (vc-fetch-master-properties): Count cvs status "Needs Patch" as
`needs-checkout'.
(vc-after-save): Clear the cvs status.
1995-08-25 18:35:32 +00:00
André Spiegel
7064821ce7 (vc-simple-command): New function.
(vc-fetch-master-properties): CVS case: Use it.
(vc-lock-from-permissions, vc-file-owner, vc-rcs-lock-from-diff):
New functions.
(vc-locking-user): Largely rewritten.  Uses the above, handles RCS
non-strict locking.  Under CVS in CVSREAD-mode, learn the locking state
from the permissions.
(vc-find-cvs-master): Use vc-insert-file, rather than
find-file-noselect. Greatly speeds up things.
(vc-consult-rcs-headers): Bug fix, return status in all cases.
1995-08-22 17:52:42 +00:00
André Spiegel
e66eac08b5 (vc-fetch-master-properties): RCS case: get locking mode.
CVS case: new state `locally-added'.
(vc-locking-user): Under RCS with non-strict locking, don't trust
the file permissions.  CVS case: change which states count as
"locked".
(vc-consult-rcs-headers): Streamlined. Don't set vc-locking-user if
this is called under CVS.  Under RCS, use a heuristic to find the
value of vc-checkout-model without examining the master file.
(vc-parse-locks): Set vc-checkout-model.
(vc-status): Comment change.
(vc-after-save-hook, vc-after-save): The former renamed to the
latter. Now unconditionally called by `basic-save-buffer', determines
whether the buffer should be "locked" or not.
(vc-mode-line): No longer use dynamic after-save-hook. Changed
references to `automatic' into `implicit'.
(vc-checkout-model): Values are now `manual' and `implicit'.  Derive
the property on a per-file basis, supporting all possible modes.
1995-08-21 19:25:52 +00:00
André Spiegel
04446ed0c2 (vc-fetch-master-properties): Recognize cvs status "Unresolved Conflict".
(vc-locking-user): Count cvs status `unresolved-conflict' as "locked".
(vc-checkout-model): New property and access function (still simplistic).
(vc-after-save-hook): New function.
(vc-mode-line): When the file is locked by somebody else, make the
buffer read-only.  (Formerly this was only done for root.)  Don't
write-protect the buffer if the file is unlocked.  Instead, install
vc-after-save-hook, which "locks" the file when modifications are
saved.
1995-08-18 20:22:53 +00:00
André Spiegel
af5e65b996 (vc-top-version): Renamed to vc-master-workfile-version. Updated all
references.
1995-08-17 13:29:31 +00:00
Richard M. Stallman
45fc7cc3c5 (vc-mode-line, vc-find-file-hook): Moved the test for
version-controlled symbolic link from the former to the latter.
1995-07-18 20:55:46 +00:00
Karl Heuer
7b0e1b8f6c (vc-mode-line): Don't write-protect a
VC-Log buffer.  Better mode line text for initial comments.
Streamlined the function.
(vc-locking-user): Consider a cvs file "locked"
if its status is either 'locally-modified or 'needs-merge.
(vc-workfile-version): Catch 'found when calling vc-find-cvs-master.
(vc-fetch-master-properties): Handle cvs status "Needs Checkout".
This is intended for future use.
(vc-fetch-master-properties): Shrink the window
that displays the error message.
1995-07-17 22:56:28 +00:00
Richard M. Stallman
e11a39dfe9 (vc-fetch-master-properties): Better error
message in case the "cvs status" command fails.
1995-07-07 13:24:31 +00:00
Richard M. Stallman
ce27f2642e (vc-consult-rcs-headers): Use an even more
pedantic regexp to match RCS time strings.  Improved
efficiency by using looking-at instead of re-search "\\=...
1995-06-27 19:06:15 +00:00
Richard M. Stallman
58c59fd7af (vc-consult-rcs-headers): Handle the new time
string formats of RCS 5.7.
1995-06-26 20:51:15 +00:00
Richard M. Stallman
07de4c3d64 (vc-insert-file): Erase the current buffer before inserting the file.
(vc-fetch-master-properties, vc-fetch-properties): Don't erase the
buffer because that is now done in vc-insert-file.
(vc-fetch-properties): Kill the *vc-info* buffer when done.
1995-06-23 22:46:56 +00:00
Richard M. Stallman
0b086efb1f (vc-fetch-master-properties): Pass an absolute
pathname to the cvs status command. This is required to make
recursive vc-directory listings work.
1995-06-22 16:23:52 +00:00