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

39 Commits

Author SHA1 Message Date
Eric S. Raymond
5b5afd508a Carry through today's big terminology change to a few places where I
missed it in the back ends.
2007-10-10 19:39:23 +00:00
Eric S. Raymond
ac3f4c6f02 Terminology cleanup. 2007-10-10 18:52:45 +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
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
bda6736f63 (vc-sccs-state): Pass FILE to vc-user-login-name. 2006-01-27 19:12:42 +00:00
André Spiegel
bbd883480c (vc-sccs-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:10:07 +00:00
Romain Francoise
7bba5cae01 * vc-sccs.el: Update copyright year.
* ezimage.el: Likewise.
2005-11-01 10:39:42 +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
Stefan Monnier
fa63cb6d0b Doc fix. 2004-09-07 04:48:04 +00:00
André Spiegel
e556ef057e (vc-sccs-print-log, vc-sccs-diff): Add optional BUFFER argument. 2004-03-21 15:49:55 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
André Spiegel
8bfde4bea1 (vc-sccs-state-heuristic): Fix parentheses.
(vc-sccs-workfile-version): Search the entire delta table, rather
than just the first entry, because that might be a deleted version.
2003-08-12 18:01:21 +00:00
Stefan Monnier
dc0f87c9f5 (vc-sccs-register, vc-sccs-checkin)
(vc-sccs-find-version, vc-sccs-checkout, vc-sccs-diff): Use vc-switches.
(vc-sccs-register): Remove unused var `|'.
2003-05-08 19:18:33 +00:00
Juanma Barranquero
f1180544bb Trailing whitespace deleted. 2003-02-04 12:29:42 +00:00
André Spiegel
bbd5933755 (vc-sccs-checkout): Handle t argument for REV. 2002-12-26 14:07:15 +00:00
André Spiegel
9ef337379b (vc-sccs-registered): Improve comment. 2002-11-13 12:37:58 +00:00
Markus Rost
af65391bb9 (vc-sccs-registered): Handle the autoload cookie so that the
definition is found by `find-function-search-for-symbol' and etags.
2002-11-12 19:51:20 +00:00
Stefan Monnier
8e85956600 (vc-sccs-find-version): Fix vc-checkout-switches use. 2002-10-08 20:24:21 +00:00
Stefan Monnier
52876673e6 (vc-sccs-find-version): New fun.
(vc-sccs-checkout): Remove `workfile' arg and simplify.
2002-10-08 15:35:03 +00:00
André Spiegel
00ec645cd7 (vc-sccs-register): Fix handling of vc-[sccs-]register-switches. 2002-03-18 17:20:43 +00:00
André Spiegel
01f70dba88 (vc-sccs-diff): Use consistent parameter format for
vc-diff-switches-list.
2002-02-25 22:05:16 +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
0cccd8ffec (vc-sccs-register): Use relative file names. 2001-03-29 11:49:22 +00:00
André Spiegel
23e94aedc2 (vc-sccs-print-log): Output to buffer *vc*, not the current buffer.
(vc-sccs-diff): Output to buffer *vc-diff*, not the current buffer.
2001-03-10 10:51:22 +00:00
Dave Love
891b8b69b4 Copyright up-date. 2001-02-01 17:42:44 +00:00
André Spiegel
a1e9f194d2 (vc-sccs-diff-switches): New customization option.
(vc-sccs-diff): Use it via vc-diff-switches-list.
(vc-sccs-workfile-unchanged-p): Return correct status.
2001-02-01 15:12:35 +00:00
Dave Love
8b7c899181 (vc-sccs-header): Fix :type. 2001-01-09 14:55:30 +00:00
André Spiegel
1862f9efd5 (vc-sccs-latest-on-branch-p): Removed.
(vc-sccs-checkout, vc-sccs-cancel-version): Renamed arg WRITABLE to EDITABLE.
2001-01-08 16:26:44 +00:00
André Spiegel
8f98485f77 Functions reordered. 2000-11-16 18:14:41 +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
a7cafade74 Doc fixes.
(vc-sccs-register-switches, vc-sccs-master-templates): Add
:version.
2000-09-07 20:09:41 +00:00
Stefan Monnier
099bd78a96 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
* vc.el: (toplevel): Don't require `dired' at run-time.
	(vc-dired-resynch-file): Remove autoload cookie.

2000-09-05  Andre Spiegel  <spiegel@gnu.org>

	* vc.el: Made several backend functions optional.
	(vc-default-responsible-p): New function.
	(vc-merge): Use RET for first version to trigger merge-news, not
	prefix arg.
	(vc-annotate): Handle backends that do not support annotation.
	(vc-default-merge-news): Removed.  The existence of a merge-news
	implementation is now checked on caller sites.

	* vc-hooks.el (vc-default-mode-line-string): Removed CVS special
	case.

	* vc-cvs.el (vc-cvs-mode-line-string): New function, handles the
	special case that has been removed from the default in vc-hooks.el.

2000-09-05  Stefan Monnier  <monnier@cs.yale.edu>

	* vc.el (vc-log-edit): Properly handle the case where FILE is nil.

2000-09-05  Andre Spiegel  <spiegel@gnu.org>

	* vc-hooks.el: Require vc during compilation.
	(vc-file-setprop): Use `vc-touched-properties' if bound by the new
	macro `with-vc-properties' in vc.el.
	(vc-file-getprop): Doc fix.
	(vc-after-save): Call `vc-dired-resynch-file' only if vc is loaded.

	* vc.el: Require dired-aux during compilation.
	(vc-name-assoc-file): Moved to vc-sccs.el.
	(with-vc-properties): New macro.
	(vc-checkin, vc-checkout, vc-revert, vc-cancel-version,
	vc-finish-steal): Use it.
	(vc-cancel-version): Moved RCS-specific code to vc-rcs.el.  The call
	to the backend-specific function is now supposed to do the checkout,
	too.
	(vc-log-edit): Handle FILE being nil and added a FIXME for log-edit.

	* vc-cvs.el (vc-cvs-checkin, vc-cvs-checkout): Don't bother to
	set file properties; that gets done in the generic code now.

	* vc-rcs.el (vc-rcs-uncheck): Renamed to `vc-rcs-cancel-version'.
	Changed parameter list, added code from vc.el that does the
	checkout, possibly with a double-take.

	* vc-sccs.el (vc-sccs-name-assoc-file): Moved here from vc.el.
	(vc-sccs-add-triple, vc-sccs-rename-file, vc-sccs-lookup-triple): Use
	the above under the new name.
	(vc-sccs-uncheck): Renamed to `vc-sccs-cancel-version'.  Changed
	parameter list, added checkout command.
	(vc-sccs-checkin, vc-sccs-checkout): Don't bother to set file
	properties; that gets done in the generic code now.

2000-09-05  Stefan Monnier  <monnier@cs.yale.edu>

	* vc.el: Docstring fixes (courtesy of checkdoc).

2000-09-05  Stefan Monnier  <monnier@cs.yale.edu>

	* vc.el (vc-checkout-writable-buffer-hook)
	(vc-checkout-writable-buffer): Remove.
	(vc-start-entry): Always call vc-log-edit, never vc-log-mode.
	(vc-log-mode): Make it into a clean derived major mode.
	(vc-log-edit): Mark buffer unmodified (as vc-log-mode did) and use
	vc-log-mode if log-edit is not available.
	(vc-dired-mode-map): Don't set-keymap-parent yet.
	(vc-dired-mode): Do set-keymap-parent here.
	(vc-dired-buffers-for-dir): Nop if dired is not loaded.
2000-09-05 20:08:22 +00:00
Gerd Moellmann
7a004b71e1 (vc-sccs-latest-on-branch-p): Always return t; we
don't support anything else under SCCS yet.
(vc-sccs-update-changelog): Dummy implementation that
simply signals an error.
(vc-sccs-state-heuristic): Use
file-ownership-preserved-p.
(vc-sccs-workfile-unchanged-p): Fix call to
vc-do-command.
(vc-sccs-state-heuristic): Don't use file-writable-p.
(vc-sccs-workfile-unchanged-p): Fix parenthesis.
(vc-sccs-print-log, vc-sccs-diff): Insert in the current buffer.
(vc-sccs-workfile-unchanged-p): Rewritten.
(vc-sccs-diff): Remove optional arg CMP.
(vc-sccs-state): Call vc-workfile-unchanged-p, not the
SCCS-specific function.
(vc-sccs-state): Fix obviously wrong parenthesis.
(vc-sccs-state-heuristic): Use file-writable-p instead of
comparing userids.
(vc-sccs-checkout): Use `unless'.
(vc-sccs-state): Use with-temp-buffer.
(vc-sccs-workfile-version): Use with-temp-buffer and new
vc-parse-buffer and don't bother setting the property.
(vc-sccs-add-triple): Use with-current-buffer and
find-file-noselect.
(vc-sccs-lookup-triple): New vc-parse-buffer and turn cond -> if.
 Merge in
code from vc-sccs-hooks.el.
(vc-sccs-release, vc-sccs-system-release): Remove.  Don't require
'vc anymore.
(vc-sccs-responsible-p): Use expand-file-name instead of concat
and file-directory-p instead of file-exists-p.
(vc-sccs-check-headers): Simplify the regexp.
(vc-sccs-responsible-p, vc-sccs-register): Use
`vc-sccs-search-project-dir' instead of `vc-sccs-project-dir'.
(vc-sccs-header): New var.
(vc-sccs-rename-file): Renamed from
vc-sccs-record-rename.  Use `find-file-noselect' rather than
`find-file' and call `vc-rename-master' to do the actual move.
(vc-sccs-diff): Remove unused `backend' variable.
(tail): Provide vc-sccs.
(vc-sccs-checkout): Removed call to
vc-file-clear-masterprops.  If writable, set vc-state to 'edited
rather than user login name.
 Require 'vc and 'vc-sccs-hooks.
(vc-sccs-register-switches): New var, copied off of vc-rcs-hooks.
(vc-sccs-latest-on-branch-p): Add a `FIXME' for a call to the
unknown `vc-latest-version' function.  It should probably refer to
vc-workfile-version or somesuch, but it's very unclear to me and I
don't have SCCS to test things.
(vc-sccs-steal-lock): Renamed from `vc-sccs-steal'.
(vc-BACKEND-responsible-p): New
functions.
(vc-BACKEND-register): Renamed from `vc-BACKEND-admin'.  Removed
query option.  Redocumented.
(vc-sccs-diff): Function changed name from
`vc-backend-diff'.  This makes `vc-diff' work.
(vc-sccs-release): Doc fix.
(vc-sccs-admin): Added the query-only option as
required by the vc.el file.
(vc-sccs-latest-on-branch-p): Function added.
(vc-sccs-diff): Function added.
(vc-sccs-checkout): Added function `vc-sccs-checkout'.
 Require vc when compiling.
(vc-sccs-print-log, vc-sccs-assign-name, vc-sccs-merge)
(vc-sccs-check-headers, vc-sccs-steal, vc-sccs-uncheck)
(vc-sccs-revert)
(vc-sccs-checkin, vc-sccs-logentry-check): New functions (code
from vc.el).
(vc-sccs-add-triple, vc-sccs-record-rename)
(vc-sccs-lookup-triple): Moved from vc.el and renamed.
(vc-sccs-admin): Doc fix.
(vc-admin-sccs): Added from vc.el
(vc-sccs-system-release):
Renamed from vc-sccs-backend-release.
(vc-sccs-release): Moved from vc.el.
(vc-sccs-backend-release): New function.
2000-09-04 19:49:01 +00:00