mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-18 10:16:51 +00:00
Code Issues Releases Activity
46,289 Commits 225 Branches 189 Tags 534 MiB
79e01623a7
Commit Graph

52 Commits

Author SHA1 Message Date
Andreas Schwab
92788b3bcd (vc-cvs-parse-entry): Make sure a file with conflicts 
is marked as edited.
 2003-03-27 22:40:29 +00:00
André Spiegel
4b180a76d2 (vc-cvs-dir-state): Protect against DIR not being under CVS control. 2003-02-17 08:11:13 +00:00
André Spiegel
83220ab07a (vc-cvs-checkout): Handle t argument for REV. 2002-12-26 14:05:48 +00:00
Juanma Barranquero
aa4af0714e (vc-cvs-sticky-tag-display): Fix typo. 2002-10-17 15:43:48 +00:00
Miles Bader
6c150da9f5 (vc-cvs-parse-entry): Don't barf when an `Entries' files contains an 
invalid timestamp.
 2002-10-11 06:49:49 +00:00
André Spiegel
15d85d9205 (vc-cvs-parse-entry): Parse the time stamp found in CVS/Entries, 
rather than comparing it textually.
 2002-10-10 08:44:58 +00:00
Markus Rost
cfb0dbdcee (vc-cvs-registered): In the autoload version use load instead of 
require to avoid loops when loaddefs.el is loaded after vc-cvs.el.
 2002-10-09 15:59:39 +00:00
Stefan Monnier
23b0a67405 (vc-cvs-find-version): Fix vc-checkout-switches use. 2002-10-08 20:25:21 +00:00
Stefan Monnier
ea05db0198 (vc-cvs-find-version): New fun. 2002-10-08 15:38:28 +00:00
Stefan Monnier
65cc83218f (vc-cvs-show-log-entry): Delete. 2002-10-04 18:38:53 +00:00
Juanma Barranquero
e6608c1233 Fix typo. 2002-07-03 14:26:51 +00:00
Eli Zaretskii
89e7ad5946 Change all post-21.1 :version attributes to 21.4. 2002-05-12 17:30:42 +00:00
Sam Steingold
93bcb353e7 (vc-cvs-valid-version-number-p): New function. 
(vc-cvs-checkin): Use it.
 2002-04-09 17:13:51 +00:00
Sam Steingold
968b980cd8 (vc-cvs-checkin): Pass the required argument to `error'. 2002-04-08 13:38:48 +00:00
André Spiegel
bbce041718 (vc-cvs-global-switches): New user option. 
(vc-cvs-command): New function.  Update all callers of `vc-do-command'
in vc-cvs.el to use this instead.
 2002-03-28 14:29:06 +00:00
Stefan Monnier
839daccae7 (vc-cvs-registered, vc-cvs-dir-state-heuristic): 
Don't consider cvs-removed files as under VC control.
VC wouldn't handle them properly anyway and it confuses
vc-file-not-found-hook.
 2002-03-22 23:10:01 +00:00
André Spiegel
4897ff21e9 (vc-cvs-register): Fix handling of vc-[cvs-]register-switches. 2002-03-18 17:19:45 +00:00
André Spiegel
044504d226 (vc-cvs-diff-tree): Fix typo in parameter names. 2002-03-05 13:30:50 +00:00
André Spiegel
df8e0a91a1 (vc-cvs-diff, vc-cvs-diff-tree): Use consistent parameter format for 
vc-diff-switches-list.
 2002-02-25 22:03:24 +00:00
André Spiegel
51af12fc20 Patch by Martin.Lorentzson@telia.com. 
(vc-cvs-sticky-date-format-string): New variable.
(vc-cvs-sticky-tag-display): New variable.
(vc-cvs-mode-line-string): Add sticky-tag to the mode-line.
(vc-cvs-checkin): If the input revision is a valid symbolic tag
name, we create it as a branch, commit and switch to it.
(vc-cvs-retrieve-snapshot): Set file-property sticky-tag.
(vc-cvs-valid-symbolic-tag-name-p): New function.
(vc-cvs-parse-sticky-tag): New function.
(vc-cvs-parse-entry): Added parsing of sticky tags.
 2002-02-21 20:16:47 +00:00
André Spiegel
4a96a5e96a This is a restore to version 1.29; the patch was taken out awaiting 
copyright assignment.
 2002-01-11 21:09:39 +00:00
André Spiegel
6223f0976f Fix prev change. 2002-01-08 20:00:19 +00:00
André Spiegel
a9f81d67cb Patch by Martin.Lorentzson@telia.com. 
(vc-cvs-sticky-date-format-string): New variable.
(vc-cvs-sticky-tag-display): New variable.
(vc-cvs-mode-line-string): Add sticky-tag to the mode-line.
(vc-cvs-checkin): If the input revision is a valid symbolic tag
name, we create it as a branch, commit and switch to it.
(vc-cvs-retrieve-snapshot): Set file-property sticky-tag.
(vc-cvs-valid-symbolic-tag-name-p): New function.
(vc-cvs-parse-sticky-tag): New function.
(vc-cvs-parse-entry): Added parsing of sticky tags.
 2002-01-08 19:57:57 +00:00
