1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-20 10:23:57 +00:00
Commit Graph

151 Commits

Author SHA1 Message Date
Stefan Monnier
3dd2acc9d3 * vc-svn.el (vc-svn-root):
* vc-sccs.el (vc-sccs-root):
* vc-rcs.el (vc-rcs-root):
* vc-cvs.el (vc-cvs-root): Delete.
* vc-hooks.el (vc-find-root): Remove `invert' argument.
2008-09-07 20:24:24 +00:00
Dan Nicolaescu
f8bd9ac6ef * vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
* vc-rcs.el (vc-annotate-convert-time):
* vc-mtn.el (vc-annotate-convert-time):
* vc-git.el (vc-annotate-convert-time):
* vc-cvs.el (vc-annotate-convert-time):
* vc-bzr.el (vc-annotate-convert-time): Declare as functions.
2008-06-24 02:41:04 +00:00
Dan Nicolaescu
3daebe67ea * vc.el (vc-switch-backend): Simplify.
(Todo): Remove solved items.

* vc-cvs.el (vc-cvs-parse-status, vc-cvs-parse-entry): Do not set
the vc-backend property.
2008-06-20 17:08:55 +00:00
Andreas Schwab
06abe7bc18 (vc-cvs-status-extra-headers): Don't match newline
when parsing CVS/Repository.
2008-06-15 10:29:13 +00:00
Andreas Schwab
77003b236b (vc-cvs-dir-status): Pass -f to cvs. 2008-06-08 15:18:28 +00:00
Sam Steingold
1d1d90d624 (vc-cvs-registered): Consider a directory with a CVS subdirectory to be registered. 2008-06-05 18:52:48 +00:00
Sam Steingold
bdb55eba8d (vc-cvs-status-extra-headers): Remove extraneous newlines. 2008-06-03 21:30:35 +00:00
Dan Nicolaescu
40de1a6acb *** empty log message *** 2008-05-31 15:32:10 +00:00
Dan Nicolaescu
17996b53fd Fix typos. 2008-05-31 15:29:36 +00:00
Dan Nicolaescu
9fc36123d7 (vc-cvs-after-dir-status): Support spaces in file
names and improve support for unregistered files.
2008-05-31 15:23:58 +00:00
Stefan Monnier
47dd5958df (vc-cvs-state-heuristic, vc-cvs-parse-status): Try and
return `unregistered' when applicable.
2008-05-30 16:21:49 +00:00
Dan Nicolaescu
4f922bf541 (vc-cvs-status-extra-headers): Align labels. 2008-05-26 23:50:21 +00:00
Eric S. Raymond
98712492e7 Improved extra-headers method for CVS. 2008-05-16 19:15:26 +00:00
Eric S. Raymond
09eabf0fa5 Clean up after granbbing CVS/Root info. 2008-05-16 09:30:17 +00:00
Eric S. Raymond
4c61891a9e Extract and display the CVS repository. 2008-05-16 09:23:22 +00:00
Eric S. Raymond
370fded4f6 Snapshot primitives globally renamed to refer to tags, documentation updated. 2008-05-15 17:38:50 +00:00
Eric S. Raymond
2888a97eb5 Remove assumption about what nil means as a first arument to vc-do-command. 2008-05-10 13:27:16 +00:00
Eric S. Raymond
6aa5d910bf Remove wash-log from the VC backend API. 2008-05-09 17:30:49 +00:00
Eric S. Raymond
4903369afe Remove VC-Dired and backend dir-state methods. 2008-05-07 21:27:41 +00:00
Glenn Morris
eb3fa2cfcf Switch to recommended form of GPLv3 permissions notice. 2008-05-06 08:06:51 +00:00
Eric S. Raymond
70e2f6c752 Clean up vc*-revision-granularity and vc*-checkout-model. 2008-05-02 17:47:25 +00:00
Eric S. Raymond
caf37b1f19 Fix some comments to remove references to vc-dired. 2008-05-02 07:38:11 +00:00
Eric S. Raymond
105cac2d47 Don't commit right after deletion. 2008-05-02 03:30:10 +00:00
Eric S. Raymond
5a9de6d018 Remove some XXX comments no longer needed. 2008-05-01 19:28:56 +00:00
Eric S. Raymond
3702367bce Change 'needs-patch to 'needs-update. 2008-05-01 19:13:16 +00:00
Stefan Monnier
e0607aaa2c Make `checkout-model' apply to filesets.
* vc-hooks.el (vc-checkout-model): Rewrite.
(vc-before-save, vc-after-save): Adjust callers accordingly.
* vc.el (vc-editable-p, vc-next-action, vc-checkout, vc-update)
(vc-transfer-file): Adjust callers accordingly.
* vc-rcs.el (vc-rcs-checkout-model): Adjust arg.
(vc-rcs-state, vc-rcs-state-heuristic, vc-rcs-receive-file)
(vc-rcs-checkout, vc-rcs-fetch-master-state): Use vc-rcs-checkout-model
instead of vc-checkout-model.
* vc-mcvs.el (vc-mcvs-revert):
Use vc-mcvs-checkout-model i.s.o vc-checkout-model.
* vc-cvs.el (vc-cvs-checkout-model): Adjust arg.
(vc-cvs-revert): Use vc-cvs-checkout-model i.s.o vc-checkout-model.
* vc-svn.el (vc-svn-checkout-model):
* vc-hg.el (vc-hg-checkout-model):
* vc-git.el (vc-git-checkout-model):
* vc-bzr.el (vc-bzr-checkout-model): Adjust arg.
2008-04-29 15:32:56 +00:00
Dan Nicolaescu
47302633b2 (vc-cvs-status-extra-headers): New function. 2008-04-21 16:18:12 +00:00
Dan Nicolaescu
a5e83c39a7 *** empty log message *** 2008-04-17 00:31:56 +00:00
Dan Nicolaescu
769303ae94 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
alternative implementation based on "cvs update".
2008-04-15 07:26:36 +00:00
Dan Nicolaescu
07d5b8c101 (vc-cvs-registered): Allow removed files to be
considered registered.
2008-04-12 16:33:24 +00:00
Stefan Monnier
c1b513745f Change `dir-status' to not take (and pass) status-buffer.
(vc-status-create-fileinfo): Make `extra' optional.
(vc-status-busy): New fun.
(vc-status-menu-map): Use it.
(vc-status-crt-marked): Remove.
(vc-status-update): Rename from vc-status-add-entries.
Add argument so as to prevent addition of entries.  Rewrite.
(vc-update-vc-status-buffer): Remove.
(vc-status-refresh): Don't remove old entries, set them to
up-to-date instead.  Also do it after the update is complete.
(vc-status-marked-files): η-reduce.
2008-04-11 15:17:59 +00:00
Dan Nicolaescu
7fbb47976e * vc-hooks.el (vc-state): Add new state `conflict'.
(vc-after-save): Use when not if.
(vc-default-mode-line-string): Deal with the conflict state.
(vc-prefix-map):
(vc-menu-map): Bind vc-status instead of vc-directory.

