Commit graph

58 commits

Author SHA1 Message Date
Eric S. Raymond
ac3f4c6f02 Terminology cleanup. 2007-10-10 18:52:45 +00:00
Thien-Thi Nguyen
df2e19c2bf (vc-rcs-annotate-command):
Fix bug introduced in 2007-07-18T16:32:40Z!esr@snark.thyrsus.com:
Add back :vc-annotate-prefix propertization.
2007-08-20 12:22:44 +00:00
Miles Bader
37cc095b6a Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
2007-08-13 13:41:28 +00:00
Stefan Monnier
9d8f43bfbf (vc-rcs-find-file-not-found-hook):
Move from vc-default-find-file-not-found-hook.
2007-08-09 14:39:20 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-26 05:28:10 +00:00
Glenn Morris
b4aa60262c Switch license to GPLv3 or later. 2007-07-25 04:50:21 +00:00
Stefan Monnier
0792fdb47b Add todo item. 2007-07-20 03:57:14 +00:00
Eric S. Raymond
8cdd17b444 Put the lower half (the back-end) of NewVC in place. This commit
makes only the minimum changes needed to get the old vc.el logic
working with the new back ends.
2007-07-18 16:32:40 +00:00
Thien-Thi Nguyen
53cc5b9c57 (vc-rcs-annotate-command):
Set text property :vc-annotate-prefix on the annotation text.
(vc-rcs-annotate-time): Instead of searching for ": ",
search for end of text propertized with :vc-annotate-prefix.
2007-03-24 11:33:42 +00:00
Glenn Morris
d7a0267c8d Add 2007 to copyright years. 2007-01-21 03:53:13 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
André Spiegel
4f14752851 (vc-rcs-fetch-master-state, vc-rcs-consult-headers): Pass FILE to
vc-user-login-name.
2006-01-27 19:12:13 +00:00
André Spiegel
b010f88755 (vc-rcs-state-heuristic): Use file-attributes with ID-FORMAT
`string'.  This allows us to get rid of `vc-user-login-name UID'.
2006-01-22 16:08:48 +00:00
Thien-Thi Nguyen
0d30b33766 Update years in copyright notice; nfc. 2005-08-06 22:13:43 +00:00
Lute Kamstra
086add1519 Update FSF's address. 2005-07-04 23:32:44 +00:00
Thien-Thi Nguyen
903d71fbde (vc-rcs-annotate-command):
Fix omission bug: Call `vc-setup-buffer'.
2004-12-29 01:56:13 +00:00
Thien-Thi Nguyen
3249f234b8 (vc-rcs-parse): New function.
(vc-rcs-annotate-command): Likewise.
(vc-rcs-annotate-current-time): Likewise.
(vc-rcs-annotate-time): Likewise.
(vc-rcs-annotate-extract-revision-at-line): Likewise.
2004-11-19 15:08:32 +00:00
Stefan Monnier
fa63cb6d0b Doc fix. 2004-09-07 04:48:04 +00:00
André Spiegel
8915c22048 (vc-rcs-checkout-model): Look at the version headers only if
vc-consult-headers is non-nil.
2004-07-02 07:26:21 +00:00
André Spiegel
69c33e5d78 (vc-rcs-print-log, vc-rcs-diff): Add optional BUFFER argument. 2004-03-21 15:46:23 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Stefan Monnier
3e6bab6512 (vc-rcs-register, vc-rcs-checkin, vc-rcs-checkout)
(vc-rcs-find-version, vc-rcs-diff): Use vc-switches.
2003-05-08 19:24:56 +00:00
Juanma Barranquero
f1180544bb Trailing whitespace deleted. 2003-02-04 12:29:42 +00:00
André Spiegel
a207e923bd (vc-rcs-checkout): Fix the check whether we are on a branch. 2003-01-07 08:28:15 +00:00
André Spiegel
4837cfbdd2 (vc-rcs-revert): Unlock only if the user does have the lock. 2003-01-03 15:27:35 +00:00
André Spiegel
e39bd8ac22 (vc-rcs-checkin): By default, always specify the
current branch of the working file for check-in.
2002-12-26 14:38:20 +00:00
André Spiegel
a3294a807b (vc-rcs-checkout): Handle t argument for REV. 2002-12-26 14:06:33 +00:00
André Spiegel
736e0fd11b (vc-rcs-registered): Improve comment. 2002-11-13 12:38:20 +00:00
Markus Rost
0d2c82c731 (vc-rcs-registered): Handle the autoload cookie so that the definition
is found by `find-function-search-for-symbol' and etags.
2002-11-12 19:46:47 +00:00
Stefan Monnier
831afb58a4 (vc-rcs-find-version): Fix vc-checkout-switches use. 2002-10-08 20:23:36 +00:00
Stefan Monnier
88388365b0 (vc-rcs-find-version): New fun.
(vc-rcs-checkout): Remove `workfile' arg and simplify.
2002-10-08 15:33:18 +00:00
Stefan Monnier
27373ce118 (vc-rcs-show-log-entry): Delete. 2002-10-04 18:38:04 +00:00
André Spiegel
ef1a388cb3 (vc-rcs-state): Don't require vc.el. 2002-09-04 20:49:35 +00:00
André Spiegel
ea28aa358e (vc-rcs-fetch-master-state): Be more careful to check
if this is really an RCS master file.
2002-07-19 13:27:44 +00:00
André Spiegel
c9a1f2af3d (vc-rcs-register): Fix handling of vc-[rcs-]register-switches.
(vc-rcs-checkin-switches, vc-rcs-checkout-switches): Removed, since
they weren't used yet.
2002-03-18 17:17:38 +00:00
André Spiegel
2e87226170 (vc-rcs-diff): Use consistent parameter format for
vc-diff-switches-list.
2002-02-25 22:04:29 +00:00
André Spiegel
7735770bb4 (vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
that we see expanded headers.
(vc-rcs-trunk-p, vc-rcs-branch-part, vc-rcs-branch-p,
vc-rcs-minor-part, vc-rcs-previous-version): Removed.  These are
available from vc.el.  Updated all callers.
2002-01-05 17:21:06 +00:00
André Spiegel
99739bbf42 (vc-*-revert-file): Handle new optional arg CONTENTS-DONE. 2001-08-28 17:06:36 +00:00
Pavel Janík
e8af40eed4 Some fixes to follow coding conventions. 2001-07-16 12:23:00 +00:00
André Spiegel
cdc2fe43d4 (vc-rcs-print-log): Output to buffer *vc*, not the current buffer.
(vc-rcs-diff): Output to buffer *vc-diff*, not the current buffer.
2001-03-10 10:50:16 +00:00
Dave Love
891b8b69b4 Copyright up-date. 2001-02-01 17:42:44 +00:00
André Spiegel
10489ed706 (vc-rcs-diff-switches): New customization option.
(vc-rcs-diff): Use it via vc-diff-switches-list.
2001-02-01 15:11:05 +00:00
Dave Love
f0e7c067eb (vc-rcs-header): Fix :type. 2001-01-09 14:53:56 +00:00
André Spiegel
fe96236468 (vc-rcs-checkout, vc-rcs-cancel-version): Renamed arg WRITABLE to EDITABLE. 2001-01-08 16:25:43 +00:00
André Spiegel
ceaa99745a (vc-rcs-state): Before calling vc-workfile-unchanged-p, require vc. 2000-11-20 14:14:25 +00:00
André Spiegel
036f45faec (vc-rcs-state): Call vc-workfile-unchanged-p only here, and
differentiate according to checkout model.
(vc-rcs-fetch-master-state): Don't call vc-workfile-unchanged-p, since
this function is only concerned with master state.
2000-11-19 09:46:04 +00:00
André Spiegel
8f98485f77 Functions reordered. 2000-11-16 18:14:41 +00:00
André Spiegel
fb0d6a7904 (vc-rcs-receive-file): Rewritten to contain only backend-specific
code.
2000-10-03 12:08:40 +00:00
André Spiegel
a7e98271c7 (vc-rcs-fetch-master-state): Parse and remember default branch
unconditionally.
(vc-rcs-set-default-branch): New function.
(vc-rcs-cancel-version, vc-rcs-checkin, vc-rcs-checkout): Use it.
(vc-rcs-checkin): If an appropriate default branch has been set,
force creation of that branch.
2000-10-03 11:33:59 +00:00
Stefan Monnier
7849e1791b * vc.el (vc-editable-p): Minor optimization.
(edit-vc-file, vc-next-action-on-file): Don't use find-file.
(vc-find-new-backend): New function split from vc-responsible-backend.
(vc-register): Use it.
(vc-responsible-backend): Remove REGISTER arg and add BACKENDS arg.
(vc-unregister): Drop BACKEND arg (it doesn't work anyway).
(vc-default-unregister, vc-revert-buffer): Docstring fix.
(vc-clear-headers): Don't use find-file.
(vc-revert-buffer): Use `and' again (must have been a braino).
(vc-switch-backend): Only prompt if requested.
(vc-default-receive-file): Update call to vc-unregister.

* vc-rcs.el (vc-rcs-unregister): Keep a backup of the master file.
(vc-rcs-receive-file): Avoid with-vc-properties.
Update call to vc-unregister.
Use constant `RCS' rather than (dynamically bound) var `backend'.
2000-10-01 19:35:24 +00:00