summaryrefslogtreecommitdiff
path: root/lisp/vc-cvs.el
Commit message (Collapse)AuthorAgeFilesLines
* Remove assumption about what nil means as a first arument to vc-do-command.Eric S. Raymond2008-05-101-1/+1
|
* Remove wash-log from the VC backend API.Eric S. Raymond2008-05-091-4/+3
|
* Remove VC-Dired and backend dir-state methods.Eric S. Raymond2008-05-071-32/+0
|
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-061-6/+4
|
* Clean up vc*-revision-granularity and vc*-checkout-model.Eric S. Raymond2008-05-021-22/+26
|
* Fix some comments to remove references to vc-dired.Eric S. Raymond2008-05-021-2/+2
|
* Don't commit right after deletion.Eric S. Raymond2008-05-021-2/+1
|
* Remove some XXX comments no longer needed.Eric S. Raymond2008-05-011-2/+1
|
* Change 'needs-patch to 'needs-update.Eric S. Raymond2008-05-011-3/+3
|
* Make `checkout-model' apply to filesets.Stefan Monnier2008-04-291-14/+18
| | | | | | | | | | | | | | | | | | | * 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.
* (vc-cvs-status-extra-headers): New function.Dan Nicolaescu2008-04-211-1/+13
|
* *** empty log message ***Dan Nicolaescu2008-04-171-39/+0
|
* (vc-cvs-after-dir-status, vc-cvs-dir-status): AddDan Nicolaescu2008-04-151-1/+74
| | | | alternative implementation based on "cvs update".
* (vc-cvs-registered): Allow removed files to beDan Nicolaescu2008-04-121-2/+1
| | | | considered registered.
* Change `dir-status' to not take (and pass) status-buffer.Stefan Monnier2008-04-111-4/+4
| | | | | | | | | | | | | (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.
* * vc-hooks.el (vc-state): Add new state `conflict'.Dan Nicolaescu2008-04-101-7/+14
| | | | | | | | | | | | | | | | | | | | | (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.
* (vc-cvs-diff-tree): Remove unused function.Stefan Monnier2008-04-091-25/+0
|
* * vc-rcs.el (vc-rcs-modify-change-comment):Dan Nicolaescu2008-04-081-1/+1
| | | | | | * vc-cvs.el (vc-cvs-modify-change-comment): Fix argument order. * log-view.el (log-view-mode-menu): Bind log-view-modify-change-comment.
* * vc.el (vc-status-add-entry): Assume ENTRY is a list not a cons.Dan Nicolaescu2008-03-311-3/+3
| | | | | | | | | (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.
* * vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.Dan Nicolaescu2008-03-291-9/+3
| | | | | | | | | | | | | | | | | | | | (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.
* (vc-cvs-parse-status, vc-cvs-after-dir-status): DetectDan Nicolaescu2008-03-261-30/+34
| | | | missing files.
* (vc-cvs-after-dir-status, vc-cvs-parse-status): DetectDan Nicolaescu2008-03-241-0/+2
| | | | removed files.
* (vc-cvs-parse-status): Note there are problems withDan Nicolaescu2008-03-231-0/+6
| | | | subdirectories.
* (vc-cvs-after-dir-status, vc-cvs-dir-status):Dan Nicolaescu2008-03-231-0/+66
| | | | New functions to implement vc-status support.
* * vc-hooks.el (vc-default-mode-line-string): Add case for added files.Stefan Monnier2008-03-211-22/+10
| | | | | | | | | | | * 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.
* * vc-hg.el (vc-hg-state):Dan Nicolaescu2008-03-211-0/+1
| | | | | | | * 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.
* (vc-cvs-register): Fix registering of directories in multiple file case.Glenn Morris2008-02-241-9/+12
|
* Make sure all backends support vc-BACKEND-root.Thien-Thi Nguyen2008-02-191-0/+3
| | | | | | | | * 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.
* * vc.el (vc-update): Resolve conflicts if necessary instead ofDan Nicolaescu2008-01-131-1/+1
| | | | | | | 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.
* Merge from emacs--rel--22Miles Bader2008-01-081-3/+6
|\ | | | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
| * (vc-cvs-annotate-time): Don't move backward when textStefan Monnier2008-01-051-3/+6
| | | | | | | | gets inserted out-of-order.
| * * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):Dan Nicolaescu2007-07-301-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove. (vc-git-revision-completion-table): Enable. * vc-hooks.el (vc-handled-backends): Add GIT and HG. * vc.el (vc-directory-exclusion-list): Add .git and .hg. * vc-hg.el (vc-hg-revision-completion-table): Re-enable. * diff-mode.el (diff-mode-menu): New entries. * diff-mode.el (diff-beginning-of-file-and-junk): New function. (diff-file-kill): Use it. (diff-beginning-of-hunk): Add arg `try-harder' using it. (diff-restrict-view, diff-find-source-location, diff-refine-hunk): Use it so they find the hunk even when we're in the file header. * vc.el: Add new VC operation `revision-completion-table'. (vc-default-revision-completion-table): New function. (vc-version-diff, vc-version-other-window): Use it to provide completion of revision names if the backend provides it. * vc-arch.el (vc-arch--version-completion-table) (vc-arch-revision-completion-table): New functions to provide completion of revision names. * vc-cvs.el: Require CL. (vc-cvs-revision-table, vc-cvs-revision-completion-table): New functions to provide completion of revision names. * eval.c (init_eval_once): Bump max_lisp_eval_depth to 400. * vc2-xtra.texi (Customizing VC): Add GIT and HG.
* | (vc-cvs-parse-entry): Set the vc-backend property.Dan Nicolaescu2007-12-311-0/+2
| |
* | * vc-hooks.el (vc-state): Document new 'ignored and 'unregisteredEric S. Raymond2007-12-281-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | * vc-cvs.el, vc-svn.el: Simplify backend dired-state-infoEric S. Raymond2007-12-281-3/+2
| | | | | | | | functions so they don't do work that the default one can do instead
* | * vc-bzr.el, vc-cvs.el, vc-git.el, vc-hg.el, vc-mcvs.el, vc-svn.el:Eric S. Raymond2007-12-281-0/+1
| | | | | | | | | | | | Modify all instances of the dir-state back-end method to suppress keeping undo lists on the buffers holding astatus output, which csn get extremely large.
* | * (vc.el, vc-sccs.el, vc-rcs.el, vc-cs.el, vc-mcvs.el): PutEric S. Raymond2007-12-271-0/+4
| | | | | | | | | | | | | | | | machinery in place to support editing of change comments with 'e' in a log-view buffer. Not documented yet as this only works for SCCS, RCS, and maybe CVS if you have admin privileges. When we have backend support for Subversion and more modern systems it will ve time to write this up.
* | *** empty log message ***Eric S. Raymond2007-12-271-1/+2
| |
* | *** empty log message ***Eric S. Raymond2007-12-261-2/+2
| |
* | Fix buggy calls to `error'.Deepak Goel2007-12-061-1/+1
| |
* | (vc-cvs-diff): If backup files exist, diff themDan Nicolaescu2007-11-121-5/+36
| | | | | | | | | | instead of doing "cvs diff" in order to avoid accessing the repository.
* | * vc.el (vc-diff-internal): Make the *vc-diff* buffer read only.Dan Nicolaescu2007-11-101-4/+3
| | | | | | | | | | | | | | | | | | * vc-svn.el (vc-svn-print-log, vc-svn-diff): * vc-mcvs.el (vc-mcvs-print-log, vc-mcvs-annotate-command): * vc-cvs.el (vc-cvs-print-log, vc-cvs-diff) (vc-cvs-annotate-command): * vc-arch.el (vc-arch-diff): Remove test to check if start-process is bound, it always is.
* | (vc-cvs-revision-completion-table): Make it work when theStefan Monnier2007-10-201-3/+3
| | | | | | | | arg is a list of files.
* | Terminology cleanup.Eric S. Raymond2007-10-101-32/+32
| |
* | (vc-cvs-annotate-time): Use inhibit-read-only and inhibit-modification-hooks.Stefan Monnier2007-09-151-1/+2
| |
* | Merge from emacs--rel--22Miles Bader2007-07-261-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Switch license to GPLv3 or later.Glenn Morris2007-07-251-1/+1
| |
* | * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltipsDan Nicolaescu2007-07-221-8/+19
| | | | | | | | | | | | | | | | | | | | for branches and new files. * vc-hooks.el (vc-default-mode-line-string): Move mouse-face and local-map handling ... (vc-mode-line): ... here. Improve handling of help-echo. * vc.el (mode-line-string): Document help-echo usage.
* | (vc-(m)cvs-create-repo): Remove.Stefan Monnier2007-07-201-4/+0
| |
* | vc-cvs-checkin had some reference problems, now fixed.Eric S. Raymond2007-07-191-1/+2
| |