* vc.el (vc-editable-p):
(vc-default-status-printer):
(vc-next-action): Deal with the conflict state.
(vc-mark-resolved): New function.
(vc-status-mode): Fix mode name.
(vc-default-comment-history): Use when not if.
(Todo): Add new entries, remove old ones.

* vc-cvs.el (vc-cvs-merge, vc-cvs-merge-news): Set conflict state.
(vc-cvs-parse-status):
(vc-cvs-after-dir-status):
* vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status):
Detect the conflict state.
2008-04-10 07:32:25 +00:00
Stefan Monnier
8f49a7254d (vc-cvs-diff-tree): Remove unused function. 2008-04-09 20:42:39 +00:00
Dan Nicolaescu
031f176629 * vc-rcs.el (vc-rcs-modify-change-comment):
* vc-cvs.el (vc-cvs-modify-change-comment): Fix argument order.

* log-view.el (log-view-mode-menu): Bind log-view-modify-change-comment.
2008-04-08 15:59:35 +00:00
Dan Nicolaescu
1b3f2d4ec6 * vc.el (vc-status-add-entry): Assume ENTRY is a list not a cons.
(vc-status-mark-buffer-changed): Handle the extra field.

* vc-bzr.el (vc-bzr-after-dir-status):
* vc-cvs.el (vc-cvs-after-dir-status):
* vc-hg.el (vc-hg-after-dir-status):
* vc-svn.el (vc-svn-after-dir-status): Return a list not a cons.
2008-03-31 15:36:56 +00:00
Dan Nicolaescu
115c006177 * vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
(vc-status-refresh): Create a temporary buffer and call the
`dir-status' backend function from that buffer.

* vc-bzr.el (vc-bzr-dir-status): Don't create a buffer.
(vc-bzr-after-dir-status): Don't kill the buffer.

* vc-cvs.el (vc-cvs-dir-status): Don't create a buffer.
(vc-cvs-after-dir-status): Don't kill the buffer.

* vc-git.el (vc-git-dir-status): Don't create a buffer.
(vc-git-after-dir-status-stage2): Don't kill the buffer.

* vc-hg.el (vc-hg-dir-status): Don't create a buffer.
(vc-hg-after-dir-status): Don't kill the buffer.

* vc-svn.el (vc-svn-dir-status): Don't create a buffer.
(vc-svn-after-dir-status): Don't kill the buffer.
2008-03-29 05:34:52 +00:00
Dan Nicolaescu
920fb2b0fd (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
missing files.
2008-03-26 07:15:05 +00:00
Dan Nicolaescu
874f31a6f0 (vc-cvs-after-dir-status, vc-cvs-parse-status): Detect
removed files.
2008-03-24 08:36:22 +00:00
Dan Nicolaescu
4e3837816a (vc-cvs-parse-status): Note there are problems with
subdirectories.
2008-03-23 18:15:35 +00:00
Dan Nicolaescu
798dafb411 (vc-cvs-after-dir-status, vc-cvs-dir-status):
New functions to implement vc-status support.
2008-03-23 00:07:33 +00:00
Stefan Monnier
45b24b4de6 * vc-hooks.el (vc-default-mode-line-string): Add case for added files.
* vc.el (vc-default-dired-state-info): Use just "modified".
* vc-cvs.el (vc-cvs-state-heuristic): Turn rev 0 into `added'.
(vc-cvs-mode-line-string): Make use of the better default.
(vc-cvs-parse-entry): Use the new `added'.
(vc-cvs-dired-state-info): Remove.
* vc-svn.el (vc-svn-dired-state-info): Remove.
* vc-hg.el (vc-hg-dired-state-info): Remove.
* vc-git.el (vc-git-dired-state-info): Remove.
2008-03-21 17:53:04 +00:00
Dan Nicolaescu
6a3f9bb72d * vc-hg.el (vc-hg-state):
* vc-git.el (vc-git-state):
* vc-cvs.el (vc-cvs-parse-status):
* vc-bzr.el (vc-bzr-state): Return 'added when the file is in that
state.
2008-03-21 05:53:48 +00:00
Glenn Morris
967bf29791 (vc-cvs-register): Fix registering of directories in multiple file case. 2008-02-24 22:54:30 +00:00
Thien-Thi Nguyen
b038f9fb95 Make sure all backends support vc-BACKEND-root.
* vc-hooks.el (vc-find-root): Take optional arg INVERT.
If non-nil, reverse the sense of the check.
* vc-rcs.el (vc-rcs-root): New func.
* vc-cvs.el (vc-cvs-root): New func.
* vc-svn.el (vc-svn-root): New func.
2008-02-19 11:45:54 +00:00
Dan Nicolaescu
c6a234ac6c * vc.el (vc-update): Resolve conflicts if necessary instead of
just updating the buffer.

* vc-cvs.el (vc-cvs-merge-news): Ignore the error status of the
update command so that we can parse the output.
2008-01-13 20:03:35 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Stefan Monnier
d58107b04c (vc-cvs-annotate-time): Don't move backward when text
gets inserted out-of-order.
2008-01-05 05:19:00 +00:00
Dan Nicolaescu
8c58d37d56 (vc-cvs-parse-entry): Set the vc-backend property. 2007-12-31 20:43:49 +00:00
Eric S. Raymond
722f037fc8 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
states. and the new return-value convention.  These are not
	actually used yet, just set.

	* vc-svn.el (vc-svn-parse-status): Set 'ignored and 'unregistered
	states when appropriate.

	* vc-hg.el (vc-hg-state,vc-hg-dir-state): Set 'ignored and
	'unregistered' when appropriate.

	* vc-git.el: Document that we don't set the new states yet.

	* vc.el (vc-dired-state-info): Display 'unregistered and
	'ignored states.

	* vc-cvs.el (vc-cvs-parse-status): Set the 'ignored state when
	appropriate.

	* vc-bzr.el (vc-bzr-dir-state): Set 'ignored and
	'unregistered' when appropriate.
2007-12-28 18:16:55 +00:00
Eric S. Raymond
0f67cc71b4 * vc-cvs.el, vc-svn.el: Simplify backend dired-state-info
functions so they don't do work that the default one can do instead
2007-12-28 16:24:31 +00:00