Pavel Janík
f0529b5b1a Doc fix. 2001-12-20 19:01:00 +00:00
André Spiegel
44f663a4de (vc-cvs-parse-status): Store file state in property, don't just return 
it.
 2001-11-30 13:47:39 +00:00
Stefan Monnier
4a9b4f3079 (vc-cvs-parse-entry): Rewrite, comparing the string- 
rather than integer- representation of dates.
 2001-11-25 23:52:51 +00:00
André Spiegel
8ba2df32b7 New scaling algorithm for vc-annotate. 
From JD Smith <jdsmith@astro.cornell.edu>.
(vc-cvs-annotate-difference): Removed to generic
version in vc.el, with
(vc-cvs-annotate-current-time): Added, as override of default.
(vc-cvs-annotate-time) Added. Taken mostly from the (now removed)
`vc-cvs-annotate-difference'.
 2001-10-22 07:57:00 +00:00
André Spiegel
5e0fdc5a86 (vc-cvs-diff-tree): New function. 2001-10-21 12:21:29 +00:00
André Spiegel
99739bbf42 (vc-*-revert-file): Handle new optional arg CONTENTS-DONE. 2001-08-28 17:06:36 +00:00
Stefan Monnier
c6a84d1750 (vc-cvs-stay-local): doc fix. 2001-07-04 15:51:18 +00:00
Eli Zaretskii
8f9ab4032f (vc-cvs-print-log, vc-cvs-diff): Don't invoke CVS as 
an async subprocess if start-process is unavailable.  Suggested by
Tim Van Holder <tim.van.holder@pandora.be>.
 2001-04-17 06:01:40 +00:00
André Spiegel
6e024fc80f (vc-cvs-checkin): When removing the sticky tag, make output go to 
buffer *vc*, not the current buffer.
(vc-cvs-print-log): Output to buffer *vc*, not the current buffer.
(vc-cvs-diff): Output to buffer *vc-diff*, not the current buffer.
 2001-03-10 10:49:05 +00:00
André Spiegel
54be33bc3f Remove autoloads. Require vc when compiling. 2001-02-02 07:21:21 +00:00
André Spiegel
633147f5a4 (vc-cvs-diff-switches): New customization option. 
(vc-cvs-diff): Use it via vc-diff-switches-list.
 2001-02-01 15:10:16 +00:00
Sam Steingold
ed5d446e77 replaced require with autoloads 2001-01-29 19:12:40 +00:00
Sam Steingold
89e658178a require vc 2001-01-25 21:02:37 +00:00
Sam Steingold
9b0630e57e doc&comment fix 2001-01-25 16:36:48 +00:00
Dave Love
ee3275dffa (vc-cvs-header): Fix :type. 2001-01-09 14:48:25 +00:00
André Spiegel
34abd98e0b (vc-cvs-latest-on-branch-p): Removed. 
(vc-cvs-checkout): Renamed arg WRITABLE to EDITABLE.
 2001-01-08 16:24:56 +00:00
André Spiegel
81d995bb87 (vc-cvs-checkout): Fix bug that broke C-x v ~-style checkouts. 2000-11-20 14:16:18 +00:00
André Spiegel
8f98485f77 Functions reordered. 2000-11-16 18:14:41 +00:00
André Spiegel
e5effdcc20 (vc-cvs-print-log, vc-cvs-diff): Use asynchronous mode only for remote 
repositories.
 2000-11-16 16:42:10 +00:00
André Spiegel
a8b6979f53 (vc-cvs-revert): Use cvs unedit' only if vc-cvs-use-edit' is on. 
(vc-cvs-checkout): When this is used for reverting the workfile, make
a backup of the original contents and revert to that in case of error.
 2000-11-16 15:29:40 +00:00
André Spiegel
ffe586ab5c (vc-cvs-annotate-command): New optional arg VERSION. Use 
vc-do-command to perform the annotation, not call-process.
 2000-11-16 13:38:03 +00:00
André Spiegel
e1483c3831 (vc-cvs-merge-news): Be prepared for no news at all. 2000-10-27 15:07:46 +00:00
André Spiegel
bee48f254b (vc-cvs-checkin): Check both status and error message after command. 
If there's an unexpected error, signal it instead of being silent.
 2000-10-27 11:37:17 +00:00
André Spiegel
c86ef81ce6 (vc-cvs-make-version-backups-p): Added `-p' suffix as expected by 
vc[-hooks].el.
 2000-10-22 15:31:11 +00:00
André Spiegel
b3d6528a4c (vc-cvs-make-version-backups): Return t if vc-cvs-stay-local-p. 2000-10-04 09:51:15 +00:00
Stefan Monnier
e1d95cc471 * vc-sccs.el (vc-sccs-register): 
* vc-rcs.el (vc-rcs-register):
* vc-cvs.el (vc-cvs-register): Don't clear file's properties.
* vc.el (vc-register): Clear file's properties.
 2000-09-09 00:48:41 +00:00
Dave Love
0d685c4f7b DOc fixes. 
(vc-cvs-register-switches, vc-cvs-header, vc-cvs-use-edit)
(vc-cvs-stay-local): Add :version.
 2000-09-07 20:01:53 +00:00