diff options
Diffstat (limited to 'gnu/usr.bin/cvs/contrib/pcl-cvs')
| -rw-r--r-- | gnu/usr.bin/cvs/contrib/pcl-cvs/ChangeLog | 549 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/contrib/pcl-cvs/INSTALL | 49 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile | 17 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/contrib/pcl-cvs/README | 22 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/contrib/pcl-cvs/compile-all.el | 30 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs-startup.el | 10 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs.el | 1820 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs.info | 1114 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs.texinfo | 507 |
9 files changed, 3013 insertions, 1105 deletions
diff --git a/gnu/usr.bin/cvs/contrib/pcl-cvs/ChangeLog b/gnu/usr.bin/cvs/contrib/pcl-cvs/ChangeLog index fab9a7d..fad2eb1 100644 --- a/gnu/usr.bin/cvs/contrib/pcl-cvs/ChangeLog +++ b/gnu/usr.bin/cvs/contrib/pcl-cvs/ChangeLog @@ -1,3 +1,552 @@ +Tue Jun 1 00:00:03 1993 Per Cederqvist (ceder@lysator.liu.se) + + * Release 1.05. (This release was promised before the end of May, + but I didn't quite make it. No, I didn't fake the date above). + +Mon May 31 01:32:25 1993 Per Cederqvist (ceder@lysator.liu.se) + + * Removed the elib sub-directory. Users must now get the Elib + library separately. + * pcl-cvs.texinfo: Document it. + + * pcl-cvs-lucid.el: A new version, supplied by Jamie Zawinsky, + added. + + * pcl-cvs Id 68: Transform RCS keywords + * Makefile (pcl-cvs-$(VER)): Remove the $ signs in most files in + the distribution. + + * pcl-cvs Id 76: Extra " in cvs-mode-add. + * pcl-cvs.el (cvs-mode-add): Don't add the extra level of quotes + around the log message, since it doesn't work with CVS. + + * pcl-cvs Id 56: '-d <CVSROOT>' support in pcl-cvs + * pcl-cvs.el (cvs-change-cvsroot): New function. + + * pcl-cvs Id 77: *cvs* isn't cleared properly + * pcl-cvs.el (cvs-do-update): Always erase the *cvs* buffer and + re-create the collection. + + * pcl-cvs.el (cvs-do-update): Set mode-line-process in the *cvs* + buffer. + * pcl-cvs.el (cvs-mode): Reset mode-line-process. + + * pcl-cvs Id 59: sort .cvsignore alphabetically! + * pcl-cvs.el (cvs-sort-ignore-file): New variable. + * pcl-cvs.el (cvs-mode-ignore): Use it. + * pcl-cvs.texinfo: Document it. + + * pcl-cvs Id 75: Require final newline. + * pcl-cvs.el (cvs-commit-buffer-require-final-newline): New + variable. + * pcl-cvs.el (cvs-edit-done): Use it. + * pcl-cvs.texinfo: Document it. + + * pcl-cvs Id 72: make clean deletes lucid-emacs.el + * dist-makefile (ELCFILES): Fixed a typo. + + * pcl-cvs Id 46: "cvs remove f" "touch f" "cvs update f" -> parse err. + * pcl-cvs.el (cvs-fileinfo->type): New type: REM-EXIST. + * pcl-cvs.el (cvs-shadow-entry-p): A REMOVED that follows a + REM-EXIST is a shadow. + * pcl-cvs.el (cvs-parse-stderr): Recognize the "should be removed + and is still there" message. + * pcl-cvs.el (cvs-pp): Recognize REM-EXIST. + * pcl-cvs.el (cvs-mode-undo-local-changes): Recognize and complain + about REM-EXIST. Defensive test added: complain about unknown types. + + * pcl-cvs.el (cvs-mode-add): Add an extra level of quotes around + the log message. This is apparently needed by RCVS. <This change + has been removed. --ceder>. + + * pcl-cvs.el (cvs-parse-stderr): Ignore output from RCVS. + +Tue Apr 27 00:48:40 1993 Per Cederqvist (ceder@lysator.liu.se) + + * pcl-cvs.el (cvs-startup-message): Now a defconst instead of a + defvar. + * pcl-cvs.el (cvs-mode-commit): Add a defvar for it. + + * dist-makefile (EMACS): Use $(EMACS) instead of hard-coding 'emacs'. + +Sat Apr 17 12:47:10 1993 Per Cederqvist (ceder@lysator.liu.se) + + * Release 1.04. + + * pcl-cvs.texinfo: Updated the Contributors node. + + * pcl-cvs Id 58: Lucid GNU Emacs support + * pcl-cvs-lucid.el: New file, contributed by the people at Lucid. + * pcl-cvs.el: Autoload pcl-cvs-lucid if running in an Lucid GNU + Emacs. + * compile-all.el: (files-to-compile): Add pcl-cvs-lucid. + * dist-makefile (ELFILES, ELCFILES): Dito. + + * pcl-cvs Id 55: cvs-diff-backup swaps old and new version. + * pcl-cvs.el (cvs-diff-backup-extractor): Old version should be + first. + * pcl-cvs.el (cvs-mode-diff-backup): Call cvs-backup-diffable + correctly. + + * pcl-cvs Id 64: elib substitute + * dist-makefile (install): Warn about Elib. + * pcl-cvs.texinfo: Talk about Elib. + + * pcl-cvs Id 50: Committing the *commit* buffer twice. + * pcl-cvs.el (cvs-edit-done): Report an error if cvs-commit-list + is empty, and empty it when the commit is done. + + * pcl-cvs Id 56: '-d <CVSROOT>' support. + * pcl-cvs.el (cvs-cvsroot): New variable. + * pcl-cvs.el (cvs-do-update, all callers of cvs-execute-list): Use + it everywhere CVS is called, to override CVSROOT. + * pcl-cvs.texinfo (Customization): Document it. + +Thu Apr 1 00:34:55 1993 Per Cederqvist (ceder@lysator.liu.se) + + * pcl-cvs.el (cvs-retrieve-revision-to-tmpfile): Exit status nil + from call-process means everything was successful in some Emacs + versions. + + * pcl-cvs.el (cvs-mode-map): Bind "q" to bury-buffer. + * pcl-cvs.texinfo: Document it. + +Thu Mar 11 00:05:03 1993 Per Cederqvist (ceder@lysator.liu.se) + + * Release 1.03-Emerge (not released). + + * Makefile (pcl-cvs-$(VER)): Don't includ elib-dll-debug.el in the + distribution. (It's included as elib/dll-debug.el). + + * pcl-cvs.el (cvs-mode): Document the "e" key (cvs-mode-emerge). + +Tue Mar 9 00:02:57 1993 Per Cederqvist (ceder@lysator.liu.se) + + * pcl-cvs.texinfo (Emerge): New node. + + * pcl-cvs.el (cvs-kill-buffer-visiting): New function. + + * pcl-cvs.el (cvs-mode-emerge): Handle Conflict and Merged files. + + * pcl-cvs.el (cvs-retrieve-revision-to-tmpfile): Handle any revision. + + * pcl-cvs.el (cvs-fileinfo-*): Store base-revision instead of + backup-file. + + * pcl-cvs.el (cvs-backup-diffable): The file is only diffable if + the backup file is readable. + + * pcl-cvs.el (cvs-mode-map): Bind "e" to cvs-mode-emerge instead + of cvs-mode-find-file (which is anyhow bound to "f"). + +Mon Mar 8 23:06:52 1993 Per Cederqvist (ceder@lysator.liu.se) + + * pcl-cvs.el (cvs-mode-emerge): New function. Currently only + handles emerge of Modified files. + + * pcl-cvs.el (cvs-retrieve-revision-to-tmpfile): New function. + +Sun Jan 24 20:07:18 1993 Per Cederqvist (ceder@lysator.liu.se) + + * elib-dll-debug.el: Moved to elib. + +Mon Jan 18 00:35:59 1993 Per Cederqvist (ceder@mauritz) + + * pcl-cvs.el (cvs-do-update): Added a probably unnecessary sit-for. + + * Release 1.03-Elib-0.05.1 (not released). + + * Elib 0.05 compatibility: + * elib-dll-debug.el, pcl-cvs-buffer.el, test-dll.el: Fix the + require strings. + * pcl-cvs.el (cvs-pp): Insert the string. + + * Release 1.03-Elib-0.05 (not released). + + * elib: New directory, containing the parts of elib that are + required for pcl-cvs. Changes to the files in that directory + that are present in Elib are documented in the ChangeLog of + Elib, not here. + * Makefile (pcl-cvs-$(VER)): Copy the new dir to the distribution. + * dist-makefile (ELFILES, ELCFILES): Don't include the Elib files. + +Fri Jan 8 02:43:49 1993 Per Cederqvist (ceder@konrad) + + * pcl-cvs.el (cvs-mode-map): Bind "e" to cvs-mode-find-file, like + in dired. + +Sun Jan 3 23:25:13 1993 Per Cederqvist (ceder@konrad) + + * elib-dll.el, elib-node.el, cookie.el: Moved to the elib package. + Pcl-cvs now requires elib. + +Tue Dec 29 22:06:57 1992 Per Cederqvist (ceder@konrad) + + * pcl-cvs.el: Tracked the latest (last?) rename of all functions + in cookie.el. + +Thu Sep 24 00:29:16 1992 Per Cederqvist (ceder@robert) + + * pcl-cvs.texinfo (Archives): This version is not distributed with + CVS 1.3, so don't claim that it is. + +Fri Aug 21 15:17:08 1992 Per Cederqvist (ceder@maskros) + + * pcl-cvs.el (cvs-parse-stderr): Fixed two "(set head" that should + be "(setq head". + +Thu Aug 20 05:53:58 1992 Per Cederqvist (ceder@robin) + + * cookie.el: Changes to this file is documented in the ChangeLog + of elib in the future. + +Tue Aug 18 03:30:28 1992 Per Cederqvist (ceder@robin) + + * pcl-cvs.el: Don't use cookie-last-tin (which no longer exists). + + * cookie.el: Use prefix cookie:: for internal functions. + + * cookie.el: (cookie:enter-after, cookie:enter-before, + cookie:nth-cookie): Implemented. + * cookie.el: No longer define (impl). + + * cookie.el: More renames: + cookie:next-cookie -> cookie:goto-next-tin + cookie:previous-cookie -> cookie:goto-previous-tin + tin-next -> cookie:next-tin + tin-previous -> cookie:previous-tin + tin-nth -> cookie:nth-tin + tin-delete -> cookie:delete-tin + cookie:collect -> cookie:collect-cookies + cookie:tin-collect -> cookie:collect-tins + (new) -> cookie:tin-collect-cookies + (new) -> cookie:tin-collect-tins + cookie:refresh -> cookie:refresh-all + tin-invalidate-tins -> cookie:invalidate-tins + +Mon Aug 17 01:39:49 1992 Per Cederqvist (ceder@robin) + + * cookie.el (cookie:set-buffer-bind-dll-let*): New macro. Used in + many places instead of cookie:set-buffer-bind-dll. + * cookie.el (cookie:set-buffer-bind-dll): Renamed the macro + cookie:set-buffer to this. + + * pcl-cvs.el (cvs-use-temp-buffer): Set default-directory. + +Sun Aug 16 20:51:30 1992 Per Cederqvist (ceder@robin) + + * pcl-cvs.el (cvs-add-sub): Fixed call to cvs-add-file-update-buffer. + +Sat Aug 8 20:28:21 1992 Per Cederqvist (ceder@robin) + + * Release 1.03-Cookie-II (not released). + + * pcl-cvs.el (cvs-mode-diff-cvs): Don't care about the exit status + from ``cvs diff''. + + * pcl-cvs.el (cvs-mode): Document cvs-mode-undo-local-changes. + * pcl-cvs.el (cvs-diffable): New function. + + * pcl-cvs.el: Use the new cookie package. + * pcl-cvs.el (cvs-cookie-handle): New variable. + * pcl-cvs.el (cvs-do-update): User the new cookie:create + interface, and cookie:clear if the buffer already existed. Make + the buffer read-only. + * pcl-cvs.el (cvs-mode-next-line, cvs-mode-previous-line): New + functions (used instead of cookie:next-cookie and + cookie:previous-cookie). + + * cookie.el: Major redesign. The handle that is passed to all + cookie functions is now a new datatype, and not the buffer that + the cookies resides in. This way it is possible to have more than + one set of cookies in a buffer. Things that used to be + buffer-local variables are now fields in the handle data type. + cookie-last-tin is no longer available. + * cookie.el (cookie:create): The buffer is not cleared, nor set to + be read-only. + * cookie.el (cookie:next-cookie, cookie:previous-cookie): Since + the first argument is now a handle and not a buffer, these can no + longer be called interactively. You have to write a small wrapper + about them. + * cookie.el (cookie:buffer): New function. + +Tue Aug 4 03:02:25 1992 Per Cederqvist (ceder@robert) + + * pcl-cvs.texinfo (Bugs): Renamed "Reporting bugs and ideas" to + "Bugs" and added a table of known bugs/FAQ:s. + +Mon Aug 3 00:19:39 1992 Per Cederqvist (ceder@robert) + + * pcl-cvs.el, pcl-cvs.texinfo: Big Renaming Time! + The commands that operate in the *cvs* buffer: + cvs-add-change-log-entry-other-window -> cvs-mode-add-change-log-entry-other-window + cvs-mark-all-files -> cvs-mode-mark-all-files + cvs-revert-updated-buffers -> cvs-mode-revert-updated-buffers + cvs-undo-local-changes -> cvs-mode-undo-local-changes + cvs-unmark-up -> cvs-mode-unmark-up + cvs-acknowledge -> cvs-mode-acknowledge + cvs-unmark-all-files -> cvs-mode-unmark-all-files + cvs-add -> cvs-mode-add + cvs-diff-backup -> cvs-mode-diff-backup + cvs-commit -> cvs-mode-commit + cvs-diff-cvs -> cvs-mode-diff-cvs + cvs-find-file -> cvs-mode-find-file + cvs-update-no-prompt -> cvs-mode-update-no-prompt + cvs-ignore -> cvs-mode-ignore + cvs-log -> cvs-mode-log + cvs-mark -> cvs-mode-mark + cvs-find-file-other-window -> cvs-mode-find-file-other-window + cvs-remove-file -> cvs-mode-remove-file + cvs-status -> cvs-mode-status + cvs-remove-handled -> cvs-mode-remove-handled + cvs-unmark -> cvs-mode-unmark + + * pcl-cvs.el (cvs-cvs-diff-flags): Variable deleted. + * pcl-cvs.el (cvs-diff-cvs): Use cvs-diff-flags instead. + * pcl-cvs.texinfo (Customization): Update the doc. + + * pcl-cvs.el (cvs-diff-cvs): Handle exit status 0 (no diffs), 1 + (diffs) and other (error). + * pcl-cvs.el (cvs-execute-list): Add support for this kind of + thing. + + * Revert buffers for committed files: + * pcl-cvs.el (cvs-auto-revert-after-commit): New variable. + * pcl-cvs.texinfo (Committing changes, Customization): Document + it. + * pcl-cvs.el (cvs-after-commit-function): New function. + + * pcl-cvs.el (cvs-execute-list): Return the exit status or nil. + * pcl-cvs.el (cvs-edit-done, cvs-diff-cvs, cvs-remove-file, + cvs-undo-local-changes, cvs-add, cvs-status, cvs-log): Use the + exit status to generate an error message. + + + * pcl-cvs.el (cvs-do-update): It should be "cvs -n update -l", not + "cvs -l update -n". Put the -n and/or -l in the message that is + displayed in the *cvs* buffer during the update. + +Sat Aug 1 00:55:49 1992 Per Cederqvist (ceder@robert) + + * cookie.el (cookie-sort): New function. + + * cookie.el (cookie-clear): Rewritten. No longer clears all local + variables. + +Tue Jul 28 17:21:17 1992 Per Cederqvist (ceder@robin) + + * pcl-cvs.el (cvs-parse-stderr): Try to handle the output from RCS + when it is compiled without DIFF3_BIN and a conflict occurs. + + * pcl-cvs.texinfo (Getting Started): Fixed typo. + + * pcl-cvs-startup.el (cvs-update-other-window): Make the autoload + be interactive. + +Mon Jul 27 19:36:40 1992 Per Cederqvist (ceder@robin) + + * pcl-cvs.el (cvs-revert-updated-buffers, cvs-revert-fileinfo): + New functions. + * pcl-cvs.texinfo (Reverting your buffers): Document it. + + * pcl-cvs.el (cvs-fileinfo->full-path): New function. + * pcl-cvs.el (cvs-full-path): Use it. + + * cookie.el (cookie-map, cookie-map-reverse): Better doc- + string. Removed the unused local variable 'result'. + + * compile-all.el: Renamed elib-files to files-to-compare. + * compile-all.el (compile-pcl-cvs): Bind load-path in a let + statement instead of globally. + +Thu Jul 23 19:02:41 1992 Per Cederqvist (ceder@robin) + + * pcl-cvs.el (cvs-do-update): Check that CVSROOT is set. + * pcl-cvs.el (cvs-diff-cvs): Check that cvs-cvs-diff-flags is a + list. + * pcl-cvs.el (cvs-diff-backup): Check that cvs-diff-flags is a + list. + +Tue Jul 21 11:27:39 1992 Per Cederqvist (ceder@robin) + + * pcl-cvs.el (cvs-parse-error): Make the *cvs* buffer writeable + before trying to write the email message. Require sendmail before + trying to switch to mail-mode. + + * pcl-cvs.el (cvs-do-update): Check that cvs-program exists. + + * pcl-cvs.el (cvs-skip-line): Fixed bracketing error. + +Mon Jul 20 10:31:51 1992 Per Cederqvist (ceder@robin) + + * Release 1.03. + + * pcl-cvs.el, cookie.el: Indentation fixes. + + * Makefile (pcl-cvs-$(VER)): Include NEWS in the distribution. + + * pcl-cvs.el (cvs-rm-program): Deleted. + * pcl-cvs.el (cvs-rmdir-program, cvs-lock-file): New variables. + + * Handle lock files in a nicer way: + * pcl-cvs.el (cvs-update-filter, cvs-delete-lock, + cvs-lock-file-p): New functions. + * pcl-cvs.el (cvs-do-update, cvs-sentinel): Redirect stdout to the + temporary file, not stderr. Use cvs-update-filter. + * pcl-cvs.el (cvs-parse-update): New arguments. + * pcl-cvs.el (cvs-parse-buffer): Renamed to cvs-parse-update. + * pcl-cvs.el (cvs-stderr-file): Renamed to cvs-stdout-file. + * pcl-cvs.texinfo (Miscellaneous commands, Updating the + directory): Document cvs-delete-lock. + + * pcl-cvs.el (cvs-mode): Don't reset buffer-read-only. + + * pcl-cvs.el (cvs-find-file-other-window): Don't save-some-buffers. + +Thu Jul 16 00:19:58 1992 Per Cederqvist (ceder@robin) + + * pcl-cvs.el, test-cookie-el: Use the new names from cookie.el. + + * cookie.el: Big Renaming Time! + External functions: + cookie-next -> tin-next + cookie-previous -> tin-previous + cookie-nth -> tin-nth + cookie-delete -> tin-delete + cookie-filter-tins -> tin-filter + cookie-get-selection -> tin-get-selection + cookie-start-marker -> tin-start-marker + cookie-end-marker -> tin-end-marker + cookie-invalidate-tins -> tin-invalidate-tins + cookie-collect-tins -> tin-collect + cookie-collect-cookies -> cookie-collect + Internal functions: + cookie-create-tin -> cookie-create-wrapper + cookie-tin-start-marker -> cookie-wrapper-start-marker + cookie-tin-cookie-safe -> cookie-wrapper-cookie-safe + cookie-tin-cookie -> cookie-wrapper-cookie + set-cookie-tin-start-marker -> cookie-wrapper-set-start-marker + set-cookie-tin-cookie -> cookie-wrapper-set-cookie + cookie-tin-p -> cookie-wrapper-p + cookie-create-tin-and-insert -> cookie-create-wrapper-and-insert + + * pcl-cvs.el (cvs-find-file, cvs-find-file-other-window): Signal + an appropriate error message if the *cvs* buffer is empty. + + * cookie.el (cookie-create): Make the buffer read-only. + * cookie.el (cookie-create-tin-and-insert, cookie-refresh, + cookie-delete-tin-internal, cookie-refresh-tin): Bind + buffer-read-only to nil while changing the contents of + the buffer. + + * pcl-cvs.el (cvs-byte-compile-files): New function. + * pcl-cvs.texinfo (Miscellaneous commands): Document it. + + * pcl-cvs.el (cvs-diff-ignore-marks): New variable. + * pcl-cvs.el (cvs-diff-cvs, cvs-diff-backup): Don't consider + marked files to be selected if a prefix argument is given XOR the + variable cvs-diff-ignore-marks is non-nil. + * pcl-cvs.el (cvs-get-marked): New optional argument `ignore-marks'. + * pcl-cvs.texinfo (Customization, Viewing differences): Document + this behaviour. + + * pcl-cvs.el (cvs-undo-local-changes): New function. + * pcl-cvs.texinfo (Undoing changes): Document + cvs-undo-local-changes. + * pcl-cvs.el (cvs-mode-map): cvs-unmark-all-files moved from "U" + to "ESC DEL". cvs-undo-local-changes bound to "U". + * pcl-cvs.texinfo (Marking files): Document ESC DEL. + + * pcl-cvs.el (cvs-skip-line): New arguments. All callers updated. + Now calls cvs-parse-error if a parse error occurs. + * pcl-cvs.el (cvs-parse-error): New function that creates a bug + report. + * pcl-cvs.el (cvs-parse-stderr, cvs-parse-stdout): New arguments. + The only caller (cvs-parse-buffer) updated. Call cvs-parse-error + in case of parse error. + + * pcl-cvs.el (pcl-cvs-version): New variable. + + * cookie.el (cookie-create): Kill all local variables in the buffer. + +Fri Jul 10 11:17:40 1992 Per Cederqvist (ceder@robin) + + * Release 1.03beta1. + +Thu Jul 9 03:12:00 1992 Per Cederqvist (ceder@robin) + + * pcl-cvs.el (cvs-update-running): New variable. + * pcl-cvs.el (cvs-do-update): Use it instead of the previous local + variable cvs-process (that no longer exists). Make sure that only + one `cvs update' runs at any given moment. + * pcl-cvs.el (cvs-sentinel): Reset cvs-update-running when the + update process exits. + + * pcl-cvs.el (cvs-update): Switch to the *cvs* buffer. + * pcl-cvs.el (cvs-update-other-window): New function. + * pcl-cvs-startup.el (cvs-update-other-window): Added a autoload + for it. + * pcl-cvs.el (cvs-do-update): Don't pop up any buffer in a window + - let cvs-update or cvs-update-other-window handle that. Also + don't kill the *cvs* buffer, but rather insert a "Running cvs..." + message into it. + * pcl-cvs.el (cvs-parse-buffer): Don't change the window + configuration. + + * pcl-cvs.el (cvs-create-fileinfo, cvs-pp, cvs-fileninfo->type): + New type for a fileinfo: MESSAGE. + + * pcl-cvs.el (cvs-cvs-buffer): Deleted the variable. Use + cvs-buffer-name instead. (I no longer have any plans to allow more + than one cvs update to run at the same time - things only get + confusing). Changed all places where cvs-cvs-buffer was used. + + * pcl-cvs.el: Take care of update programs (the -u option in the + modules file): + * pcl-cvs.el (cvs-update-prog-output-skip-regexp): New variable. + * pcl-cvs.el (cvs-parse-stdout): Skip output from the update + program (using cvs-update-prog-output-skip-regexp). + * pcl-cvs.texinfo (Future enhancements): Document that the + solution is not as good as it should be. + * pcl-cvs.texinfo (Customization): Document the variable. + +Wed Jul 8 20:29:44 1992 Per Cederqvist (ceder@robin) + + * pcl-cvs.el (cvs-do-update): Check that this-dir really exists + and is a directory, and that this-dir/CVS exists and is a + directory. + +Tue Jul 7 01:02:24 1992 Per Cederqvist (ceder@robin) + + * pcl-cvs.texinfo (Customization): Document TMPDIR. + + * This chunk of modifications should make it possible to run + pcl-cvs on hosts that do not line-buffer stdout (such as + DECstation). They work by diverting stdout and stderr from + `cvs update' and later sorting them together. + * pcl-cvs.el (cvs-parse-stderr): Don't fail to parse conflict + data. + * pcl-cvs.el (cvs-remove-stdout-shadows, cvs-shadow-entry-p): New + functions. + * pcl-cvs.el (cvs-parse-buffer): Use it. + * pcl-cvs.el (cvs-remove-empty-directories): New function. + * pcl-cvs.el (cvs-remove-handled, cvs-parse-buffer): Use it. + * pcl-cvs.el (cvs-get-current-dir): New argument ROOT-DIR. All + calls to cvs-get-current-dir updated. + * pcl-cvs.el (cvs-do-update): Allocate a tmp file. Use cvs-shell + (typically /bin/sh) to redirect stderr from CVS to the tmp file. + * pcl-cvs.el (cvs-sentinel): Handle the tmp file. Remove it when + it is parsed. + * pcl-cvs.el (cvs-parse-buffer): New argument STDERR-BUFFER. All + calls to cvs-parse-buffer updated. Rewritten to handle the + separation of stderr and stdout. + * pcl-cvs.el (cvs-shell, cvs-stderr-file): New variables. + * pcl-cvs.el (cvs-compare-fileinfos, cvs-parse-stderr, + cvs-parse-stdout): New functions. + + * pcl-cvs.el (cvs-parse-buffer): Some modifications for output + from RCS 5.6. + Tue Apr 7 09:11:27 1992 Per Cederqvist (ceder@leopold) * Release 1.02. diff --git a/gnu/usr.bin/cvs/contrib/pcl-cvs/INSTALL b/gnu/usr.bin/cvs/contrib/pcl-cvs/INSTALL index 8c89053..f3c4480 100644 --- a/gnu/usr.bin/cvs/contrib/pcl-cvs/INSTALL +++ b/gnu/usr.bin/cvs/contrib/pcl-cvs/INSTALL @@ -3,47 +3,51 @@ This text is copied from the TeXinfo manual for pcl-cvs. Installation of the pcl-cvs program =================================== - 1. Edit the file `Makefile' to reflect the situation at your site. - The only things you have to change is the definition of - `lispdir' and `infodir'. The elisp files will be copied to - `lispdir', and the info file to `infodir'. + 1. Edit the file `Makefile' to reflect the situation at your site. + The only things you have to change is the definition of `lispdir' + and `infodir'. The elisp files will be copied to `lispdir', and + the info file to `infodir'. 2. Configure pcl-cvs.el - There are a couple of paths that you have to check to make - sure that they match you system. They appear early in the file + There are a couple of paths that you have to check to make sure + that they match you system. They appear early in the file pcl-cvs.el. - *NOTE:* If your system is running emacs 18.57 or earlier - you MUST uncomment the line that says: + *NOTE:* If your system is running emacs 18.57 or earlier you + MUST uncomment the line that says: (setq delete-exited-processes nil) - Setting `delete-exited-processes' to `nil' works around a bug - in emacs that causes it to dump core. The bug was fixed in - emacs 18.58. + Setting `delete-exited-processes' to `nil' works around a bug in + emacs that causes it to dump core. The bug was fixed in emacs + 18.58. - 3. Type `make install' in the source directory. This will + 3. Release 1.05 and later of pcl-cvs requires parts of the Elib + library, version 0.07 or later. Elib is available via anonymous + ftp from prep.ai.mit.edu in `pub/gnu/elib-0.07.tar.z', and from + a lot of other sites that mirrors prep. Get Elib, and install + it, before proceeding. + + 4. Type `make install' in the source directory. This will byte-compile all `.el' files and copy both the `.el' and the `.elc' into the directory you specified in step 1. - If you don't want to install the `.el' files but only the - `.elc' files (the byte-compiled files), you can type ``make + If you don't want to install the `.el' files but only the `.elc' + files (the byte-compiled files), you can type ``make install_elc'' instead of ``make install''. - If you only want to create the compiled elisp files, but - don't want to install them, you can type `make elcfiles' - instead. This is what happens if you only type `make' without - parameters. + If you only want to create the compiled elisp files, but don't + want to install them, you can type `make elcfiles' instead. + This is what happens if you only type `make' without parameters. - 4. Edit the file `default.el' in your emacs lisp directory (usually + 5. Edit the file `default.el' in your emacs lisp directory (usually `/usr/gnu/emacs/lisp' or something similar) and enter the contents of the file `pcl-cvs-startup.el' into it. It contains a couple of `auto-load's that facilitates the use of pcl-cvs. - Installation of the on-line manual. =================================== @@ -55,7 +59,7 @@ Installation of the on-line manual. info file `pcl-cvs.info' that is included in the distribution (type `cp pcl-cvs.info pcl-cvs'). - 2. Move the info file `pcl-cvs' to your standard info directory. + 2. Move the info file `pcl-cvs' to your standard info directory. This might be called something like `/usr/gnu/emacs/info'. 3. Edit the file `dir' in the info directory and enter one line to @@ -65,8 +69,6 @@ Installation of the on-line manual. * Pcl-cvs: (pcl-cvs). An Emacs front-end to CVS. - - How to make typeset documentation from pcl-cvs.texinfo ====================================================== @@ -81,3 +83,4 @@ manual from `pcl-cvs.texinfo'. postscript printer there is a program, `dvi2ps', which does. There is also a program which comes together with TeX, `dvips', which you can use. + diff --git a/gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile b/gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile index f0ded69..7f6f5b1 100644 --- a/gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile +++ b/gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile @@ -1,6 +1,6 @@ -# Makefile,v 1.2 1992/04/07 20:49:07 berliner Exp -# Makefile for pcl-cvs release 1.02. -# Copyright (C) 1992 Per Cederqvist +# @(#) Id: dist-makefile,v 1.19 1993/05/31 22:43:45 ceder Exp +# Makefile for pcl-cvs release 1.05. +# Copyright (C) 1992, 1993 Per Cederqvist # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,6 +26,10 @@ lispdir = /usr/local/lib/elisp prefix=/usr/local infodir = $(prefix)/info +# Used to byte-compile files. + +EMACS=emacs + # # The rest of this file should not need to be modified. # @@ -33,8 +37,8 @@ infodir = $(prefix)/info # Just in case... SHELL = /bin/sh -ELFILES = pcl-cvs.el cookie.el elib-dll.el elib-node.el -ELCFILES = pcl-cvs.elc cookie.elc elib-dll.elc elib-node.elc +ELFILES = pcl-cvs.el pcl-cvs-lucid.el +ELCFILES = pcl-cvs.elc pcl-cvs-lucid.elc INFOFILES = pcl-cvs TEXTMPS = pcl-cvs.aux pcl-cvs.log pcl-cvs.toc pcl-cvs.dvi pcl-cvs.cp \ pcl-cvs.fn pcl-cvs.vr pcl-cvs.tp pcl-cvs.ky pcl-cvs.pg \ @@ -45,7 +49,7 @@ INSTALL = install INSTALL_DATA = $(INSTALL) elcfiles: - emacs -batch -l ./compile-all.el -f compile-pcl-cvs + $(EMACS) -batch -l ./compile-all.el -f compile-pcl-cvs all: elcfiles info @@ -67,6 +71,7 @@ info pcl-cvs: pcl-cvs.texinfo pcl-cvs.dvi: pcl-cvs.texinfo tex pcl-cvs.texinfo + tex pcl-cvs.texinfo -texindex pcl-cvs.cp pcl-cvs.fn pcl-cvs.vr pcl-cvs.tp pcl-cvs.ky \ pcl-cvs.pg tex pcl-cvs.texinfo diff --git a/gnu/usr.bin/cvs/contrib/pcl-cvs/README b/gnu/usr.bin/cvs/contrib/pcl-cvs/README index 6f0a5fe..779617f 100644 --- a/gnu/usr.bin/cvs/contrib/pcl-cvs/README +++ b/gnu/usr.bin/cvs/contrib/pcl-cvs/README @@ -1,6 +1,10 @@ -README,v 1.2 1992/04/07 20:49:09 berliner Exp +@(#) Id: README,v 1.14 1993/05/31 22:43:36 ceder Exp -This is the readme file for pcl-cvs, release 1.02. +This is the readme file for pcl-cvs, release 1.05. + +This release of pcl-cvs requires Elib 0.07 or later. Elib is no +longer distributed with pcl-cvs, since that caused too much confusion. +You can get Elib from ftp.lysator.liu.se in pub/emacs/elib-*.tar.?. Pcl-cvs is a front-end to CVS version 1.3. It integrates the most frequently used CVS commands into emacs. @@ -9,6 +13,16 @@ There is some configuration that needs to be done in pcl-cvs.el to get it to work. See the instructions in file INSTALL. Full documentation is in pcl-cvs.texinfo. Since it requires makeinfo -2.14 a preformatted info file is also included (pcl-cvs.info). +version 2 or 3 a preformatted info file is also included (pcl-cvs.info). + +If you have been using a previous version of pcl-cvs (for instance +1.02 which is distributed with CVS 1.3) you should read through the +file NEWS to see what has changed. + +This release has been tested under Emacs 18.59, Emacs 19.10 and Lucid +Emacs 19.6. Emacs 19.10 unfortunately has a file named cookie.el that +collides with the cookie.el that is distributed in Elib. We are +trying to find a solution to that problem. In the mean time, there is +instructions in Elib 0.07 for how to work around the problem. - ceder@lysator.liu.se + Per Cederqvist diff --git a/gnu/usr.bin/cvs/contrib/pcl-cvs/compile-all.el b/gnu/usr.bin/cvs/contrib/pcl-cvs/compile-all.el index 74f1bca..6563277 100644 --- a/gnu/usr.bin/cvs/contrib/pcl-cvs/compile-all.el +++ b/gnu/usr.bin/cvs/contrib/pcl-cvs/compile-all.el @@ -1,9 +1,10 @@ -;;;; compile-all.el,v 1.2 1992/04/07 20:49:10 berliner Exp -;;;; This file byte-compiles all .el files in pcl-cvs release 1.02. +;;;; @(#) Id: compile-all.el,v 1.11 1993/05/31 18:40:25 ceder Exp +;;;; This file byte-compiles all .el files in pcl-cvs release 1.05. ;;;; ;;;; Copyright (C) 1991 Inge Wallin ;;;; -;;;; This file is part of the GNU Emacs lisp library, Elib. +;;;; This file was once upon a time part of Elib, but have since been +;;;; modified by Per Cederqvist. ;;;; ;;;; GNU Elib is free software; you can redistribute it and/or modify ;;;; it under the terms of the GNU General Public License as published by @@ -21,14 +22,11 @@ ;;;; -(setq elib-files '("elib-node" - "elib-dll" - "cookie" - "pcl-cvs")) +(setq files-to-compile '("pcl-cvs" "pcl-cvs-lucid")) (defun compile-file-if-necessary (file) - "Compile the Elib file FILE if necessary. + "Compile FILE if necessary. This is done if FILE.el is newer than FILE.elc or if FILE.elc doesn't exist." (let ((el-name (concat file ".el")) @@ -41,12 +39,14 @@ This is done if FILE.el is newer than FILE.elc or if FILE.elc doesn't exist." (defun compile-pcl-cvs () - "Byte-compile all uncompiled files of elib. -Be sure to have . in load-path since a number of files in elib -depend on other files and we always want the newer one even if -a previous version of elib exists." + "Byte-compile all uncompiled files of pcl-cvs." (interactive) - (setq load-path (append '(".") load-path)) - (mapcar (function compile-file-if-necessary) - elib-files)) + + ;; Be sure to have . in load-path since a number of files + ;; depend on other files and we always want the newer one even if + ;; a previous version of pcl-cvs exists. + (let ((load-path (append '(".") load-path))) + + (mapcar (function compile-file-if-necessary) + files-to-compile))) diff --git a/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs-startup.el b/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs-startup.el index 27bb57c..f9b2de0 100644 --- a/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs-startup.el +++ b/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs-startup.el @@ -1,6 +1,14 @@ -;;; pcl-cvs-startup.el,v 1.2 1992/04/07 20:49:17 berliner Exp +;;; @(#) Id: pcl-cvs-startup.el,v 1.4 1993/05/31 18:40:33 ceder Exp (autoload 'cvs-update "pcl-cvs" "Run a 'cvs update' in the current working directory. Feed the output to a *cvs* buffer and run cvs-mode on it. If optional prefix argument LOCAL is non-nil, 'cvs update -l' is run." t) + +(autoload 'cvs-update-other-window "pcl-cvs" + "Run a 'cvs update' in the current working directory. Feed the +output to a *cvs* buffer, display it in the other window, and run +cvs-mode on it. + +If optional prefix argument LOCAL is non-nil, 'cvs update -l' is run." + t) diff --git a/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs.el b/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs.el index 99da369..9bbbd38 100644 --- a/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs.el +++ b/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs.el @@ -1,6 +1,6 @@ -;;; pcl-cvs.el,v 1.2 1992/04/07 20:49:19 berliner Exp -;;; pcl-cvs.el -- A Front-end to CVS 1.3 or later. Release 1.02. -;;; Copyright (C) 1991, 1992 Per Cederqvist +;;; @(#) Id: pcl-cvs.el,v 1.93 1993/05/31 22:44:00 ceder Exp +;;; pcl-cvs.el -- A Front-end to CVS 1.3 or later. Release 1.05. +;;; Copyright (C) 1991, 1992, 1993 Per Cederqvist ;;; ;;; This program is free software; you can redistribute it and/or modify ;;; it under the terms of the GNU General Public License as published by @@ -22,8 +22,12 @@ ;;;; General Public License is included in that file. You should read ;;;; it to get the most from this package. +;;;; Send bug reports and improvements to ceder@lysator.liu.se or +;;;; ceder@signum.se. Talk some about Signum Support here. +++FIXME + ;;; Don't try to use this with CVS 1.2 or earlier. It won't work. Get -;;; CVS 1.3. +;;; CVS 1.3. This package works together with RCS 5.6 and probably 5.5 +;;; as well. ;;; Mail questions and bug reports to ceder@lysator.liu.se. @@ -39,8 +43,8 @@ (defvar cvs-diff-program "/usr/gnu/bin/diff" "*Full path to the diff program.") -(defvar cvs-rm-program "/usr/gnu/bin/rm" - "*Full path to the rm program. Typically /bin/rm.") +(defvar cvs-rmdir-program "/usr/gnu/bin/rmdir" + "*Full path to the rmdir program. Typically /bin/rmdir.") ;; Uncomment the following line if you are running on 18.57 or earlier. ;(setq delete-exited-processes nil) @@ -49,9 +53,24 @@ ;; memory, and 18.57 forgets to GCPROT a variable if ;; delete-exited-processes is t. +(defvar cvs-shell "/bin/sh" + "*Full path to a shell that can do redirection on stdout.") + ;;; END OF THINGS TO CHECK WHEN INSTALLING ;;; -------------------------------------------------------- +(defvar cvs-cvsroot nil + "*Specifies where the (current) cvs master repository is. +Overrides the $CVSROOT variable by sending \" -d dir\" to all cvs commands. +This switch is useful if you have multiple CVS repositories.") + +(defvar cvs-stdout-file nil + "Name of the file that holds the output that CVS sends to stdout. +This variable is buffer local.") + +(defvar cvs-lock-file nil + "Full path to a lock file that CVS is waiting for (or was waiting for).") + (defvar cvs-bakprefix ".#" "The prefix that CVS prepends to files when rcsmerge'ing.") @@ -59,11 +78,17 @@ "*Non-nil if input buffers should be cleared before asking for new info.") (defvar cvs-auto-remove-handled nil - "*Non-nil if cvs-remove-handled should be called automatically. + "*Non-nil if cvs-mode-remove-handled should be called automatically. If this is set to any non-nil value entries that does not need to be -checked in will be removed from the *cvs* buffer after every cvs-commit +checked in will be removed from the *cvs* buffer after every cvs-mode-commit command.") +(defvar cvs-sort-ignore-file t + "*Non-nil if cvs-mode-ignore should sort the .cvsignore automatically.") + +(defvar cvs-auto-revert-after-commit t + "*Non-nil if committed buffers should be automatically reverted.") + (defconst cvs-cursor-column 14 "Column to position cursor in in cvs-mode. Column 0 is left-most column.") @@ -81,14 +106,21 @@ Column 0 is left-most column.") "Name of buffer in which the user is prompted for a log message when committing files.") +(defvar cvs-commit-buffer-require-final-newline t + "*t says silently put a newline at the end of commit log messages. +Non-nil but not t says ask user whether to add a newline in each such case. +nil means don't add newlines.") + (defvar cvs-temp-buffer-name "*cvs-tmp*" "*Name of the cvs temporary buffer. Output from cvs is placed here by synchronous commands.") -(defvar cvs-cvs-diff-flags nil - "*List of strings to use as flags to pass to ``cvs diff''. -Used by cvs-diff-cvs. -Set this to '("-u") to get a Unidiff format, or '("-c") to get context diffs.") +(defvar cvs-diff-ignore-marks nil + "*Non-nil if cvs-diff and cvs-mode-diff-backup should ignore any marked files. +Normally they run diff on the files that are marked (with cvs-mode-mark), +or the file under the cursor if no files are marked. If this variable +is set to a non-nil value they will always run diff on the file on the +current line.") (defvar cvs-status-flags nil "*List of strings to pass to ``cvs status''.") @@ -97,8 +129,21 @@ Set this to '("-u") to get a Unidiff format, or '("-c") to get context diffs.") "*List of strings to pass to ``cvs log''.") (defvar cvs-diff-flags nil - "*List of strings to use as flags to pass to ``diff''. -Do not confuse with cvs-cvs-diff-flags. Used by cvs-diff-backup.") + "*List of strings to use as flags to pass to ``diff'' and ``cvs diff''. +Used by cvs-mode-diff-cvs and cvs-mode-diff-backup. +Set this to '(\"-u\") to get a Unidiff format, or '(\"-c\") to get context diffs.") + +(defvar cvs-update-prog-output-skip-regexp "$" + "*A regexp that matches the end of the output from all cvs update programs. +That is, output from any programs that are run by CVS (by the flag -u +in the `modules' file - see cvs(5)) when `cvs update' is performed should +terminate with a line that this regexp matches. It is enough that +some part of the line is matched. + +The default (a single $) fits programs without output.") + +;; The variables below are used internally by pcl-cvs. You should +;; never change them. (defvar cvs-buffers-to-delete nil "List of temporary buffers that should be discarded as soon as possible. @@ -110,21 +155,29 @@ Due to a bug in emacs 18.57 the sentinel can't discard them reliably.") ;; to their .emacs they can get rid of it. Just don't add that line ;; to your default.el! (defvar cvs-inhibit-copyright-message nil - "*Don't display a Copyright message in the ``*cvs*'' buffer.") + "*Non-nil means don't display a Copyright message in the ``*cvs*'' buffer.") -(defvar cvs-startup-message +(defconst pcl-cvs-version "1.05" + "A string denoting the current release version of pcl-cvs.") + +(defconst cvs-startup-message (if cvs-inhibit-copyright-message - "PCL-CVS release 1.02" - "PCL-CVS release 1.02. Copyright (C) 1992 Per Cederqvist + "PCL-CVS release 1.05" + "PCL-CVS release 1.05. Copyright (C) 1992, 1993 Per Cederqvist Pcl-cvs comes with absolutely no warranty; for details consult the manual. This is free software, and you are welcome to redistribute it under certain conditions; again, consult the TeXinfo manual for details.") "*Startup message for CVS.") -(defvar cvs-cvs-buffer nil - "Internal to pcl-cvs.el. -This variable exists in the *cvs-commit-message* buffer and names -the *cvs* buffer.") +(defvar cvs-update-running nil + "This is set to nil when no process is running, and to +the process when a cvs update process is running.") + +(defvar cvs-cookie-handle nil + "Handle for the cookie structure that is displayed in the *cvs* buffer.") + +(defvar cvs-mode-commit nil + "Used internally by pcl-cvs.") ;;; The cvs data structure: ;;; @@ -148,15 +201,20 @@ the *cvs* buffer.") ;;; CONFLICT - conflict when merging ;;; REM-CONFLICT-removed in repository, changed locally. ;;; MOD-CONFLICT-removed locally, changed in repository. +;;; REM-EXIST -removed locally, but still exists. ;;; DIRCHANGE - A change of directory. ;;; UNKNOWN - An unknown file. ;;; MOVE-AWAY - A file that is in the way. ;;; REPOS-MISSING- The directory is removed from the ;;; repository. Go fetch a backup. +;;; MESSAGE - This is a special fileinfo that is used +;;; to display a text that should be in +;;; full-log. ;;; dir Directory the file resides in. Should not end with ;;; slash. ;;; file-name The file name. -;;; backup-file Name of the backup file if MERGED or CONFLICT. +;;; base-revision The revision that the working file was based on. +;;; Onlyy valid for MERGED and CONFLICT files. ;;; cvs-diff-buffer A buffer that contains a 'cvs diff file'. ;;; backup-diff-buffer A buffer that contains a 'diff file backup-file'. ;;; full-log The output from cvs, unparsed. @@ -191,11 +249,15 @@ A fileinfo has the following fields: REM-CONFLICT-removed in repository, but altered locally. MOD-CONFLICT-removed locally, changed in repository. + REM-EXIST - removed locally, but still exists. DIRCHANGE - A change of directory. UNKNOWN - An unknown file. MOVE-AWAY - A file that is in the way. REPOS-MISSING- The directory has vanished from the repository. + MESSAGE - This is a special fileinfo that is used + to display a text that should be in + full-log. dir Directory the file resides in. Should not end with slash. file-name The file name. backup-file Name of the backup file if MERGED or CONFLICT. @@ -222,8 +284,8 @@ A fileinfo has the following fields: (defun cvs-fileinfo->type (cvs-fileinfo) "Get type from CVS-FILEINFO. Type is one of UPDATED, MODIFIED, ADDED, REMOVED, CVS-REMOVED, MERGED, -CONFLICT, REM-CONFLICT, MOD-CONFLICT, DIRCHANGE, UNKNOWN, MOVE-AWAY -or REPOS-MISSING." +CONFLICT, REM-CONFLICT, MOD-CONFLICT, REM-EXIST, DIRCHANGE, UNKNOWN, MOVE-AWAY, +REPOS-MISSING or MESSAGE." (elt (cdr cvs-fileinfo) 2)) (defun cvs-fileinfo->dir (cvs-fileinfo) @@ -235,8 +297,8 @@ The directory name does not end with a slash. " "Get file-name from CVS-FILEINFO." (elt (cdr cvs-fileinfo) 4)) -(defun cvs-fileinfo->backup-file (cvs-fileinfo) - "Get backup-file from CVS-FILEINFO." +(defun cvs-fileinfo->base-revision (cvs-fileinfo) + "Get the base revision from CVS-FILEINFO." (elt (cdr cvs-fileinfo) 5)) (defun cvs-fileinfo->cvs-diff-buffer (cvs-fileinfo) @@ -278,8 +340,8 @@ The directory should now end with a slash." "Set file-name in CVS-FILEINFO to NEWVAL." (aset (cdr cvs-fileinfo) 4 newval)) -(defun cvs-set-fileinfo->backup-file (cvs-fileinfo newval) - "Set backup-file in CVS-FILEINFO to NEWVAL." +(defun cvs-set-fileinfo->base-revision (cvs-fileinfo newval) + "Set base-revision in CVS-FILEINFO to NEWVAL." (aset (cdr cvs-fileinfo) 5 newval)) (defun cvs-set-fileinfo->cvs-diff-buffer (cvs-fileinfo newval) @@ -313,10 +375,12 @@ The directory should now end with a slash." The selected window will not be changed. The temporary buffer will be erased and writable." - (display-buffer (get-buffer-create cvs-temp-buffer-name)) - (set-buffer cvs-temp-buffer-name) - (setq buffer-read-only nil) - (erase-buffer)) + (let ((dir default-directory)) + (display-buffer (get-buffer-create cvs-temp-buffer-name)) + (set-buffer cvs-temp-buffer-name) + (setq buffer-read-only nil) + (setq default-directory dir) + (erase-buffer))) ; Too complicated to handle all the cases that are generated. ; Maybe later. @@ -337,7 +401,20 @@ If optional prefix argument LOCAL is non-nil, 'cvs update -l' is run." (interactive (list (read-file-name "CVS Update (directory): " nil default-directory nil) current-prefix-arg)) - (cvs-do-update directory local nil)) + (cvs-do-update directory local nil) + (switch-to-buffer cvs-buffer-name)) + +(defun cvs-update-other-window (directory &optional local) + "Run a 'cvs update' in the current working directory. Feed the +output to a *cvs* buffer, display it in the other window, and run +cvs-mode on it. + +If optional prefix argument LOCAL is non-nil, 'cvs update -l' is run." + (interactive (list (read-file-name "CVS Update other window (directory): " + nil default-directory nil) + current-prefix-arg)) + (cvs-do-update directory local nil) + (switch-to-buffer-other-window cvs-buffer-name)) (defun cvs-filter (predicate list &rest extra-args) "Apply PREDICATE to each element on LIST. @@ -356,58 +433,109 @@ passed to PREDICATE." (setq list (cdr list))) (cdr head))) -(defun cvs-update-no-prompt () +(defun cvs-mode-update-no-prompt () "Run cvs update in current directory." (interactive) (cvs-do-update default-directory nil nil)) (defun cvs-do-update (directory local dont-change-disc) "Do a 'cvs update' in DIRECTORY. +Args: DIRECTORY LOCAL DONT-CHANGE-DISC &optional NOTTHISWINDOW. If LOCAL is non-nil 'cvs update -l' is executed. If DONT-CHANGE-DISC is non-nil 'cvs -n update' is executed. Both LOCAL and DONT-CHANGE-DISC may be non-nil simultaneously. *Note*: DONT-CHANGE-DISC does not yet work. The parser gets confused." (save-some-buffers) + (if (not (file-exists-p cvs-program)) + (error "%s: file not found (check setting of cvs-program)" + cvs-program)) + (if (not (or (getenv "CVSROOT") cvs-cvsroot)) + (error "Both cvs-cvsroot and environment variable CVSROOT unset.")) (let* ((this-dir (file-name-as-directory (expand-file-name directory))) - (use-this-window (equal (buffer-name (current-buffer)) - cvs-buffer-name)) (update-buffer (generate-new-buffer (concat (file-name-nondirectory (substring this-dir 0 -1)) "-update"))) - cvs-process args) - - ;; The *cvs* buffer is killed to avoid confusion - is the update ready - ;; or not? - (if (get-buffer cvs-buffer-name) - (kill-buffer cvs-buffer-name)) - - ;; Generate "-n update -l". - (if local (setq args (list "-l"))) - (setq args (cons "update" args)) - (if dont-change-disc (setq args (cons "-n" args))) - - ;; Set up the buffer that receives the output from "cvs update". - (if use-this-window - (switch-to-buffer update-buffer) - (set-buffer update-buffer) - (display-buffer update-buffer)) - + (temp-name (make-temp-name + (concat (file-name-as-directory + (or (getenv "TMPDIR") "/tmp")) + "pcl-cvs."))) + (args nil)) + + ;; Check that this-dir exists and is a directory that is under CVS contr. + + (if (not (file-directory-p this-dir)) + (error "%s is not a directory." this-dir)) + (if (not (file-directory-p (concat this-dir "CVS"))) + (error "%s does not contain CVS controlled files." this-dir)) + + ;; Check that at most one `cvs update' is run at any time. + + (if (and cvs-update-running (process-status cvs-update-running) + (or (eq (process-status cvs-update-running) 'run) + (eq (process-status cvs-update-running) 'stop))) + (error "Can't run two `cvs update' simultaneously.")) + + ;; Generate "-d /master -n update -l". + (setq args (concat (if cvs-cvsroot (concat " -d " cvs-cvsroot)) + (if dont-change-disc " -n ") + " update " + (if local " -l "))) + + ;; Set up the buffer that receives the stderr output from "cvs update". + (set-buffer update-buffer) (setq default-directory this-dir) - (setq cvs-process + (make-local-variable 'cvs-stdout-file) + (setq cvs-stdout-file temp-name) + + (setq cvs-update-running (let ((process-connection-type nil)) ; Use a pipe, not a pty. - (apply 'start-process "cvs" update-buffer cvs-program args))) + (start-process "cvs" update-buffer cvs-shell "-c" + (concat cvs-program " " args " > " temp-name)))) (setq mode-line-process (concat ": " - (symbol-name (process-status cvs-process)))) + (symbol-name (process-status cvs-update-running)))) (set-buffer-modified-p (buffer-modified-p)) ; Update the mode line. - (set-process-sentinel cvs-process 'cvs-sentinel) + (set-process-sentinel cvs-update-running 'cvs-sentinel) + (set-process-filter cvs-update-running 'cvs-update-filter) + (set-marker (process-mark cvs-update-running) (point-min)) + + (save-excursion + (set-buffer (get-buffer-create cvs-buffer-name)) + (setq buffer-read-only nil) + (erase-buffer) + (cvs-mode)) + + (setq cvs-cookie-handle + (collection-create + cvs-buffer-name 'cvs-pp + cvs-startup-message ;Se comment above cvs-startup-message. + "---------- End -----")) + + (cookie-enter-first + cvs-cookie-handle + (cvs-create-fileinfo + 'MESSAGE nil nil (concat "\n Running `cvs " args "' in " this-dir + "...\n"))) + + (save-excursion + (set-buffer cvs-buffer-name) + (setq mode-line-process + (concat ": " + (symbol-name (process-status cvs-update-running)))) + (set-buffer-modified-p (buffer-modified-p)) ; Update the mode line. + (setq buffer-read-only t)) ;; Work around a bug in emacs 18.57 and earlier. (setq cvs-buffers-to-delete - (cvs-delete-unused-temporary-buffers cvs-buffers-to-delete)))) + (cvs-delete-unused-temporary-buffers cvs-buffers-to-delete))) + + ;; The following line is said to improve display updates on some + ;; emacses. It shouldn't be needed, but it does no harm. + (sit-for 0)) + (defun cvs-delete-unused-temporary-buffers (list) "Delete all buffers on LIST that is not visible. @@ -430,27 +558,30 @@ Return a list of all buffers that still is alive." To get the *cvs* buffer you should use ``\\[cvs-update]''. -Full documentation is in the TeXinfo file. These are the most useful commands: - -\\[cookie-previous-cookie] Move up. \\[cookie-next-cookie] Move down. -\\[cvs-commit] Commit file. \\[cvs-update-no-prompt] Reupdate directory. -\\[cvs-mark] Mark file/dir. \\[cvs-unmark] Unmark file/dir. -\\[cvs-mark-all-files] Mark all files. \\[cvs-unmark-all-files] Unmark all files. -\\[cvs-find-file] Edit file/run Dired. \\[cvs-find-file-other-window] Find file or run Dired in other window. -\\[cvs-remove-handled] Remove processed entries. \\[cvs-add-change-log-entry-other-window] Write ChangeLog in other window. -\\[cvs-add] Add to repository. \\[cvs-remove-file] Remove file. -\\[cvs-diff-cvs] Diff between base revision. \\[cvs-diff-backup] Diff backup file. -\\[cvs-acknowledge] Delete line from buffer. \\[cvs-ignore] Add file to the .cvsignore file. -\\[cvs-log] Run ``cvs log''. \\[cvs-status] Run ``cvs status''. +Full documentation is in the Texinfo file. These are the most useful commands: + +\\[cvs-mode-previous-line] Move up. \\[cvs-mode-next-line] Move down. +\\[cvs-mode-commit] Commit file. \\[cvs-mode-update-no-prompt] Reupdate directory. +\\[cvs-mode-mark] Mark file/dir. \\[cvs-mode-unmark] Unmark file/dir. +\\[cvs-mode-mark-all-files] Mark all files. \\[cvs-mode-unmark-all-files] Unmark all files. +\\[cvs-mode-find-file] Edit file/run Dired. \\[cvs-mode-find-file-other-window] Find file or run Dired in other window. +\\[cvs-mode-remove-handled] Remove processed entries. \\[cvs-mode-add-change-log-entry-other-window] Write ChangeLog in other window. +\\[cvs-mode-add] Add to repository. \\[cvs-mode-remove-file] Remove file. +\\[cvs-mode-diff-cvs] Diff between base revision. \\[cvs-mode-diff-backup] Diff backup file. +\\[cvs-mode-emerge] Run emerge on base revision/backup file. +\\[cvs-mode-acknowledge] Delete line from buffer. \\[cvs-mode-ignore] Add file to the .cvsignore file. +\\[cvs-mode-log] Run ``cvs log''. \\[cvs-mode-status] Run ``cvs status''. +\\[cvs-mode-undo-local-changes] Revert the last checked in version - discard your changes to the file. Entry to this mode runs cvs-mode-hook. -This description is updated for release 1.02 of pcl-cvs. +This description is updated for release 1.05 of pcl-cvs. + All bindings: \\{cvs-mode-map}" (interactive) (setq major-mode 'cvs-mode) (setq mode-name "CVS") - (setq buffer-read-only nil) + (setq mode-line-process nil) (buffer-flush-undo (current-buffer)) (make-local-variable 'goal-column) (setq goal-column cvs-cursor-column) @@ -477,10 +608,16 @@ it is finished." (setq mode-line-process (concat ": " (symbol-name (process-status proc)))) - (cvs-parse-buffer) - (setq cvs-buffers-to-delete - (cons (process-buffer proc) cvs-buffers-to-delete))) - (set-buffer-modified-p (buffer-modified-p))) + (let* ((out-file cvs-stdout-file) + (stdout-buffer (find-file-noselect out-file))) + (cvs-parse-update stdout-buffer (process-buffer proc)) + (setq cvs-buffers-to-delete + (cons (process-buffer proc) + (cons stdout-buffer + cvs-buffers-to-delete))) + (delete-file out-file))) + (set-buffer-modified-p (buffer-modified-p)) + (setq cvs-update-running nil)) (if (equal obuf (process-buffer proc)) nil (set-buffer (process-buffer proc)) @@ -488,9 +625,90 @@ it is finished." (goto-char opoint)) (set-buffer obuf)))))) -(defun cvs-skip-line (regexp errormsg &optional arg) +(defun cvs-update-filter (proc string) + "Filter function for pcl-cvs. +This function gets the output that CVS sends to stderr. It inserts it +into (process-buffer proc) but it also checks if CVS is waiting for a +lock file. If so, it inserts a message cookie in the *cvs* buffer." + (let ((old-buffer (current-buffer)) + (data (match-data))) + (unwind-protect + (progn + (set-buffer (process-buffer proc)) + (save-excursion + ;; Insert the text, moving the process-marker. + (goto-char (process-mark proc)) + (insert string) + (set-marker (process-mark proc) (point)) + ;; Delete any old lock message + (if (tin-nth cvs-cookie-handle 1) + (tin-delete cvs-cookie-handle + (tin-nth cvs-cookie-handle 1))) + ;; Check if CVS is waiting for a lock. + (beginning-of-line 0) ;Move to beginning of last + ;complete line. + (cond + ((looking-at + "^cvs update: \\[..:..:..\\] waiting \ +for \\(.*\\)lock in \\(.*\\)$") + (setq cvs-lock-file (buffer-substring (match-beginning 2) + (match-end 2))) + (cookie-enter-last + cvs-cookie-handle + (cvs-create-fileinfo + 'MESSAGE nil nil + (concat "\tWaiting for " + (buffer-substring (match-beginning 1) + (match-end 1)) + "lock in " cvs-lock-file + ".\n\t (type M-x cvs-delete-lock to delete it)"))))))) + (store-match-data data) + (set-buffer old-buffer)))) + +(defun cvs-delete-lock () + "Delete the lock file that CVS is waiting for. +Note that this can be dangerous. You should only do this +if you are convinced that the process that created the lock is dead." + (interactive) + (cond + ((not (or (file-exists-p + (concat (file-name-as-directory cvs-lock-file) "#cvs.lock")) + (cvs-filter (function cvs-lock-file-p) + (directory-files cvs-lock-file)))) + (error "No lock files found.")) + ((yes-or-no-p (concat "Really delete locks in " cvs-lock-file "? ")) + ;; Re-read the directory -- the locks might have disappeared. + (let ((locks (cvs-filter (function cvs-lock-file-p) + (directory-files cvs-lock-file)))) + (while locks + (delete-file (concat (file-name-as-directory cvs-lock-file) + (car locks))) + (setq locks (cdr locks))) + (cvs-remove-directory + (concat (file-name-as-directory cvs-lock-file) "#cvs.lock")))))) + +(defun cvs-remove-directory (dir) + "Remove a directory." + (if (file-directory-p dir) + (call-process cvs-rmdir-program nil nil nil dir) + (error "Not a directory: %s" dir)) + (if (file-exists-p dir) + (error "Could not remove directory %s" dir))) + +(defun cvs-lock-file-p (file) + "Return true if FILE looks like a CVS lock file." + (or + (string-match "^#cvs.tfl.[0-9]+$" file) + (string-match "^#cvs.rfl.[0-9]+$" file) + (string-match "^#cvs.wfl.[0-9]+$" file))) + +(defun cvs-skip-line (stdout stderr regexp &optional arg) "Like forward-line, but check that the skipped line matches REGEXP. -If it doesn't match REGEXP (error ERRORMSG) is called. +Args: STDOUT STDERR REGEXP &optional ARG. + +If it doesn't match REGEXP a bug report is generated and displayed. +STDOUT and STDERR is only used to do that. + If optional ARG, a number, is given the ARGth parenthesized expression in the REGEXP is returned as a string. Point should be in column 1 when this function is called." @@ -501,203 +719,297 @@ Point should be in column 1 when this function is called." (buffer-substring (match-beginning arg) (match-end arg)))) (t - (error errormsg)))) - -(defun cvs-get-current-dir (dirname) - "Return current working directory, suitable for cvs-parse-buffer. -Args: DIRNAME. -Concatenates default-directory and DIRNAME to form an absolute path." + (cvs-parse-error stdout stderr + (if (eq (current-buffer) stdout) 'STDOUT 'STDERR) + (point))))) + +(defun cvs-get-current-dir (root-dir dirname) + "Return current working directory, suitable for cvs-parse-update. +Args: ROOT-DIR DIRNAME. +Concatenates ROOT-DIR and DIRNAME to form an absolute path." (if (string= "." dirname) - (substring default-directory 0 -1) - (concat default-directory dirname))) + (substring root-dir 0 -1) + (concat root-dir dirname))) +(defun cvs-compare-fileinfos (a b) + "Compare fileinfo A with fileinfo B and return t if A is `less'." + (cond + ;; Sort acording to directories. + ((string< (cvs-fileinfo->dir a) (cvs-fileinfo->dir b)) t) + ((not (string= (cvs-fileinfo->dir a) (cvs-fileinfo->dir b))) nil) + + ;; The DIRCHANGE entry is always first within the directory. + ((and (eq (cvs-fileinfo->type a) 'DIRCHANGE) + (not (eq (cvs-fileinfo->type b) 'DIRCHANGE))) t) + ((and (eq (cvs-fileinfo->type b) 'DIRCHANGE) + (not (eq (cvs-fileinfo->type a) 'DIRCHANGE))) nil) + ;; All files are sorted by file name. + ((string< (cvs-fileinfo->file-name a) (cvs-fileinfo->file-name b))))) + +(defun cvs-parse-error (stdout-buffer stderr-buffer err-buf pos) + "Handle a parse error when parsing the output from cvs. +Args: STDOUT-BUFFER STDERR-BUFFER ERR-BUF POS. +ERR-BUF should be 'STDOUT or 'STDERR." + (setq pos (1- pos)) + (set-buffer cvs-buffer-name) + (setq buffer-read-only nil) + (erase-buffer) + (insert "To: ceder@lysator.liu.se\n") + (insert "Subject: pcl-cvs " pcl-cvs-version " parse error.\n") + (insert "--text follows this line--\n\n") + (insert "This bug report is automatically generated by pcl-cvs\n") + (insert "because it doesn't understand some output from CVS. Below\n") + (insert "is detailed information about the error. Please send\n") + (insert "this, together with any information you think might be\n") + (insert "useful for me to fix the bug, to the address above. But\n") + (insert "please check the \"known problems\" section of the\n") + (insert "documentation first. Note that this buffer contains\n") + (insert "information that you might consider confidential. You\n") + (insert "are encouraged to read through it before sending it.\n") + (insert "\n") + (insert "Press C-c C-c to send this email.\n\n") + (insert "Please state the version of these programs you are using:\n") + (insert "RCS: \ndiff: \n\n") + + (let* ((stdout (save-excursion (set-buffer stdout-buffer) (buffer-string))) + (stderr (save-excursion (set-buffer stderr-buffer) (buffer-string))) + (errstr (if (eq err-buf 'STDOUT) stdout stderr)) + (errline-end (string-match "\n" errstr pos)) + (errline (substring errstr pos errline-end))) + (insert (format "Offending line (%d chars): >" (- errline-end pos))) + (insert errline) + (insert "<\n") + (insert "Sent to " (symbol-name err-buf) " at pos " (format "%d\n" pos)) + (insert "Emacs-version: " (emacs-version) "\n") + (insert "Pcl-cvs $" "Id:" "$" ": " "Id: pcl-cvs.el,v 1.93 1993/05/31 22:44:00 ceder Exp \n") + (insert "\n") + (insert (format "--- Contents of stdout buffer (%d chars) ---\n" + (length stdout))) + (insert stdout) + (insert "--- End of stdout buffer ---\n") + (insert (format "--- Contents of stderr buffer (%d chars) ---\n" + (length stderr))) + (insert stderr) + (insert "--- End of stderr buffer ---\n") + (insert "End of bug report.\n") + (require 'sendmail) + (mail-mode) + (error "CVS parse error - please report this bug."))) + +(defun cvs-parse-update (stdout-buffer stderr-buffer) + "Parse the output from `cvs update'. + +Args: STDOUT-BUFFER STDERR-BUFFER. + +This functions parses the from `cvs update' (which should be +separated in its stdout- and stderr-components) and prints a +pretty representation of it in the *cvs* buffer. -(defun cvs-parse-buffer () - "Parse the current buffer and select a *cvs* buffer. Signals an error if unexpected output was detected in the buffer." - (goto-char (point-min)) - (let ((buf (get-buffer-create cvs-buffer-name)) - (current-dir default-directory) - (root-dir default-directory) - (parse-buf (current-buffer))) - - (cookie-create - buf 'cvs-pp cvs-startup-message ;Se comment above cvs-startup-message. - "---------- End -----") - - (cookie-enter-first - buf - (cvs-create-fileinfo - 'DIRCHANGE current-dir - nil "")) + (let* ((head (cons 'dummy nil)) + (tail (cvs-parse-stderr stdout-buffer stderr-buffer + head default-directory)) + (root-dir default-directory)) + (cvs-parse-stdout stdout-buffer stderr-buffer tail root-dir) + (setq head (sort (cdr head) (function cvs-compare-fileinfos))) + + (collection-clear cvs-cookie-handle) + (collection-append-cookies cvs-cookie-handle head) + (cvs-remove-stdout-shadows) + (cvs-remove-empty-directories) + (set-buffer cvs-buffer-name) + (cvs-mode) + (goto-char (point-min)) + (tin-goto-previous cvs-cookie-handle (point-min) 1) + (setq default-directory root-dir))) + +(defun cvs-remove-stdout-shadows () + "Remove entries in the *cvs* buffer that comes from both stdout and stderr. +If there is two entries for a single file the second one should be +deleted. (Remember that sort uses a stable sort algorithm, so one can +be sure that the stderr entry is always first)." + (collection-filter-tins cvs-cookie-handle + (function + (lambda (tin) + (not (cvs-shadow-entry-p tin)))))) + +(defun cvs-shadow-entry-p (tin) + "Return non-nil if TIN is a shadow entry. +Args: TIN. +A TIN is a shadow entry if the previous tin contains the same file." + (let* ((previous-tin (tin-previous cvs-cookie-handle tin)) + (curr (tin-cookie cvs-cookie-handle tin)) + (prev (and previous-tin + (tin-cookie cvs-cookie-handle previous-tin)))) + (and + prev curr + (string= (cvs-fileinfo->file-name prev) (cvs-fileinfo->file-name curr)) + (string= (cvs-fileinfo->dir prev) (cvs-fileinfo->dir curr)) + (or + (and (eq (cvs-fileinfo->type prev) 'CONFLICT) + (eq (cvs-fileinfo->type curr) 'CONFLICT)) + (and (eq (cvs-fileinfo->type prev) 'MERGED) + (eq (cvs-fileinfo->type curr) 'MODIFIED)) + (and (eq (cvs-fileinfo->type prev) 'REM-EXIST) + (eq (cvs-fileinfo->type curr) 'REMOVED)))))) + + +(defun cvs-parse-stderr (stdout-buffer stderr-buffer head dir) + "Parse the output from CVS that is written to stderr. +Args: STDOUT-BUFFER STDERR-BUFFER HEAD DIR +STDOUT-BUFFER holds the output that cvs sent to stdout. It is only +used to create a bug report in case there is a parse error. +STDERR-BUFFER is the buffer that holds the output to parse. +HEAD is a cons-cell, the head of the list that is built. +DIR is the directory the `cvs update' was run in. + +This function returns the last cons-cell in the list that is built." - (while (< (point) (point-max)) - (cond + (save-window-excursion + (set-buffer stderr-buffer) + (goto-char (point-min)) + (let ((current-dir dir) + (root-dir dir)) - ;; CVS is descending a subdirectory. + (while (< (point) (point-max)) + (cond - ((looking-at "cvs update: Updating \\(.*\\)$") - (setq current-dir - (cvs-get-current-dir - (buffer-substring (match-beginning 1) (match-end 1)))) + ;; RCVS support (for now, we simply ignore any output from + ;; RCVS, including error messages!) - ;; Omit empty directories. - (if (eq (cvs-fileinfo->type (cookie-last buf)) - 'DIRCHANGE) - (cookie-delete-last buf)) + ((looking-at "updating of .* finished$") + (forward-line 1)) - (cookie-enter-last - buf - (cvs-create-fileinfo - 'DIRCHANGE current-dir - nil (buffer-substring (match-beginning 0) - (match-end 0)))) - (forward-line 1)) + ((looking-at "REMOTE FOLDER:.*") + (forward-line 1) + (while (and (< (point) (point-max)) (not (looking-at "phase 2.*"))) + (forward-line 1)) + (forward-line 2)) - ;; File removed, since it is removed (by third party) in repository. + ((looking-at "turn on remote mode$") + (forward-line 1) + (while (and (< (point) (point-max)) (not (looking-at "phase 2.*"))) + (forward-line 1)) + (forward-line 2)) + + ((looking-at "phase 3.*") + (goto-char (point-max))) + + ;; End of RCVS stuff. + + ;; CVS is descending a subdirectory. + + ((looking-at "cvs update: Updating \\(.*\\)$") + (setq current-dir + (cvs-get-current-dir + root-dir + (buffer-substring (match-beginning 1) (match-end 1)))) + (setcdr head (list (cvs-create-fileinfo + 'DIRCHANGE current-dir + nil (buffer-substring (match-beginning 0) + (match-end 0))))) + (setq head (cdr head)) + (forward-line 1)) + + ;; File removed, since it is removed (by third party) in repository. - ((or (looking-at "cvs update: warning: \\(.*\\) is not (any longer) \ -pertinent") - (looking-at "cvs update: \\(.*\\) is no longer in the repository")) - (cookie-enter-last - buf - (cvs-create-fileinfo - 'CVS-REMOVED current-dir - (file-name-nondirectory - (buffer-substring (match-beginning 1) (match-end 1))) - (buffer-substring (match-beginning 0) - (match-end 0)))) - (forward-line 1)) - - ;; File removed by you, but recreated by cvs. Ignored. - - ((looking-at "cvs update: warning: .* was lost$") - (forward-line 1)) - - ;; A file that has been created by you, but added to the cvs - ;; repository by another. - - ((looking-at "^cvs update: move away \\(.*\\); it is in the way$") - (cookie-enter-last - buf - (cvs-create-fileinfo - 'MOVE-AWAY current-dir - (file-name-nondirectory - (buffer-substring (match-beginning 1) (match-end 1))) - (buffer-substring (match-beginning 0) - (match-end 0)))) - (forward-line 1)) - - ;; Empty line. Probably inserted by mistake by user (or developer :-) - ;; Ignore. - - ((looking-at "^$") - (forward-line 1)) - - ;; Cvs waits for a lock. Ignore. - - ((looking-at - "^cvs update: \\[..:..:..\\] waiting for .*lock in ") - (forward-line 1)) - - ;; File removed in repository, but edited by you. - - ((looking-at - "cvs update: conflict: \\(.*\\) is modified but no longer \ + ((or (looking-at + "cvs update: warning: \\(.*\\) is not (any longer) pertinent") + (looking-at + "cvs update: \\(.*\\) is no longer in the repository")) + + (setcdr head (list (cvs-create-fileinfo + 'CVS-REMOVED current-dir + (file-name-nondirectory + (buffer-substring (match-beginning 1) + (match-end 1))) + (buffer-substring (match-beginning 0) + (match-end 0))))) + (setq head (cdr head)) + (forward-line 1)) + + ;; File removed by you, but recreated by cvs. Ignored. + + ((looking-at "cvs update: warning: .* was lost$") + (forward-line 1)) + + ;; A file that has been created by you, but added to the cvs + ;; repository by another. + + ((looking-at "^cvs update: move away \\(.*\\); it is in the way$") + (setcdr head (list (cvs-create-fileinfo + 'MOVE-AWAY current-dir + (file-name-nondirectory + (buffer-substring (match-beginning 1) + (match-end 1))) + (buffer-substring (match-beginning 0) + (match-end 0))))) + (setq head (cdr head)) + (forward-line 1)) + + ;; Empty line. Probably inserted by mistake by user (or developer :-) + ;; Ignore. + + ((looking-at "^$") + (forward-line 1)) + + ;; Cvs waits for a lock. Ignore. + + ((looking-at + "^cvs update: \\[..:..:..\\] waiting for .*lock in ") + (forward-line 1)) + + ;; File removed in repository, but edited by you. + + ((looking-at + "cvs update: conflict: \\(.*\\) is modified but no longer \ in the repository$") - (cookie-enter-last - buf - (cvs-create-fileinfo - 'REM-CONFLICT current-dir - (file-name-nondirectory - (buffer-substring (match-beginning 1) (match-end 1))) - (buffer-substring (match-beginning 0) - (match-end 0)))) - (forward-line 1)) - - ((looking-at - "cvs update: conflict: removed \\(.*\\) was modified by second party") - (cvs-create-fileinfo - 'MOD-CONFLICT current-dir - (buffer-substring (match-beginning 1) (match-end 1)) - (buffer-substring (match-beginning 0) (match-end 0))) - (forward-line 1)) - - ((looking-at "cvs update: in directory ") - (let ((start (point))) - (forward-line 1) - (cvs-skip-line - (regexp-quote "cvs [update aborted]: there is no repository ") - "Unexpected cvs output.") - (cookie-enter-last - buf - (cvs-create-fileinfo - 'REPOS-MISSING current-dir - nil - (buffer-substring start (point)))))) - - ;; The file is copied from the repository. - - ((looking-at "U \\(.*\\)$") - (cookie-enter-last - buf - (let ((fileinfo - (cvs-create-fileinfo - 'UPDATED current-dir - (file-name-nondirectory - (buffer-substring (match-beginning 1) (match-end 1))) - (buffer-substring (match-beginning 0) (match-end 0))))) - (cvs-set-fileinfo->handled fileinfo t) - fileinfo)) - (forward-line 1)) - - ;; The file is modified by the user, and untouched in the repository. - - ((looking-at "M \\(.*\\)$") - (cookie-enter-last - buf - (cvs-create-fileinfo - 'MODIFIED current-dir - (file-name-nondirectory - (buffer-substring (match-beginning 1) (match-end 1))) - (buffer-substring (match-beginning 0) (match-end 0)))) - (forward-line 1)) - - ;; The file is "cvs add"ed, but not "cvs ci"ed. - - ((looking-at "A \\(.*\\)$") - (cookie-enter-last - buf - (cvs-create-fileinfo - 'ADDED current-dir - (file-name-nondirectory - (buffer-substring (match-beginning 1) (match-end 1))) - (buffer-substring (match-beginning 0) (match-end 0)))) - (forward-line 1)) - - ;; The file is "cvs remove"ed, but not "cvs ci"ed. - - ((looking-at "R \\(.*\\)$") - (cookie-enter-last - buf - (cvs-create-fileinfo - 'REMOVED current-dir - (file-name-nondirectory - (buffer-substring (match-beginning 1) (match-end 1))) - (buffer-substring (match-beginning 0) (match-end 0)))) - (forward-line 1)) - - ;; Unknown file. + (setcdr head (list + (cvs-create-fileinfo + 'REM-CONFLICT current-dir + (file-name-nondirectory + (buffer-substring (match-beginning 1) (match-end 1))) + (buffer-substring (match-beginning 0) + (match-end 0))))) + (setq head (cdr head)) + (forward-line 1)) + + ((looking-at + "cvs update: conflict: removed \\(.*\\) was modified by \ +second party") + (setcdr head + (list + (cvs-create-fileinfo + 'MOD-CONFLICT current-dir + (buffer-substring (match-beginning 1) (match-end 1)) + (buffer-substring (match-beginning 0) (match-end 0))))) + (setq head (cdr head)) + (forward-line 1)) + + ((looking-at + "cvs update: \\(.*\\) should be removed and is still there") + (setcdr head + (list + (cvs-create-fileinfo + 'REM-EXIST current-dir + (buffer-substring (match-beginning 1) (match-end 1)) + (buffer-substring (match-beginning 0) (match-end 0))))) + (setq head (cdr head)) + (forward-line 1)) + + ((looking-at "cvs update: in directory ") + (let ((start (point))) + (forward-line 1) + (cvs-skip-line + stdout-buffer stderr-buffer + (regexp-quote "cvs [update aborted]: there is no repository ")) + (setcdr head (list + (cvs-create-fileinfo + 'REPOS-MISSING current-dir + nil + (buffer-substring start (point))))) + (setq head (cdr head)))) - ((looking-at "? \\(.*\\)$") - (cookie-enter-last - buf - (cvs-create-fileinfo - 'UNKNOWN current-dir - (file-name-nondirectory - (buffer-substring (match-beginning 1) (match-end 1))) - (buffer-substring (match-beginning 0) (match-end 0)))) - (forward-line 1)) (t ;; CVS has decided to merge someone elses changes into this @@ -708,79 +1020,149 @@ in the repository$") (let ((complex-start (point)) initial-revision filename) - (cvs-skip-line "^RCS file: .*$" "Parse error.") + (cvs-skip-line stdout-buffer stderr-buffer "^RCS file: .*$") (setq initial-revision - (cvs-skip-line "^retrieving revision \\(.*\\)$" - "Unexpected output from cvs." 1)) - (cvs-skip-line "^retrieving revision .*$" - "Unexpected output from cvs.") + (cvs-skip-line stdout-buffer stderr-buffer + "^retrieving revision \\(.*\\)$" 1)) + (cvs-skip-line stdout-buffer stderr-buffer + "^retrieving revision .*$") ;; Get the file name from the next line. (setq filename (cvs-skip-line + stdout-buffer stderr-buffer "^Merging differences between [0-9.]+ and [0-9.]+ into \\(.*\\)$" - "Unexpected output from cvs." 1)) (cond + ;; Was it a conflict? + ((looking-at + ;; Allow both RCS 5.5 and 5.6. (5.6 prints "rcs" and " warning"). + "^\\(rcs\\)?merge\\( warning\\)?: overlaps during merge$") - ;; The file was successfully merged. + ;; Yes, this is a conflict. + (cvs-skip-line + stdout-buffer stderr-buffer + "^\\(rcs\\)?merge\\( warning\\)?: overlaps during merge$") + + (cvs-skip-line stdout-buffer stderr-buffer + "^cvs update: conflicts found in ") - ((looking-at "^M ") - (forward-line 1) (let ((fileinfo (cvs-create-fileinfo - 'MERGED current-dir + 'CONFLICT current-dir filename (buffer-substring complex-start (point))))) - (cvs-set-fileinfo->backup-file - fileinfo - (concat cvs-bakprefix filename "." initial-revision)) - (cookie-enter-last - buf fileinfo))) - ;; A conflicting merge. + (cvs-set-fileinfo->base-revision fileinfo initial-revision) + + (setcdr head (list fileinfo)) + (setq head (cdr head)))) + + ;; Was it a conflict, and was RCS compiled without DIFF3_BIN? + + ((looking-at + ;; Allow both RCS 5.5 and 5.6. (5.6 prints "rcs" and " warning"). + "^\\(rcs\\)?merge\\( warning\\)?: overlaps or other probl\ +ems during merge$") + + ;; Yes, this is a conflict. + (cvs-skip-line + stdout-buffer stderr-buffer + "^\\(rcs\\)?merge\\( warning\\)?: overlaps .*during merge$") + + (cvs-skip-line stdout-buffer stderr-buffer + "^cvs update: could not merge ") + (cvs-skip-line stdout-buffer stderr-buffer + "^cvs update: restoring .* from backup file ") - (t - (cvs-skip-line "^merge: overlaps during merge$" - "Unexpected output from cvs.") - (cvs-skip-line "^cvs update: conflicts found in " - "Unexpected output from cvs.") - (cvs-skip-line "^C " "Unexpected cvs output.") (let ((fileinfo (cvs-create-fileinfo 'CONFLICT current-dir filename (buffer-substring complex-start (point))))) - (cvs-set-fileinfo->backup-file - fileinfo - (concat cvs-bakprefix filename "." initial-revision)) + (setcdr head (list fileinfo)) + (setq head (cdr head)))) + + (t + ;; Not a conflict; it must be a succesful merge. + (let ((fileinfo + (cvs-create-fileinfo + 'MERGED current-dir + filename + (buffer-substring complex-start (point))))) + (cvs-set-fileinfo->base-revision fileinfo initial-revision) + (setcdr head (list fileinfo)) + (setq head (cdr head))))))))))) + head) - (cookie-enter-last buf fileinfo)))))))) - ;; All parsing is done. +(defun cvs-parse-stdout (stdout-buffer stderr-buffer head root-dir) + "Parse the output from CVS that is written to stderr. +Args: STDOUT-BUFFER STDERR-BUFFER HEAD ROOT-DIR +STDOUT-BUFFER is the buffer that holds the output to parse. +STDERR-BUFFER holds the output that cvs sent to stderr. It is only +used to create a bug report in case there is a parse error. - ;; If the last entry is a directory, remove it. - (if (eq (cvs-fileinfo->type (cookie-last buf)) - 'DIRCHANGE) - (cookie-delete-last buf)) +HEAD is a cons-cell, the head of the list that is built. +ROOT-DIR is the directory the `cvs update' was run in. - (set-buffer buf) - (cvs-mode) - (setq cookie-last-tin (cookie-nth buf 0)) +This function doesn't return anything particular." + (save-window-excursion + (set-buffer stdout-buffer) (goto-char (point-min)) - (cookie-previous-cookie buf (point-min) 1) - (setq default-directory root-dir) - (if (get-buffer-window parse-buf) - (set-window-buffer (get-buffer-window parse-buf) buf) - (display-buffer buf)))) + (while (< (point) (point-max)) + (cond + ;; M: The file is modified by the user, and untouched in the repository. + ;; A: The file is "cvs add"ed, but not "cvs ci"ed. + ;; R: The file is "cvs remove"ed, but not "cvs ci"ed. + ;; C: Conflict + ;; U: The file is copied from the repository. + ;; ?: Unknown file. + + + ((looking-at "\\([MARCU?]\\) \\(.*\\)$") + (let* + ((c (char-after (match-beginning 1))) + (full-path + (concat (file-name-as-directory root-dir) + (buffer-substring (match-beginning 2) (match-end 2)))) + (fileinfo (cvs-create-fileinfo + (cond ((eq c ?M) 'MODIFIED) + ((eq c ?A) 'ADDED) + ((eq c ?R) 'REMOVED) + ((eq c ?C) 'CONFLICT) + ((eq c ?U) 'UPDATED) + ((eq c ??) 'UNKNOWN)) + (substring (file-name-directory full-path) 0 -1) + (file-name-nondirectory full-path) + (buffer-substring (match-beginning 0) (match-end 0))))) + ;; Updated files require no further action. + (if (eq c ?U) + (cvs-set-fileinfo->handled fileinfo t)) + + ;; Link this last on the list. + (setcdr head (list fileinfo)) + (setq head (cdr head)) + (forward-line 1))) + + ;; Executing a program because of the -u option in modules. + ((looking-at "cvs update: Executing") + ;; Skip by any output the program may generate to stdout. + ;; Note that pcl-cvs will get seriously confused if the + ;; program prints anything to stderr. + (re-search-forward cvs-update-prog-output-skip-regexp) + (forward-line 1)) + + (t (cvs-parse-error stdout-buffer stderr-buffer 'STDOUT (point))))))) (defun cvs-pp (fileinfo) - "Pretty print FILEINFO into a string." + "Pretty print FILEINFO. Insert a printed representation in current buffer. +For use by the cookie package." (let ((a (cvs-fileinfo->type fileinfo)) (s (if (cvs-fileinfo->marked fileinfo) @@ -788,36 +1170,41 @@ in the repository$") (f (cvs-fileinfo->file-name fileinfo)) (ci (if (cvs-fileinfo->handled fileinfo) " " "ci"))) - (cond - ((eq a 'UPDATED) - (format "%s Updated %s" s f)) - ((eq a 'MODIFIED) - (format "%s Modified %s %s" s ci f)) - ((eq a 'MERGED) - (format "%s Merged %s %s" s ci f)) - ((eq a 'CONFLICT) - (format "%s Conflict %s" s f)) - ((eq a 'ADDED) - (format "%s Added %s %s" s ci f)) - ((eq a 'REMOVED) - (format "%s Removed %s %s" s ci f)) - ((eq a 'UNKNOWN) - (format "%s Unknown %s" s f)) - ((eq a 'CVS-REMOVED) - (format "%s Removed from repository: %s" s f)) - ((eq a 'REM-CONFLICT) - (format "%s Conflict: Removed from repository, changed by you: %s" s f)) - ((eq a 'MOD-CONFLICT) - (format "%s Conflict: Removed by you, changed in repository: %s" s f)) - ((eq a 'DIRCHANGE) - (format "\nIn directory %s:" - (cvs-fileinfo->dir fileinfo))) - ((eq a 'MOVE-AWAY) - (format "%s Move away %s - it is in the way" s f)) - ((eq a 'REPOS-MISSING) - (format " This repository is missing! Remove this dir manually.")) - (t - (format "%s Internal error! %s" s f))))) + (insert + (cond + ((eq a 'UPDATED) + (format "%s Updated %s" s f)) + ((eq a 'MODIFIED) + (format "%s Modified %s %s" s ci f)) + ((eq a 'MERGED) + (format "%s Merged %s %s" s ci f)) + ((eq a 'CONFLICT) + (format "%s Conflict %s" s f)) + ((eq a 'ADDED) + (format "%s Added %s %s" s ci f)) + ((eq a 'REMOVED) + (format "%s Removed %s %s" s ci f)) + ((eq a 'UNKNOWN) + (format "%s Unknown %s" s f)) + ((eq a 'CVS-REMOVED) + (format "%s Removed from repository: %s" s f)) + ((eq a 'REM-CONFLICT) + (format "%s Conflict: Removed from repository, changed by you: %s" s f)) + ((eq a 'MOD-CONFLICT) + (format "%s Conflict: Removed by you, changed in repository: %s" s f)) + ((eq a 'REM-EXIST) + (format "%s Conflict: Removed by you, but still exists: %s" s f)) + ((eq a 'DIRCHANGE) + (format "\nIn directory %s:" + (cvs-fileinfo->dir fileinfo))) + ((eq a 'MOVE-AWAY) + (format "%s Move away %s - it is in the way" s f)) + ((eq a 'REPOS-MISSING) + (format " This repository is missing! Remove this dir manually.")) + ((eq a 'MESSAGE) + (cvs-fileinfo->full-log fileinfo)) + (t + (format "%s Internal error! %s" s f)))))) ;;; You can define your own keymap in .emacs. pcl-cvs.el won't overwrite it. @@ -826,56 +1213,61 @@ in the repository$") nil (setq cvs-mode-map (make-keymap)) (suppress-keymap cvs-mode-map) - (define-key cvs-mode-map " " 'cookie-next-cookie) + (define-key cvs-mode-map " " 'cvs-mode-next-line) (define-key cvs-mode-map "?" 'describe-mode) - (define-key cvs-mode-map "A" 'cvs-add-change-log-entry-other-window) - (define-key cvs-mode-map "M" 'cvs-mark-all-files) - (define-key cvs-mode-map "U" 'cvs-unmark-all-files) - (define-key cvs-mode-map "\C-?" 'cvs-unmark-up) - (define-key cvs-mode-map "\C-n" 'cookie-next-cookie) - (define-key cvs-mode-map "\C-p" 'cookie-previous-cookie) - (define-key cvs-mode-map "a" 'cvs-add) - (define-key cvs-mode-map "b" 'cvs-diff-backup) - (define-key cvs-mode-map "c" 'cvs-commit) - (define-key cvs-mode-map "d" 'cvs-diff-cvs) - (define-key cvs-mode-map "f" 'cvs-find-file) - (define-key cvs-mode-map "g" 'cvs-update-no-prompt) - (define-key cvs-mode-map "i" 'cvs-ignore) - (define-key cvs-mode-map "l" 'cvs-log) - (define-key cvs-mode-map "m" 'cvs-mark) - (define-key cvs-mode-map "n" 'cookie-next-cookie) - (define-key cvs-mode-map "o" 'cvs-find-file-other-window) - (define-key cvs-mode-map "p" 'cookie-previous-cookie) - (define-key cvs-mode-map "r" 'cvs-remove-file) - (define-key cvs-mode-map "s" 'cvs-status) - (define-key cvs-mode-map "\C-k" 'cvs-acknowledge) - (define-key cvs-mode-map "x" 'cvs-remove-handled) - (define-key cvs-mode-map "u" 'cvs-unmark)) - - -(defun cvs-get-marked () + (define-key cvs-mode-map "A" 'cvs-mode-add-change-log-entry-other-window) + (define-key cvs-mode-map "M" 'cvs-mode-mark-all-files) + (define-key cvs-mode-map "R" 'cvs-mode-revert-updated-buffers) + (define-key cvs-mode-map "U" 'cvs-mode-undo-local-changes) + (define-key cvs-mode-map "\C-?" 'cvs-mode-unmark-up) + (define-key cvs-mode-map "\C-k" 'cvs-mode-acknowledge) + (define-key cvs-mode-map "\C-n" 'cvs-mode-next-line) + (define-key cvs-mode-map "\C-p" 'cvs-mode-previous-line) + (define-key cvs-mode-map "\M-\C-?" 'cvs-mode-unmark-all-files) + (define-key cvs-mode-map "a" 'cvs-mode-add) + (define-key cvs-mode-map "b" 'cvs-mode-diff-backup) + (define-key cvs-mode-map "c" 'cvs-mode-commit) + (define-key cvs-mode-map "d" 'cvs-mode-diff-cvs) + (define-key cvs-mode-map "e" 'cvs-mode-emerge) + (define-key cvs-mode-map "f" 'cvs-mode-find-file) + (define-key cvs-mode-map "g" 'cvs-mode-update-no-prompt) + (define-key cvs-mode-map "i" 'cvs-mode-ignore) + (define-key cvs-mode-map "l" 'cvs-mode-log) + (define-key cvs-mode-map "m" 'cvs-mode-mark) + (define-key cvs-mode-map "n" 'cvs-mode-next-line) + (define-key cvs-mode-map "o" 'cvs-mode-find-file-other-window) + (define-key cvs-mode-map "p" 'cvs-mode-previous-line) + (define-key cvs-mode-map "q" 'bury-buffer) + (define-key cvs-mode-map "r" 'cvs-mode-remove-file) + (define-key cvs-mode-map "s" 'cvs-mode-status) + (define-key cvs-mode-map "x" 'cvs-mode-remove-handled) + (define-key cvs-mode-map "u" 'cvs-mode-unmark)) + + +(defun cvs-get-marked (&optional ignore-marks) "Return a list of all selected tins. -If there are any marked tins, return them. +If there are any marked tins, and IGNORE-MARKS is nil, return them. Otherwise, if the cursor selects a directory, return all files in it. Otherwise return (a list containing) the file the cursor points to, or -an empty list if it doesn't point to a file at all." +an empty list if it doesn't point to a file at all. + +Args: &optional IGNORE-MARKS." (cond ;; Any marked cookies? - ((cookie-collect-tins (current-buffer) - 'cvs-fileinfo->marked)) + ((and (not ignore-marks) + (collection-collect-tin cvs-cookie-handle 'cvs-fileinfo->marked))) ;; Nope. (t - (let ((sel (cookie-get-selection - (current-buffer) (point) cookie-last-tin))) + (let ((sel (tin-locate cvs-cookie-handle (point)))) (cond ;; If a directory is selected, all it members are returned. ((and sel (eq (cvs-fileinfo->type - (cookie-cookie (current-buffer) sel)) + (tin-cookie cvs-cookie-handle sel)) 'DIRCHANGE)) - (cookie-collect-tins - (current-buffer) 'cvs-dir-member-p - (cvs-fileinfo->dir (cookie-cookie (current-buffer) sel)))) + (collection-collect-tin + cvs-cookie-handle 'cvs-dir-member-p + (cvs-fileinfo->dir (tin-cookie cvs-cookie-handle sel)))) (t (list sel))))))) @@ -885,30 +1277,66 @@ an empty list if it doesn't point to a file at all." (and (not (eq (cvs-fileinfo->type fileinfo) 'DIRCHANGE)) (string= (cvs-fileinfo->dir fileinfo) dir))) -(defun cvs-dir-empty-p (cvs-buf tin) +(defun cvs-dir-empty-p (tin) "Return non-nil if TIN is a directory that is empty. Args: CVS-BUF TIN." - (and (eq (cvs-fileinfo->type (cookie-cookie cvs-buf tin)) 'DIRCHANGE) - (or (not (cookie-next cvs-buf tin)) - (eq (cvs-fileinfo->type (cookie-cookie cvs-buf - (cookie-next cvs-buf tin))) + (and (eq (cvs-fileinfo->type (tin-cookie cvs-cookie-handle tin)) 'DIRCHANGE) + (or (not (tin-next cvs-cookie-handle tin)) + (eq (cvs-fileinfo->type + (tin-cookie cvs-cookie-handle + (tin-next cvs-cookie-handle tin))) 'DIRCHANGE)))) -(defun cvs-remove-handled () +(defun cvs-mode-revert-updated-buffers () + "Revert any buffers that are UPDATED, MERGED or CONFLICT." + (interactive) + (cookie-map (function cvs-revert-fileinfo) cvs-cookie-handle)) + +(defun cvs-revert-fileinfo (fileinfo) + "Revert the buffer that holds the file in FILEINFO if it has changed, +and if the type is UPDATED, MERGED or CONFLICT." + (let* ((type (cvs-fileinfo->type fileinfo)) + (file (cvs-fileinfo->full-path fileinfo)) + (buffer (get-file-buffer file))) + ;; For a revert to happen... + (cond + ((and + ;; ...the type must be one that justifies a revert... + (or (eq type 'UPDATED) + (eq type 'MERGED) + (eq type 'CONFLICT)) + ;; ...and the user must be editing the file... + buffer) + (save-excursion + (set-buffer buffer) + (cond + ((buffer-modified-p) + (error "%s: edited since last cvs-update." + (buffer-file-name))) + ;; Go ahead and revert the file. + (t (revert-buffer 'dont-use-auto-save-file 'dont-ask)))))))) + + +(defun cvs-mode-remove-handled () "Remove all lines that are handled. Empty directories are removed." (interactive) ;; Pass one: remove files that are handled. - (cookie-filter (current-buffer) + (collection-filter-cookies cvs-cookie-handle (function (lambda (fileinfo) (not (cvs-fileinfo->handled fileinfo))))) ;; Pass two: remove empty directories. - (cookie-filter-tins (current-buffer) - (function - (lambda (tin) - (not (cvs-dir-empty-p (current-buffer) tin)))))) + (cvs-remove-empty-directories)) + -(defun cvs-mark (pos) +(defun cvs-remove-empty-directories () + "Remove empty directories in the *cvs* buffer." + (collection-filter-tins cvs-cookie-handle + (function + (lambda (tin) + (not (cvs-dir-empty-p tin)))))) + +(defun cvs-mode-mark (pos) "Mark a fileinfo. Args: POS. If the fileinfo is a directory, all the contents of that directory are marked instead. A directory can never be marked. @@ -916,9 +1344,8 @@ POS is a buffer position." (interactive "d") - (let* ((tin (cookie-get-selection - (current-buffer) pos cookie-last-tin)) - (sel (cookie-cookie (current-buffer) tin))) + (let* ((tin (tin-locate cvs-cookie-handle pos)) + (sel (tin-cookie cvs-cookie-handle tin))) (cond ;; Does POS point to a directory? If so, mark all files in that directory. @@ -929,20 +1356,20 @@ POS is a buffer position." ((cvs-dir-member-p f dir) (cvs-set-fileinfo->marked f t) t)))) ;Tell cookie to redisplay this cookie. - (current-buffer) + cvs-cookie-handle (cvs-fileinfo->dir sel))) (t (cvs-set-fileinfo->marked sel t) - (cookie-invalidate-tins (current-buffer) tin) - (cookie-next-cookie (current-buffer) pos 1))))) + (tin-invalidate cvs-cookie-handle tin) + (tin-goto-next cvs-cookie-handle pos 1))))) -(defun cvs-committable (tin cvs-buf) +(defun cvs-committable (tin) "Check if the TIN is committable. It is committable if it a) is not handled and b) is either MODIFIED, ADDED, REMOVED, MERGED or CONFLICT." - (let* ((fileinfo (cookie-cookie cvs-buf tin)) + (let* ((fileinfo (tin-cookie cvs-cookie-handle tin)) (type (cvs-fileinfo->type fileinfo))) (and (not (cvs-fileinfo->handled fileinfo)) (or (eq type 'MODIFIED) @@ -951,7 +1378,7 @@ It is committable if it (eq type 'MERGED) (eq type 'CONFLICT))))) -(defun cvs-commit () +(defun cvs-mode-commit () "Check in all marked files, or the current file. The user will be asked for a log message in a buffer. @@ -963,8 +1390,7 @@ buffer so that it is easy to kill the contents of the buffer with \\[kill-region (let* ((cvs-buf (current-buffer)) (marked (cvs-filter (function cvs-committable) - (cvs-get-marked) - cvs-buf))) + (cvs-get-marked)))) (if (null marked) (error "Nothing to commit!") (pop-to-buffer (get-buffer-create cvs-commit-prompt-buffer)) @@ -976,35 +1402,68 @@ buffer so that it is easy to kill the contents of the buffer with \\[kill-region (cvs-edit-mode) (make-local-variable 'cvs-commit-list) (setq cvs-commit-list marked) - (make-local-variable 'cvs-cvs-buffer) - (setq cvs-cvs-buffer cvs-buf) (message "Press C-c C-c when you are done editing.")))) (defun cvs-edit-done () "Commit the files to the repository." (interactive) + (if (null cvs-commit-list) + (error "You have already commited the files")) + (if (and (> (point-max) 1) + (/= (char-after (1- (point-max))) ?\n) + (or (eq cvs-commit-buffer-require-final-newline t) + (and cvs-commit-buffer-require-final-newline + (yes-or-no-p + (format "Buffer %s does not end in newline. Add one? " + (buffer-name)))))) + (save-excursion + (goto-char (point-max)) + (insert ?\n))) (save-some-buffers) (let ((cc-list cvs-commit-list) - (cc-buffer cvs-cvs-buffer) + (cc-buffer (get-buffer cvs-buffer-name)) (msg-buffer (current-buffer)) (msg (buffer-substring (point-min) (point-max)))) (pop-to-buffer cc-buffer) (bury-buffer msg-buffer) (cvs-use-temp-buffer) (message "Committing...") - (cvs-execute-list cc-list cvs-program (list "commit" "-m" msg)) - (mapcar (function - (lambda (tin) - (cvs-set-fileinfo->handled (cookie-cookie cc-buffer tin) t))) - cc-list) - (apply 'cookie-invalidate-tins cc-buffer cc-list) + (if (cvs-execute-list cc-list cvs-program + (if cvs-cvsroot + (list "-d" cvs-cvsroot "commit" "-m" msg) + (list "commit" "-m" msg))) + (error "Something went wrong. Check the %s buffer carefully." + cvs-temp-buffer-name)) + (let ((ccl cc-list)) + (while ccl + (cvs-after-commit-function (tin-cookie cvs-cookie-handle (car ccl))) + (setq ccl (cdr ccl)))) + (apply 'tin-invalidate cvs-cookie-handle cc-list) + (set-buffer msg-buffer) + (setq cvs-commit-list nil) (set-buffer cc-buffer) (if cvs-auto-remove-handled - (cvs-remove-handled))) + (cvs-mode-remove-handled))) (message "Committing... Done.")) +(defun cvs-after-commit-function (fileinfo) + "Do everything that needs to be done when FILEINFO has been commited. +The fileinfo->handle is set, and if the buffer is present it is reverted." + (cvs-set-fileinfo->handled fileinfo t) + (if cvs-auto-revert-after-commit + (let* ((file (cvs-fileinfo->full-path fileinfo)) + (buffer (get-file-buffer file))) + ;; For a revert to happen... + (if buffer + ;; ...the user must be editing the file... + (save-excursion + (set-buffer buffer) + (if (not (buffer-modified-p)) + ;; ...but it must be unmodified. + (revert-buffer 'dont-use-auto-save-file 'dont-ask))))))) + (defun cvs-execute-list (tin-list program constant-args) "Run PROGRAM on all elements on TIN-LIST. @@ -1015,11 +1474,19 @@ arguments given to the program will be CONSTANT-ARGS followed by all the files (from TIN-LIST) that resides in that directory. If the files in TIN-LIST resides in different directories the PROGRAM will be run once for each directory (if all files in the same directory appears -after each other." - +after each other). + +Any output from PROGRAM will be inserted in the current buffer. + +This function return nil if all went well, or the numerical exit +status or a signal name as a string. Note that PROGRAM might be called +several times. This will return non-nil if something goes wrong, but +there is no way to know which process that failed." + + (let ((exitstatus nil)) (while tin-list (let ((current-dir (cvs-fileinfo->dir - (cookie-cookie cvs-buffer-name + (tin-cookie cvs-cookie-handle (car tin-list)))) arg-list arg-str) @@ -1029,10 +1496,10 @@ after each other." (string= current-dir (cvs-fileinfo->dir - (cookie-cookie cvs-buffer-name (car tin-list))))) + (tin-cookie cvs-cookie-handle (car tin-list))))) (setq arg-list (cons (cvs-fileinfo->file-name - (cookie-cookie cvs-buffer-name (car tin-list))) + (tin-cookie cvs-cookie-handle (car tin-list))) arg-list)) (setq tin-list (cdr tin-list))) @@ -1048,9 +1515,15 @@ after each other." (nconc (copy-sequence constant-args) arg-list) " "))) - (apply 'call-process program nil t t - (nconc (copy-sequence constant-args) arg-list)) - (goto-char (point-max))))) + (let ((res (apply 'call-process program nil t t + (nconc (copy-sequence constant-args) arg-list)))) + ;; Remember the first, or highest, exitstatus. + (if (and (not (and (integerp res) (zerop res))) + (or (null exitstatus) + (and (integerp exitstatus) (= 1 exitstatus)))) + (setq exitstatus res))) + (goto-char (point-max)))) + exitstatus)) (defun cvs-execute-single-file-list (tin-list extractor program constant-args) @@ -1070,11 +1543,11 @@ this file, or a list of arguments to send to the program." (while tin-list (let ((default-directory (file-name-as-directory (cvs-fileinfo->dir - (cookie-cookie cvs-buffer-name - (car tin-list))))) + (tin-cookie cvs-cookie-handle + (car tin-list))))) (arg-list (funcall extractor - (cookie-cookie cvs-buffer-name (car tin-list))))) + (tin-cookie cvs-cookie-handle (car tin-list))))) ;; Execute the command unless extractor returned t. @@ -1113,36 +1586,87 @@ This mode is based on fundamental mode." (define-key cvs-edit-mode-map "\C-c\C-c" 'cvs-edit-done)) -(defun cvs-diff-cvs () +(defun cvs-diffable (tins) + "Return a list of all tins on TINS that it makes sense to run +``cvs diff'' on." + ;; +++ There is an unnecessary (nreverse) here. Get the list the + ;; other way around instead! + (let ((result nil)) + (while tins + (let ((type (cvs-fileinfo->type + (tin-cookie cvs-cookie-handle (car tins))))) + (if (or (eq type 'MODIFIED) + (eq type 'UPDATED) + (eq type 'MERGED) + (eq type 'CONFLICT) + (eq type 'REMOVED) ;+++Does this line make sense? + (eq type 'ADDED)) ;+++Does this line make sense? + (setq result (cons (car tins) result))) + (setq tins (cdr tins)))) + (nreverse result))) + + +(defun cvs-mode-diff-cvs (&optional ignore-marks) "Diff the selected files against the repository. -The flags the variable cvs-cvs-diff-flags will be passed to ``cvs diff''." - (interactive) +The flags in the variable cvs-diff-flags (which should be a list +of strings) will be passed to ``cvs diff''. If the variable +cvs-diff-ignore-marks is non-nil any marked files will not be +considered to be selected. An optional prefix argument will invert +the influence from cvs-diff-ignore-marks." + + (interactive "P") + + (if (not (listp cvs-diff-flags)) + (error "cvs-diff-flags should be a list of strings")) (save-some-buffers) - (let ((marked (cvs-get-marked))) + (let ((marked (cvs-diffable + (cvs-get-marked + (or (and ignore-marks (not cvs-diff-ignore-marks)) + (and (not ignore-marks) cvs-diff-ignore-marks)))))) (cvs-use-temp-buffer) (message "cvsdiffing...") - (cvs-execute-list marked cvs-program (cons "diff" cvs-cvs-diff-flags))) - (message "cvsdiffing... Done.")) - - -(defun cvs-backup-diffable (tin cvs-buf) + ;; Don't care much about the exit status since it is the _sum_ of + ;; the status codes from the different files (not the _max_ as it + ;; should be). + (if (cvs-execute-list marked cvs-program + (if cvs-cvsroot + (cons "-d" (cons cvs-cvsroot + (cons "diff" cvs-diff-flags))) + (cons "diff" cvs-diff-flags))) + (message "cvsdiffing... Done.") + (message "cvsdiffing... No differences found.")))) + + +(defun cvs-backup-diffable (tin) "Check if the TIN is backup-diffable. It must have a backup file to be diffable." - (cvs-fileinfo->backup-file (cookie-cookie cvs-buf tin))) + (file-readable-p + (cvs-fileinfo->backup-file (tin-cookie cvs-cookie-handle tin)))) -(defun cvs-diff-backup () +(defun cvs-mode-diff-backup (&optional ignore-marks) "Diff the files against the backup file. This command can be used on files that are marked with \"Merged\" or \"Conflict\" in the *cvs* buffer. +If the variable cvs-diff-ignore-marks is non-nil any marked files will +not be considered to be selected. An optional prefix argument will +invert the influence from cvs-diff-ignore-marks. + The flags in cvs-diff-flags will be passed to ``diff''." - (interactive) + (interactive "P") + + (if (not (listp cvs-diff-flags)) + (error "cvs-diff-flags should be a list of strings.")) + (save-some-buffers) - (let ((marked (cvs-filter (function cvs-backup-diffable) - (cvs-get-marked) - (current-buffer)))) + (let ((marked (cvs-filter + (function cvs-backup-diffable) + (cvs-get-marked + (or + (and ignore-marks (not cvs-diff-ignore-marks)) + (and (not ignore-marks) cvs-diff-ignore-marks)))))) (if (null marked) (error "No ``Conflict'' or ``Merged'' file selected!")) (cvs-use-temp-buffer) @@ -1155,72 +1679,76 @@ The flags in cvs-diff-flags will be passed to ``diff''." (defun cvs-diff-backup-extractor (fileinfo) "Return the filename and the name of the backup file as a list. Signal an error if there is no backup file." - (if (null (cvs-fileinfo->backup-file fileinfo)) + (if (not (file-readable-p (cvs-fileinfo->backup-file fileinfo))) (error "%s has no backup file." (concat (file-name-as-directory (cvs-fileinfo->dir fileinfo)) (cvs-fileinfo->file-name fileinfo)))) - (list (cvs-fileinfo->file-name fileinfo) - (cvs-fileinfo->backup-file fileinfo))) + (list (cvs-fileinfo->backup-file fileinfo) + (cvs-fileinfo->file-name fileinfo))) -(defun cvs-find-file-other-window (pos) +(defun cvs-mode-find-file-other-window (pos) "Select a buffer containing the file in another window. Args: POS" (interactive "d") - (save-some-buffers) - (let* ((cookie-last-tin - (cookie-get-selection (current-buffer) pos cookie-last-tin)) - (type (cvs-fileinfo->type (cookie-cookie (current-buffer) - cookie-last-tin)))) - (cond - ((or (eq type 'REMOVED) - (eq type 'CVS-REMOVED)) - (error "Can't visit a removed file.")) - ((eq type 'DIRCHANGE) - (let ((obuf (current-buffer)) - (odir default-directory)) - (setq default-directory - (file-name-as-directory - (cvs-fileinfo->dir - (cookie-cookie (current-buffer) cookie-last-tin)))) - (dired-other-window default-directory) - (set-buffer obuf) - (setq default-directory odir))) - (t - (find-file-other-window (cvs-full-path (current-buffer) - cookie-last-tin)))))) + (let ((tin (tin-locate cvs-cookie-handle pos))) + (if tin + (let ((type (cvs-fileinfo->type (tin-cookie cvs-cookie-handle + tin)))) + (cond + ((or (eq type 'REMOVED) + (eq type 'CVS-REMOVED)) + (error "Can't visit a removed file.")) + ((eq type 'DIRCHANGE) + (let ((obuf (current-buffer)) + (odir default-directory)) + (setq default-directory + (file-name-as-directory + (cvs-fileinfo->dir + (tin-cookie cvs-cookie-handle tin)))) + (dired-other-window default-directory) + (set-buffer obuf) + (setq default-directory odir))) + (t + (find-file-other-window (cvs-full-path tin))))) + (error "There is no file to find.")))) -(defun cvs-full-path (buffer tin) - "Return the full path for the file that is described in TIN. -Args: BUFFER TIN." +(defun cvs-fileinfo->full-path (fileinfo) + "Return the full path for the file that is described in FILEINFO." (concat (file-name-as-directory - (cvs-fileinfo->dir (cookie-cookie buffer tin))) - (cvs-fileinfo->file-name (cookie-cookie buffer tin)))) + (cvs-fileinfo->dir fileinfo)) + (cvs-fileinfo->file-name fileinfo))) -(defun cvs-find-file (pos) +(defun cvs-full-path (tin) + "Return the full path for the file that is described in TIN." + (cvs-fileinfo->full-path (tin-cookie cvs-cookie-handle tin))) + +(defun cvs-mode-find-file (pos) "Select a buffer containing the file in another window. Args: POS" (interactive "d") (let* ((cvs-buf (current-buffer)) - (cookie-last-tin (cookie-get-selection cvs-buf pos cookie-last-tin)) - (fileinfo (cookie-cookie cvs-buf cookie-last-tin)) - (type (cvs-fileinfo->type fileinfo))) - (cond - ((or (eq type 'REMOVED) - (eq type 'CVS-REMOVED)) - (error "Can't visit a removed file.")) - ((eq type 'DIRCHANGE) - (let ((odir default-directory)) - (setq default-directory - (file-name-as-directory (cvs-fileinfo->dir fileinfo))) - (dired default-directory) - (set-buffer cvs-buf) - (setq default-directory odir))) - (t - (find-file (cvs-full-path cvs-buf cookie-last-tin)))))) + (tin (tin-locate cvs-cookie-handle pos))) + (if tin + (let* ((fileinfo (tin-cookie cvs-cookie-handle tin)) + (type (cvs-fileinfo->type fileinfo))) + (cond + ((or (eq type 'REMOVED) + (eq type 'CVS-REMOVED)) + (error "Can't visit a removed file.")) + ((eq type 'DIRCHANGE) + (let ((odir default-directory)) + (setq default-directory + (file-name-as-directory (cvs-fileinfo->dir fileinfo))) + (dired default-directory) + (set-buffer cvs-buf) + (setq default-directory odir))) + (t + (find-file (cvs-full-path tin))))) + (error "There is no file to find.")))) -(defun cvs-mark-all-files () +(defun cvs-mode-mark-all-files () "Mark all files. Directories are not marked." (interactive) @@ -1229,16 +1757,15 @@ Directories are not marked." ((not (eq (cvs-fileinfo->type cookie) 'DIRCHANGE)) (cvs-set-fileinfo->marked cookie t) t)))) - (current-buffer))) + cvs-cookie-handle)) -(defun cvs-unmark (pos) +(defun cvs-mode-unmark (pos) "Unmark a fileinfo. Args: POS." (interactive "d") - (let* ((tin (cookie-get-selection - (current-buffer) pos cookie-last-tin)) - (sel (cookie-cookie (current-buffer) tin))) + (let* ((tin (tin-locate cvs-cookie-handle pos)) + (sel (tin-cookie cvs-cookie-handle tin))) (cond ((eq (cvs-fileinfo->type sel) 'DIRCHANGE) @@ -1248,14 +1775,14 @@ Directories are not marked." ((cvs-dir-member-p f dir) (cvs-set-fileinfo->marked f nil) t)))) - (current-buffer) + cvs-cookie-handle (cvs-fileinfo->dir sel))) (t (cvs-set-fileinfo->marked sel nil) - (cookie-invalidate-tins (current-buffer) tin) - (cookie-next-cookie (current-buffer) pos 1))))) + (tin-invalidate cvs-cookie-handle tin) + (tin-goto-next cvs-cookie-handle pos 1))))) -(defun cvs-unmark-all-files () +(defun cvs-mode-unmark-all-files () "Unmark all files. Directories are also unmarked, but that doesn't matter, since they should always be unmarked." @@ -1263,13 +1790,13 @@ they should always be unmarked." (cookie-map (function (lambda (cookie) (cvs-set-fileinfo->marked cookie nil) t)) - (current-buffer))) + cvs-cookie-handle)) -(defun cvs-do-removal (cvs-buf tins) +(defun cvs-do-removal (tins) "Remove files. -Args: CVS-BUF TINS. -CVS-BUF is the cvs buffer. TINS is a list of tins that the +Args: TINS. +TINS is a list of tins that the user wants to delete. The files are deleted. If the type of the tin is 'UNKNOWN the tin is removed from the buffer. If it is anything else the file is added to a list that should be @@ -1283,70 +1810,141 @@ Returns a list of tins files that should be `cvs remove'd." (let (files-to-remove) (while tins (let* ((tin (car tins)) - (fileinfo (cookie-cookie cvs-buf tin)) + (fileinfo (tin-cookie cvs-cookie-handle tin)) (type (cvs-fileinfo->type fileinfo))) (if (not (or (eq type 'REMOVED) (eq type 'CVS-REMOVED))) (progn - (delete-file (cvs-full-path cvs-buf tin)) + (delete-file (cvs-full-path tin)) (cond ((or (eq type 'UNKNOWN) (eq type 'MOVE-AWAY)) - (cookie-delete cvs-buf tin)) + (tin-delete cvs-cookie-handle tin)) (t (setq files-to-remove (cons tin files-to-remove)) (cvs-set-fileinfo->type fileinfo 'REMOVED) (cvs-set-fileinfo->handled fileinfo nil) - (cookie-invalidate-tins cvs-buf tin)))))) + (tin-invalidate cvs-cookie-handle tin)))))) (setq tins (cdr tins))) files-to-remove)) (t nil))) -(defun cvs-remove-file () +(defun cvs-mode-remove-file () "Remove all marked files." (interactive) - (let ((files-to-remove (cvs-do-removal (current-buffer) (cvs-get-marked)))) + (let ((files-to-remove (cvs-do-removal (cvs-get-marked)))) (if (null files-to-remove) nil (cvs-use-temp-buffer) (message "removing from repository...") - (cvs-execute-list files-to-remove cvs-program '("remove")) - (message "removing from repository... done.")))) - -(defun cvs-acknowledge () + (if (cvs-execute-list files-to-remove cvs-program + (if cvs-cvsroot + (list "-d" cvs-cvsroot "remove") + '("remove"))) + (error "CVS exited with non-zero exit status.") + (message "removing from repository... done."))))) + +(defun cvs-mode-undo-local-changes () + "Undo local changes to all marked files. +The file is removed and `cvs update FILE' is run." + (interactive) + (let ((tins-to-undo (cvs-get-marked))) + (cvs-use-temp-buffer) + (mapcar 'cvs-insert-full-path tins-to-undo) + (cond + ((and tins-to-undo (yes-or-no-p (format "Undo changes to %d files? " + (length tins-to-undo)))) + (let (files-to-update) + (while tins-to-undo + (let* ((tin (car tins-to-undo)) + (fileinfo (tin-cookie cvs-cookie-handle tin)) + (type (cvs-fileinfo->type fileinfo))) + (cond + ((or + (eq type 'UPDATED) (eq type 'MODIFIED) (eq type 'MERGED) + (eq type 'CONFLICT) (eq type 'CVS-REMOVED) + (eq type 'REM-CONFLICT) (eq type 'MOVE-AWAY) + (eq type 'REMOVED)) + (if (not (eq type 'REMOVED)) + (delete-file (cvs-full-path tin))) + (setq files-to-update (cons tin files-to-update)) + (cvs-set-fileinfo->type fileinfo 'UPDATED) + (cvs-set-fileinfo->handled fileinfo t) + (tin-invalidate cvs-cookie-handle tin)) + + ((eq type 'MOD-CONFLICT) + (error "Use cvs-mode-add instead on %s." + (cvs-fileinfo->file-name fileinfo))) + + ((eq type 'REM-CONFLICT) + (error "Can't deal with a file you have removed and recreated.")) + + ((eq type 'DIRCHANGE) + (error "Undo on directories not supported (yet).")) + + ((eq type 'ADDED) + (error "There is no old revision to get for %s" + (cvs-fileinfo->file-name fileinfo))) + (t (error "cvs-mode-undo-local-changes: can't handle an %s" + type))) + + (setq tins-to-undo (cdr tins-to-undo)))) + (cvs-use-temp-buffer) + (message "Regetting files from repository...") + (if (cvs-execute-list files-to-update cvs-program + (if cvs-cvsroot + (list "-d" cvs-cvsroot "update") + '("update"))) + (error "CVS exited with non-zero exit status.") + (message "Regetting files from repository... done."))))))) + +(defun cvs-mode-acknowledge () "Remove all marked files from the buffer." (interactive) (mapcar (function (lambda (tin) - (cookie-delete (current-buffer) tin))) - (cvs-get-marked)) - (setq cookie-last-tin nil)) + (tin-delete cvs-cookie-handle tin))) + (cvs-get-marked))) -(defun cvs-unmark-up (pos) +(defun cvs-mode-unmark-up (pos) "Unmark the file on the previous line. Takes one argument POS, a buffer position." (interactive "d") - (cookie-previous-cookie (current-buffer) pos 1) - (cvs-set-fileinfo->marked (cookie-cookie (current-buffer) cookie-last-tin) - nil) - (cookie-invalidate-tins (current-buffer) cookie-last-tin)) - -(defun cvs-add-file-update-buffer (cvs-buf tin) - "Subfunction to cvs-add. Internal use only. + (let ((tin (tin-goto-previous cvs-cookie-handle pos 1))) + (cond + (tin + (cvs-set-fileinfo->marked (tin-cookie cvs-cookie-handle tin) + nil) + (tin-invalidate cvs-cookie-handle tin))))) + +(defun cvs-mode-previous-line (arg) + "Go to the previous line. +If a prefix argument is given, move by that many lines." + (interactive "p") + (tin-goto-previous cvs-cookie-handle (point) arg)) + +(defun cvs-mode-next-line (arg) + "Go to the next line. +If a prefix argument is given, move by that many lines." + (interactive "p") + (tin-goto-next cvs-cookie-handle (point) arg)) + +(defun cvs-add-file-update-buffer (tin) + "Subfunction to cvs-mode-add. Internal use only. Update the display. Return non-nil if `cvs add' should be called on this -file. Args: CVS-BUF TIN. +file. Args: TIN. Returns 'ADD or 'RESURRECT." - (let ((fileinfo (cookie-cookie cvs-buf tin))) + (let ((fileinfo (tin-cookie cvs-cookie-handle tin))) (cond ((eq (cvs-fileinfo->type fileinfo) 'UNKNOWN) (cvs-set-fileinfo->type fileinfo 'ADDED) - (cookie-invalidate-tins cvs-buf tin) + (tin-invalidate cvs-cookie-handle tin) 'ADD) ((eq (cvs-fileinfo->type fileinfo) 'REMOVED) (cvs-set-fileinfo->type fileinfo 'UPDATED) (cvs-set-fileinfo->handled fileinfo t) - (cookie-invalidate-tins cvs-buf tin) + (tin-invalidate cvs-cookie-handle tin) 'RESURRECT)))) (defun cvs-add-sub (cvs-buf candidates) @@ -1357,7 +1955,7 @@ The first list is unknown tins that shall be `cvs add -m msg'ed. The second list is removed files that shall be `cvs add'ed (resurrected)." (let (add resurrect) (while candidates - (let ((type (cvs-add-file-update-buffer cvs-buf (car candidates)))) + (let ((type (cvs-add-file-update-buffer (car candidates)))) (cond ((eq type 'ADD) (setq add (cons (car candidates) add))) ((eq type 'RESURRECT) @@ -1365,7 +1963,7 @@ The second list is removed files that shall be `cvs add'ed (resurrected)." (setq candidates (cdr candidates))) (cons add resurrect))) -(defun cvs-add () +(defun cvs-mode-add () "Add marked files to the cvs repository." (interactive) @@ -1380,15 +1978,23 @@ The second list is removed files that shall be `cvs add'ed (resurrected)." (cond (resurrect (message "Resurrecting files from repository...") - (cvs-execute-list resurrect cvs-program '("add")) - (message "Done."))) + (if (cvs-execute-list resurrect cvs-program + (if cvs-cvsroot + (list "-d" cvs-cvsroot "add") + '("add"))) + (error "CVS exited with non-zero exit status.") + (message "Done.")))) (cond (added (message "Adding new files to repository...") - (cvs-execute-list added cvs-program (list "add" "-m" msg)) - (message "Done."))))) - -(defun cvs-ignore () + (if (cvs-execute-list added cvs-program + (if cvs-cvsroot + (list "-d" cvs-cvsroot "add" "-m" msg) + (list "add" "-m" msg))) + (error "CVS exited with non-zero exit status.") + (message "Done.")))))) + +(defun cvs-mode-ignore () "Arrange so that CVS ignores the selected files. This command ignores files that are not flagged as `Unknown'." (interactive) @@ -1396,12 +2002,12 @@ This command ignores files that are not flagged as `Unknown'." (mapcar (function (lambda (tin) (cond ((eq (cvs-fileinfo->type - (cookie-cookie (current-buffer) tin)) 'UNKNOWN) + (tin-cookie cvs-cookie-handle tin)) + 'UNKNOWN) (cvs-append-to-ignore - (cookie-cookie (current-buffer) tin)) - (cookie-delete (current-buffer) tin))))) - (cvs-get-marked)) - (setq cookie-last-tin nil)) + (tin-cookie cvs-cookie-handle tin)) + (tin-delete cvs-cookie-handle tin))))) + (cvs-get-marked))) (defun cvs-append-to-ignore (fileinfo) "Append the file in fileinfo to the .cvsignore file" @@ -1413,9 +2019,11 @@ This command ignores files that are not flagged as `Unknown'." (if (not (zerop (current-column))) (insert "\n")) (insert (cvs-fileinfo->file-name fileinfo) "\n") + (if cvs-sort-ignore-file + (sort-lines nil (point-min) (point-max))) (save-buffer))) -(defun cvs-status () +(defun cvs-mode-status () "Show cvs status for all marked files." (interactive) @@ -1423,26 +2031,45 @@ This command ignores files that are not flagged as `Unknown'." (let ((marked (cvs-get-marked))) (cvs-use-temp-buffer) (message "Running cvs status ...") - (cvs-execute-list marked cvs-program (cons "status" cvs-status-flags))) - (message "Running cvs status ... Done.")) - -(defun cvs-log () + (if (cvs-execute-list + marked cvs-program + (if cvs-cvsroot + (cons "-d" (cons cvs-cvsroot (cons "status" cvs-status-flags))) + (cons "status" cvs-status-flags))) + (error "CVS exited with non-zero exit status.") + (message "Running cvs status ... Done.")))) + +(defun cvs-mode-log () "Display the cvs log of all selected files." (interactive) (let ((marked (cvs-get-marked))) (cvs-use-temp-buffer) (message "Running cvs log ...") - (cvs-execute-list marked cvs-program (cons "log" cvs-log-flags))) - (message "Running cvs log ... Done.")) - + (if (cvs-execute-list marked cvs-program + (if cvs-cvsroot + (cons "-d" (cons cvs-cvsroot + (cons "log" cvs-log-flags))) + (cons "log" cvs-log-flags))) + (error "CVS exited with non-zero exit status.") + (message "Running cvs log ... Done.")))) + +(defun cvs-byte-compile-files () + "Run byte-compile-file on all selected files that end in '.el'." + (interactive) + (let ((marked (cvs-get-marked))) + (while marked + (let ((filename (cvs-full-path (car marked)))) + (if (string-match "\\.el$" filename) + (byte-compile-file filename))) + (setq marked (cdr marked))))) (defun cvs-insert-full-path (tin) - "Insert full path to the file described in TIN." - (insert (format "%s\n" (cvs-full-path cvs-buffer-name tin)))) + "Insert full path to the file described in TIN in the current buffer." + (insert (format "%s\n" (cvs-full-path tin)))) -(defun cvs-add-change-log-entry-other-window (pos) +(defun cvs-mode-add-change-log-entry-other-window (pos) "Add a ChangeLog entry in the ChangeLog of the current directory. Args: POS." (interactive "d") @@ -1451,9 +2078,9 @@ Args: POS." (setq default-directory (file-name-as-directory (cvs-fileinfo->dir - (cookie-cookie - cvs-buf - (cookie-get-selection cvs-buf pos cookie-last-tin))))) + (tin-cookie + cvs-cookie-handle + (tin-locate cvs-cookie-handle pos))))) (if (not default-directory) ;In case there was no entries. (setq default-directory odir)) (add-change-log-entry-other-window) @@ -1463,7 +2090,7 @@ Args: POS." (defun print-cvs-tin (foo) "Debug utility." - (let ((cookie (cookie-cookie (current-buffer) foo)) + (let ((cookie (tin-cookie cvs-cookie-handle foo)) (stream (get-buffer-create "debug"))) (princ "==============\n" stream) (princ (cvs-fileinfo->file-name cookie) stream) @@ -1474,3 +2101,106 @@ Args: POS." (princ "\n" stream) (princ (cvs-fileinfo->marked cookie) stream) (princ "\n" stream))) + +(defun cvs-mode-emerge (pos) + "Emerge appropriate revisions of the selected file. +Args: POS" + (interactive "d") + (let* ((cvs-buf (current-buffer)) + (tin (tin-locate cvs-cookie-handle pos))) + (if tin + (let* ((fileinfo (tin-cookie cvs-cookie-handle tin)) + (type (cvs-fileinfo->type fileinfo))) + (cond + ((eq type 'MODIFIED) + (require 'emerge) + (let ((tmp-file + (cvs-retrieve-revision-to-tmpfile fileinfo))) + (unwind-protect + (if (not (emerge-files + t + (cvs-fileinfo->full-path fileinfo) + tmp-file + (cvs-fileinfo->full-path fileinfo))) + (error "Emerge session failed")) + (delete-file tmp-file)))) + + ((or (eq type 'MERGED) + (eq type 'CONFLICT)) + (require 'emerge) + (let ((tmp-file + (cvs-retrieve-revision-to-tmpfile + fileinfo)) + (ancestor-file + (cvs-retrieve-revision-to-tmpfile + fileinfo + (cvs-fileinfo->base-revision fileinfo)))) + (unwind-protect + (if (not (emerge-files-with-ancestor + t + (cvs-fileinfo->backup-file fileinfo) + tmp-file + ancestor-file + (cvs-fileinfo->full-path fileinfo))) + (error "Emerge session failed")) + (delete-file tmp-file) + (delete-file ancestor-file)))) + (t + (error "Can only emerge \"Modified\", \"Merged\" or \"Conflict\"%s" + " files")))) + (error "There is no file to emerge.")))) + +(defun cvs-retrieve-revision-to-tmpfile (fileinfo &optional revision) + "Retrieve the latest revision of the file in FILEINFO to a temporary file. +If second optional argument REVISION is given, retrieve that revision instead." + (let + ((temp-name (make-temp-name + (concat (file-name-as-directory + (or (getenv "TMPDIR") "/tmp")) + "pcl-cvs." revision)))) + (cvs-kill-buffer-visiting temp-name) + (if revision + (message "Retrieving revision %s..." revision) + (message "Retrieving latest revision...")) + (let ((res (call-process cvs-shell nil nil nil "-c" + (concat cvs-program " update -p " + (if revision + (concat "-r " revision " ") + "") + (cvs-fileinfo->full-path fileinfo) + " > " temp-name)))) + (if (and res (not (and (integerp res) (zerop res)))) + (error "Something went wrong: %s" res)) + + (if revision + (message "Retrieving revision %s... Done." revision) + (message "Retrieving latest revision... Done.")) + (find-file-noselect temp-name) + temp-name))) + +(defun cvs-fileinfo->backup-file (fileinfo) + "Construct the file name of the backup file for FILEINFO." + (if (cvs-fileinfo->base-revision fileinfo) + (concat cvs-bakprefix (cvs-fileinfo->file-name fileinfo) + "." (cvs-fileinfo->base-revision fileinfo)))) + +(defun cvs-kill-buffer-visiting (filename) + "If there is any buffer visiting FILENAME, kill it (without confirmation)." + (let ((l (buffer-list))) + (while l + (if (string= (buffer-file-name (car l)) filename) + (kill-buffer (car l))) + (setq l (cdr l))))) + +(defun cvs-change-cvsroot (newroot) + "Change the cvsroot." + (interactive "DNew repository: ") + (if (or (file-directory-p (expand-file-name "CVSROOT" newroot)) + (y-or-n-p (concat "Warning: no CVSROOT found inside repository." + " Change cvs-cvsroot anyhow?"))) + (setq cvs-cvsroot newroot))) + +(if (string-match "Lucid" emacs-version) + (progn + (autoload 'pcl-cvs-fontify "pcl-cvs-lucid") + (add-hook 'cvs-mode-hook 'pcl-cvs-fontify))) diff --git a/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs.info b/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs.info index 3c0d3c0..060d932 100644 --- a/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs.info +++ b/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs.info @@ -1,4 +1,4 @@ -Info file pcl-cvs, produced by Makeinfo, -*- Text -*- from input +This is Info file pcl-cvs, produced by Makeinfo-1.49 from the input file pcl-cvs.texinfo. Copyright (C) 1992 Per Cederqvist @@ -15,18 +15,18 @@ derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this -manual into another language, under the above conditions for -modified versions, except that the section entitled "GNU General -Public License" and this permission notice may be included in -translations approved by the Free Software Foundation instead of in -the original English. +manual into another language, under the above conditions for modified +versions, except that the section entitled "GNU General Public +License" and this permission notice may be included in translations +approved by the Free Software Foundation instead of in the original +English. File: pcl-cvs, Node: Top, Next: Copying, Prev: (dir), Up: (dir) This info manual describes pcl-cvs which is a GNU Emacs front-end to CVS. It works with CVS version 1.3. This manual is updated to -release 1.02 of pcl-cvs. +release 1.05 of pcl-cvs. * Menu: @@ -40,9 +40,8 @@ release 1.02 of pcl-cvs. * Customization:: How you can tailor pcl-cvs to suit your needs. * Future enhancements:: Future enhancements of pcl-cvs. -* Reporting bugs and ideas:: Where to report bugs. - -* Function and Variable Index:: List of functions and variables. +* Bugs:: Bugs (known and unknown). +* Function and Variable Index:: List of functions and variables. * Concept Index:: List of concepts. * Key Index:: List of keystrokes. @@ -50,7 +49,7 @@ release 1.02 of pcl-cvs. Installation -* Pcl-cvs installation:: How to install pcl-cvs on your system. +* Pcl-cvs installation:: How to install pcl-cvs on your system. * On-line manual installation:: How to install the on-line manual. * Typeset manual installation:: How to create typeset documentation about pcl-cvs. @@ -76,9 +75,13 @@ Commands * Editing files:: Loading files into Emacs. * Getting info about files:: Display the log and status of files. * Adding and removing files:: Adding and removing files +* Undoing changes:: Undoing changes * Removing handled entries:: Uninteresting lines can easily be removed. * Ignoring files:: Telling CVS to ignore generated files. * Viewing differences:: Commands to `diff' different versions. +* Emerge:: +* Reverting your buffers:: Reverting your buffers +* Miscellaneous commands:: Miscellaneous commands File: pcl-cvs, Node: Copying, Next: Installation, Prev: Top, Up: Top @@ -86,7 +89,7 @@ File: pcl-cvs, Node: Copying, Next: Installation, Prev: Top, Up: Top GNU GENERAL PUBLIC LICENSE ************************** - Version 2, June 1991 + Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, MA 02139, USA @@ -99,27 +102,25 @@ Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. -This General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit -to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can -apply it to your programs, too. +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and -charge for this service if you wish), that you receive source code -or can get it if you want it, that you can change the software or -use pieces of it in new free programs; and that you know you can do -these things. +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the -rights. These restrictions translate to certain responsibilities -for you if you distribute copies of the software, or if you modify -it. +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that @@ -127,9 +128,9 @@ you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - We protect your rights with two steps: (1) copyright the -software, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the software. + We protect your rights with two steps: (1) copyright the software, +and (2) offer you this license which gives you legal permission to +copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this @@ -140,20 +141,20 @@ reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making -the program proprietary. To prevent this, we have made it clear -that any patent must be licensed for everyone's free use or not -licensed at all. +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at +all. The precise terms and conditions for copying, distribution and modification follow. - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 1. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be - distributed under the terms of this General Public License. - The "Program", below, refers to any such program or work, and a + distributed under the terms of this General Public License. The + "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or @@ -161,13 +162,13 @@ modification follow. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". - Activities other than copying, distribution and modification - are not covered by this License; they are outside its scope. - The act of running the Program is not restricted, and the - output from the Program is covered only if its contents - constitute a work based on the Program (independent of having - been made by running the Program). Whether that is true - depends on what the Program does. + Activities other than copying, distribution and modification are + not covered by this License; they are outside its scope. The + act of running the Program is not restricted, and the output + from the Program is covered only if its contents constitute a + work based on the Program (independent of having been made by + running the Program). Whether that is true depends on what the + Program does. 2. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you @@ -177,27 +178,26 @@ modification follow. absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. - You may charge a fee for the physical act of transferring a + You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 3. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and - distribute such modifications or work under the terms of - Section 1 above, provided that you also meet all of these - conditions: + distribute such modifications or work under the terms of Section + 1 above, provided that you also meet all of these conditions: - 1. You must cause the modified files to carry prominent - notices stating that you changed the files and the date of - any change. + a. You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any + change. - 2. You must cause any work that you distribute or publish, + b. You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. - 3. If the modified program normally reads commands + c. If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an @@ -206,11 +206,11 @@ modification follow. that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive - but does not normally print such an announcement, your - work based on the Program is not required to print an + but does not normally print such an announcement, your work + based on the Program is not required to print an announcement.) - These requirements apply to the modified work as a whole. If + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, @@ -222,86 +222,83 @@ modification follow. whole, and thus to each and every part regardless of who wrote it. - Thus, it is not the intent of this section to claim rights - or contest your rights to work written entirely by you; rather, - the intent is to exercise the right to control the distribution - of derivative or collective works based on the Program. + Thus, it is not the intent of this section to claim rights or + contest your rights to work written entirely by you; rather, the + intent is to exercise the right to control the distribution of + derivative or collective works based on the Program. - In addition, mere aggregation of another work not based on - the Program with the Program (or with a work based on the - Program) on a volume of a storage or distribution medium does - not bring the other work under the scope of this License. + In addition, mere aggregation of another work not based on the + Program with the Program (or with a work based on the Program) + on a volume of a storage or distribution medium does not bring + the other work under the scope of this License. 4. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the - terms of Sections 1 and 2 above provided that you also do one - of the following: + terms of Sections 1 and 2 above provided that you also do one of + the following: - 1. Accompany it with the complete corresponding + a. Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - 2. Accompany it with a written offer, valid for at least three + b. Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source - code, to be distributed under the terms of Sections 1 and - 2 above on a medium customarily used for software + code, to be distributed under the terms of Sections 1 and 2 + above on a medium customarily used for software interchange; or, - 3. Accompany it with the information you received as to the + c. Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) - The source code for a work means the preferred form of the - work for making modifications to it. For an executable work, + The source code for a work means the preferred form of the work + for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, - plus the scripts used to control compilation and installation - of the executable. However, as a special exception, the source + plus the scripts used to control compilation and installation of + the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating - system on which the executable runs, unless that component - itself accompanies the executable. + components (compiler, kernel, and so on) of the operating system + on which the executable runs, unless that component itself + accompanies the executable. - If distribution of executable or object code is made by - offering access to copy from a designated place, then offering - equivalent access to copy the source code from the same place - counts as distribution of the source code, even though third - parties are not compelled to copy the source along with the - object code. + If distribution of executable or object code is made by offering + access to copy from a designated place, then offering equivalent + access to copy the source code from the same place counts as + distribution of the source code, even though third parties are + not compelled to copy the source along with the object code. 5. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program - is void, and will automatically terminate your rights under - this License. However, parties who have received copies, or - rights, from you under this License will not have their - licenses terminated so long as such parties remain in full - compliance. + is void, and will automatically terminate your rights under this + License. However, parties who have received copies, or rights, + from you under this License will not have their licenses + terminated so long as such parties remain in full compliance. 6. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to - modify or distribute the Program or its derivative works. - These actions are prohibited by law if you do not accept this - License. Therefore, by modifying or distributing the Program - (or any work based on the Program), you indicate your - acceptance of this License to do so, and all its terms and - conditions for copying, distributing or modifying the Program - or works based on it. + modify or distribute the Program or its derivative works. These + actions are prohibited by law if you do not accept this License. + Therefore, by modifying or distributing the Program (or any + work based on the Program), you indicate your acceptance of this + License to do so, and all its terms and conditions for copying, + distributing or modifying the Program or works based on it. 7. Each time you redistribute the Program (or any work based on the - Program), the recipient automatically receives a license from - the original licensor to copy, distribute or modify the Program + Program), the recipient automatically receives a license from the + original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights - granted herein. You are not responsible for enforcing - compliance by third parties to this License. + granted herein. You are not responsible for enforcing compliance + by third parties to this License. 8. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent @@ -309,79 +306,78 @@ modification follow. agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy - simultaneously your obligations under this License and any - other pertinent obligations, then as a consequence you may not - distribute the Program at all. For example, if a patent - license would not permit royalty-free redistribution of the - Program by all those who receive copies directly or indirectly - through you, then the only way you could satisfy both it and - this License would be to refrain entirely from distribution of - the Program. - - If any portion of this section is held invalid or - unenforceable under any particular circumstance, the balance of - the section is intended to apply and the section as a whole is - intended to apply in other circumstances. - - It is not the purpose of this section to induce you to - infringe any patents or other property right claims or to - contest validity of any such claims; this section has the sole - purpose of protecting the integrity of the free software - distribution system, which is implemented by public license - practices. Many people have made generous contributions to the - wide range of software distributed through that system in - reliance on consistent application of that system; it is up to - the author/donor to decide if he or she is willing to - distribute software through any other system and a licensee - cannot impose that choice. - - This section is intended to make thoroughly clear what is + simultaneously your obligations under this License and any other + pertinent obligations, then as a consequence you may not + distribute the Program at all. For example, if a patent license + would not permit royalty-free redistribution of the Program by + all those who receive copies directly or indirectly through you, + then the only way you could satisfy both it and this License + would be to refrain entirely from distribution of the Program. + + If any portion of this section is held invalid or unenforceable + under any particular circumstance, the balance of the section is + intended to apply and the section as a whole is intended to + apply in other circumstances. + + It is not the purpose of this section to induce you to infringe + any patents or other property right claims or to contest + validity of any such claims; this section has the sole purpose + of protecting the integrity of the free software distribution + system, which is implemented by public license practices. Many + people have made generous contributions to the wide range of + software distributed through that system in reliance on + consistent application of that system; it is up to the + author/donor to decide if he or she is willing to distribute + software through any other system and a licensee cannot impose + that choice. + + This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 9. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted - interfaces, the original copyright holder who places the - Program under this License may add an explicit geographical - distribution limitation excluding those countries, so that - distribution is permitted only in or among countries not thus - excluded. In such case, this License incorporates the - limitation as if written in the body of this License. + interfaces, the original copyright holder who places the Program + under this License may add an explicit geographical distribution + limitation excluding those countries, so that distribution is + permitted only in or among countries not thus excluded. In such + case, this License incorporates the limitation as if written in + the body of this License. 10. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - Each version is given a distinguishing version number. If - the Program specifies a version number of this License which - applies to it and "any later version", you have the option of - following the terms and conditions either of that version or of - any later version published by the Free Software Foundation. - If the Program does not specify a version number of this - License, you may choose any version ever published by the Free - Software Foundation. + Each version is given a distinguishing version number. If the + Program specifies a version number of this License which applies + to it and "any later version", you have the option of following + the terms and conditions either of that version or of any later + version published by the Free Software Foundation. If the + Program does not specify a version number of this License, you + may choose any version ever published by the Free Software + Foundation. 11. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free - Software Foundation; we sometimes make exceptions for this. - Our decision will be guided by the two goals of preserving the - free status of all derivatives of our free software and of - promoting the sharing and reuse of software generally. + Software Foundation; we sometimes make exceptions for this. Our + decision will be guided by the two goals of preserving the free + status of all derivatives of our free software and of promoting + the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 12. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT - HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS - WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE - COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT + WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE + QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE + PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY + SERVICING, REPAIR OR CORRECTION. 13. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY @@ -390,19 +386,19 @@ modification follow. INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY - YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE - WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY - HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH + ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS Appendix: How to Apply These Terms to Your New Programs ======================================================= - If you develop a new program, and you want it to be of the -greatest possible use to the public, the best way to achieve this is -to make it free software which everyone can redistribute and change -under these terms. + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most @@ -427,8 +423,8 @@ notice is found. along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - Also add information on how to contact you by electronic and -paper mail. + Also add information on how to contact you by electronic and paper +mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: @@ -444,8 +440,8 @@ commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. - You should also get your employer (if you work as a programmer) -or your school, if any, to sign a "copyright disclaimer" for the + You should also get your employer (if you work as a programmer) or +your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program @@ -472,12 +468,12 @@ CVS front-end. You should install not only the elisp files themselves, but also the on-line documentation so that your users will know how to use it. You can create typeset documentation from the file `pcl-cvs.texinfo' as well as an on-line info file. The -following steps are also described in the file `INSTALL' in the -source directory. +following steps are also described in the file `INSTALL' in the source +directory. * Menu: -* Pcl-cvs installation:: How to install pcl-cvs on your system. +* Pcl-cvs installation:: How to install pcl-cvs on your system. * On-line manual installation:: How to install the on-line manual. * Typeset manual installation:: How to create typeset documentation about pcl-cvs. @@ -488,44 +484,50 @@ File: pcl-cvs, Node: Pcl-cvs installation, Next: On-line manual installation, Installation of the pcl-cvs program =================================== - 1. Edit the file `Makefile' to reflect the situation at your site. - The only things you have to change is the definition of - `lispdir' and `infodir'. The elisp files will be copied to - `lispdir', and the info file to `infodir'. + 1. Edit the file `Makefile' to reflect the situation at your site. + The only things you have to change is the definition of `lispdir' + and `infodir'. The elisp files will be copied to `lispdir', and + the info file to `infodir'. 2. Configure pcl-cvs.el - There are a couple of paths that you have to check to make - sure that they match you system. They appear early in the file + There are a couple of paths that you have to check to make sure + that they match you system. They appear early in the file pcl-cvs.el. - *NOTE:* If your system is running emacs 18.57 or earlier - you MUST uncomment the line that says: + *NOTE:* If your system is running emacs 18.57 or earlier you + MUST uncomment the line that says: (setq delete-exited-processes nil) - Setting `delete-exited-processes' to `nil' works around a bug - in emacs that causes it to dump core. The bug was fixed in - emacs 18.58. + Setting `delete-exited-processes' to `nil' works around a bug in + emacs that causes it to dump core. The bug was fixed in emacs + 18.58. + + 3. Release 1.05 and later of pcl-cvs requires parts of the Elib + library, version 0.07 or later. Elib is available via anonymous + ftp from prep.ai.mit.edu in `pub/gnu/elib-0.07.tar.z', and from + a lot of other sites that mirrors prep. Get Elib, and install + it, before proceeding. - 3. Type `make install' in the source directory. This will + 4. Type `make install' in the source directory. This will byte-compile all `.el' files and copy both the `.el' and the `.elc' into the directory you specified in step 1. - If you don't want to install the `.el' files but only the - `.elc' files (the byte-compiled files), you can type ``make + If you don't want to install the `.el' files but only the `.elc' + files (the byte-compiled files), you can type ``make install_elc'' instead of ``make install''. - If you only want to create the compiled elisp files, but - don't want to install them, you can type `make elcfiles' - instead. This is what happens if you only type `make' without - parameters. + If you only want to create the compiled elisp files, but don't + want to install them, you can type `make elcfiles' instead. + This is what happens if you only type `make' without parameters. - 4. Edit the file `default.el' in your emacs lisp directory (usually + 5. Edit the file `default.el' in your emacs lisp directory (usually `/usr/gnu/emacs/lisp' or something similar) and enter the contents of the file `pcl-cvs-startup.el' into it. It contains a couple of `auto-load's that facilitates the use of pcl-cvs. + File: pcl-cvs, Node: On-line manual installation, Next: Typeset manual installation, Prev: Pcl-cvs installation, Up: Installation @@ -540,7 +542,7 @@ Installation of the on-line manual. info file `pcl-cvs.info' that is included in the distribution (type `cp pcl-cvs.info pcl-cvs'). - 2. Move the info file `pcl-cvs' to your standard info directory. + 2. Move the info file `pcl-cvs' to your standard info directory. This might be called something like `/usr/gnu/emacs/info'. 3. Edit the file `dir' in the info directory and enter one line to @@ -567,6 +569,7 @@ manual from `pcl-cvs.texinfo'. There is also a program which comes together with TeX, `dvips', which you can use. + File: pcl-cvs, Node: About pcl-cvs, Next: Getting started, Prev: Installation, Up: Top @@ -589,37 +592,40 @@ Contributors to pcl-cvs Contributions to the package are welcome. I have limited time to work on this project, but I will gladly add any code that you -contribute to me to this package (*note Reporting bugs and ideas::.). +contribute to me to this package (*note Bugs::.). The following persons have made contributions to pcl-cvs. - * Brian Berliner wrote CVS, together with some other contributors. + * Brian Berliner wrote CVS, together with some other contributors. Without his work on CVS this package would be useless... * Per Cederqvist wrote most of the otherwise unattributed functions in pcl-cvs as well as all documentation. * Inge Wallin (`inge@lysator.liu.se') wrote the skeleton to - `pcl-cvs.texinfo', and gave useful comments on it. He also - wrote the files `elib-node.el' and `compile-all.el'. The file + `pcl-cvs.texinfo', and gave useful comments on it. He also wrote + the files `elib-node.el' and `compile-all.el'. The file `cookie.el' was inspired by Inge. * Linus Tolke (`linus@lysator.liu.se') contributed useful comments on both the functionality and the documentation. + * Jamie Zawinski (`jwz@lucid.com') contributed `pcl-cvs-lucid.el'. + + * Leif Lonnblad contributed RCVS support. + + Apart from these, a lot of people have send me suggestions, ideas, +requests, bug reports and encouragement. Thanks a lot! Without your +there would be no new releases of pcl-cvs. + File: pcl-cvs, Node: Archives, Prev: Contributors, Up: About pcl-cvs Where can I get pcl-cvs? ======================== - This release of pcl-cvs is included in the CVS 1.3 distribution. -However, since pcl-cvs has had less time to mature (the first line of -code was written less than a year ago) it is likely that there will -be a new release of pcl-cvs before the next release of CVS. - - The latest release of pcl-cvs can be fetched via anonymous ftp -from `ftp.lysator.liu.se', (IP no. 130.236.254.1) in the directory + The latest release of pcl-cvs can be fetched via anonymous ftp from +`ftp.lysator.liu.se', (IP no. 130.236.254.1) in the directory `pub/emacs'. If you don't live in Scandinavia you should probably check with archie to see if there is a site closer to you that archives pcl-cvs. @@ -635,16 +641,16 @@ Getting started *************** This document assumes that you know what CVS is, and that you at -least knows the fundamental concepts of CVS. If that is not the -case you should read the man page for CVS. +least knows the fundamental concepts of CVS. If that is not the case +you should read the man page for CVS. Pcl-cvs is only useful once you have checked out a module. So before you invoke it you must have a copy of a module somewhere in the file system. - You invoke pcl-cvs by typing `M-x pcl-cvs RET'. If your emacs + You invoke pcl-cvs by typing `M-x cvs-update RET'. If your emacs responds with `[No match]' your system administrator has not -installed pcl-cvs properly. Try `M-x load-library RET pcl-cvs RET'. +installed pcl-cvs properly. Try `M-x load-library RET pcl-cvs RET'. If that also fails - talk to your root. If it succeeds you might put this line in your `.emacs' file so that you don't have to type the `load-library' command every time you wish to use pcl-cvs: @@ -652,12 +658,12 @@ this line in your `.emacs' file so that you don't have to type the (autoload 'cvs-update "pcl-cvs" nil t) The function `cvs-update' will ask for a directory. The command -`cvs update' will be run in that directory. (It should contain -files that have been checked out from a CVS archive.) The output -from `cvs' will be parsed and presented in a table in a buffer called +`cvs update' will be run in that directory. (It should contain files +that have been checked out from a CVS archive.) The output from +`cvs' will be parsed and presented in a table in a buffer called `*cvs*'. It might look something like this: - PCL-CVS release 1.02. + PCL-CVS release 1.05. In directory /users/ceder/FOO/test: Updated bar @@ -683,10 +689,10 @@ Committing changes::. You can press `x' to get rid of the "uninteresting" files that have only been `Updated' (and don't require any further action from you). - You can also easily get a `diff' between your modified file and -the base version that you started from, and you can get the output -from `cvs log' and `cvs status' on the listed files simply by -pressing a key (*note Getting info about files::.). + You can also easily get a `diff' between your modified file and the +base version that you started from, and you can get the output from +`cvs log' and `cvs status' on the listed files simply by pressing a +key (*note Getting info about files::.). File: pcl-cvs, Node: Buffer contents, Next: Commands, Prev: Getting started, Up: Top @@ -720,33 +726,33 @@ File status The `file status' field can have the following values: `Updated' - The file was brought up to date with respect to the repository. - This is done for any file that exists in the repository but - not in your source, and for files that you haven't changed but - are not the most recent versions available in the repository. + The file was brought up to date with respect to the repository. + This is done for any file that exists in the repository but not + in your source, and for files that you haven't changed but are + not the most recent versions available in the repository. `Modified' - The file is modified in your working directory, and there - was no modification to the same file in the repository. + The file is modified in your working directory, and there was + no modification to the same file in the repository. `Merged' The file is modified in your working directory, and there were modifications in the repository as well as in your copy, but - they were merged successfully, without conflict, in your - working directory. + they were merged successfully, without conflict, in your working + directory. `Conflict' A conflict was detected while trying to merge your changes to - FILE with changes from the source repository. FILE (the copy - in your working directory) is now the output of the `rcsmerge' + FILE with changes from the source repository. FILE (the copy in + your working directory) is now the output of the `rcsmerge' command on the two versions; an unmodified copy of your file is also in your working directory, with the name `.#FILE.VERSION', - where VERSION is the RCS revision that your modified file - started from. *Note Viewing differences::, for more details. + where VERSION is the RCS revision that your modified file started + from. *Note Viewing differences::, for more details. `Added' - The file has been added by you, but it still needs to be - checked in to the repository. + The file has been added by you, but it still needs to be checked + in to the repository. `Removed' The file has been removed by you, but it needs to be checked in @@ -770,8 +776,8 @@ longer strings in the fields: `Removed from repository, changed by you' You have modified a file that someone have removed from the - repository. You can correct this situation by removing the - file manually (see *note Adding and removing files::.). + repository. You can correct this situation by removing the file + manually (see *note Adding and removing files::.). `Removed by you, changed in repository' You have removed a file, and before you committed the removal @@ -795,18 +801,17 @@ Selected files Many of the commands works on the current set of "selected" files. - * If there are any files that are marked they constitute the set - of selected files. + * If there are any files that are marked they constitute the set of + selected files. * Otherwise, if the cursor points to a file, that file is the selected file. - * Otherwise, if the cursor points to a directory, all the files - in that directory that appears in the buffer are the selected - files. + * Otherwise, if the cursor points to a directory, all the files in + that directory that appears in the buffer are the selected files. - This scheme might seem a little complicated, but once one get -used to it, it is quite powerful. + This scheme might seem a little complicated, but once one get used +to it, it is quite powerful. *Note Marking files:: tells how you mark and unmark files. @@ -831,9 +836,13 @@ type. * Editing files:: Loading files into Emacs. * Getting info about files:: Display the log and status of files. * Adding and removing files:: Adding and removing files +* Undoing changes:: Undoing changes * Removing handled entries:: Uninteresting lines can easily be removed. * Ignoring files:: Telling CVS to ignore generated files. * Viewing differences:: Commands to `diff' different versions. +* Emerge:: +* Reverting your buffers:: Reverting your buffers +* Miscellaneous commands:: Miscellaneous commands File: pcl-cvs, Node: Updating the directory, Next: Movement commands, Prev: Commands, Up: Commands @@ -842,11 +851,10 @@ Updating the directory ====================== `M-x cvs-update' - Run a `cvs update' command. You will be asked for the - directory in which the `cvs update' will be run. The output - will be parsed by pcl-cvs, and the result printed in the - `*cvs*' buffer (see *note Buffer contents::. for a description - of the contents). + Run a `cvs update' command. You will be asked for the directory + in which the `cvs update' will be run. The output will be + parsed by pcl-cvs, and the result printed in the `*cvs*' buffer + (see *note Buffer contents::. for a description of the contents). By default, `cvs-update' will descend recursively into subdirectories. You can avoid that behavior by giving a prefix @@ -855,11 +863,22 @@ Updating the directory All other commands in pcl-cvs requires that you have a `*cvs*' buffer. This is the command that you use to get one. + CVS uses lock files in the repository to ensure the integrity of + the data files in the repository. They might be left behind + i.e. if a workstation crashes in the middle of a CVS operation. + CVS outputs a message when it is waiting for a lock file to go + away. Pcl-cvs will show the same message in the *cvs* buffer, + together with instructions for deleting the lock files. You + should normally not have to delete them manually -- just wait a + little while and the problem should fix itself. But if the lock + files doesn't disappear you can delete them with `M-x + cvs-delete-lock RET'. + `g' This will run `cvs update' again. It will always use the same buffer that was used with the previous `cvs update'. Give a prefix argument to avoid descending into subdirectories. This - runs the command `cvs-update-no-prompt'. + runs the command `cvs-mode-update-no-prompt'. File: pcl-cvs, Node: Movement commands, Next: Marking files, Prev: Updating the directory, Up: Commands @@ -868,8 +887,8 @@ Movement Commands ================= You can use most normal Emacs commands to move forward and -backward in the buffer. Some keys are rebound to functions that -take advantage of the fact that the buffer is a pcl-cvs buffer: +backward in the buffer. Some keys are rebound to functions that take +advantage of the fact that the buffer is a pcl-cvs buffer: `SPC' `C-n' @@ -889,27 +908,27 @@ Marking files ============= Pcl-cvs works on a set of "selected files" (*note Selected -files::.). You can mark and unmark files with these commands: +files::.). You can mark and unmark files with these commands: `m' This marks the file that the cursor is positioned on. If the cursor is positioned on a directory all files in that directory - will be marked. (`cvs-mark'). + will be marked. (`cvs-mode-mark'). `u' Unmark the file that the cursor is positioned on. If the cursor - is on a directory, all files in that directory will be unmarked. - (`cvs-unmark'). + is on a directory, all files in that directory will be unmarked. + (`cvs-mode-unmark'). `M' - Mark *all* files in the buffer (`cvs-mark-all-files'). + Mark *all* files in the buffer (`cvs-mode-mark-all-files'). -`U' - Unmark *all* files (`cvs-unmark-all-files'). +`ESC DEL' + Unmark *all* files (`cvs-mode-unmark-all-files'). `DEL' - Unmark the file on the previous line, and move point to that - line (`cvs-unmark-up'). + Unmark the file on the previous line, and move point to that line + (`cvs-mode-unmark-up'). File: pcl-cvs, Node: Committing changes, Next: Editing files, Prev: Marking files, Up: Commands @@ -922,46 +941,53 @@ Committing changes Buffer contents::.) can be checked in with the `c' command. It checks in all selected files (*note Selected files::.) (except those who lack the "ci"-marker - they are ignored). Pressing - `c' causes `cvs-commit' to be run. + `c' causes `cvs-mode-commit' to be run. When you press `c' you will get a buffer called - `*cvs-commit-message*'. Enter the log message for the file(s) - in it. When you are ready you should press `C-c C-c' to - actually commit the files (using `cvs-edit-done'). + `*cvs-commit-message*'. Enter the log message for the file(s) in + it. When you are ready you should press `C-c C-c' to actually + commit the files (using `cvs-edit-done'). Normally the `*cvs-commit-message*' buffer will retain the log message from the previous commit, but if the variable - `cvs-erase-input-buffer' is set to a non-nil value the buffer - will be erased. Point and mark will always be located around - the entire buffer so that you can easily erase it with `C-w' + `cvs-erase-input-buffer' is set to a non-`nil' value the buffer + will be erased. Point and mark will always be located around the + entire buffer so that you can easily erase it with `C-w' (`kill-region'). + If you are editing the files in your emacs an automatic + `revert-buffer' will be performed. (If the file contains `$Id$' + keywords `cvs commit' will write a new file with the new values + substituted. The auto-revert makes sure that you get them into + your buffer). The revert will not occur if you have modified + your buffer, or if `cvs-auto-revert-after-commit' is set to + `nil'. + File: pcl-cvs, Node: Editing files, Next: Getting info about files, Prev: Committing changes, Up: Commands Editing files ============= - There are currently three commands that can be used to find a -file (that is, load it into a buffer and start editing it there). -These commands work on the line that the cursor is situated at. -They ignore any marked files. + There are currently three commands that can be used to find a file +(that is, load it into a buffer and start editing it there). These +commands work on the line that the cursor is situated at. They +ignore any marked files. `f' - Find the file that the cursor points to. Run `dired' - - (*note Dired: (Emacs)Dired.) - - if the cursor points to a directory (`cvs-find-file'). + Find the file that the cursor points to. Run `dired' (*note + Dired: (Emacs)Dired.) if the cursor points to a directory + (`cvs-mode-find-file'). `o' - Like `f', but use another window (`cvs-find-file-other-window'). + Like `f', but use another window + (`cvs-mode-find-file-other-window'). `A' - Invoke `add-change-log-entry-other-window' to edit a - `ChangeLog' file. The `ChangeLog' will be found in the - directory of the file the cursor points to. - (`cvs-add-change-log-entry-other-window'). + Invoke `add-change-log-entry-other-window' to edit a `ChangeLog' + file. The `ChangeLog' will be found in the directory of the + file the cursor points to. + (`cvs-mode-add-change-log-entry-other-window'). File: pcl-cvs, Node: Getting info about files, Next: Adding and removing files, Prev: Editing files, Up: Commands @@ -969,19 +995,19 @@ File: pcl-cvs, Node: Getting info about files, Next: Adding and removing files Getting info about files ======================== - Both of the following commands can be customized. *Note + Both of the following commands can be customized. *Note Customization::. `l' Run `cvs log' on all selected files, and show the result in a - temporary buffer (`cvs-log'). + temporary buffer (`cvs-mode-log'). `s' Run `cvs status' on all selected files, and show the result in a - temporary buffer (`cvs-status'). + temporary buffer (`cvs-mode-status'). -File: pcl-cvs, Node: Adding and removing files, Next: Removing handled entries, Prev: Getting info about files, Up: Commands +File: pcl-cvs, Node: Adding and removing files, Next: Undoing changes, Prev: Getting info about files, Up: Commands Adding and removing files ========================= @@ -992,9 +1018,9 @@ remove files from the CVS repository. `a' Add all selected files. This command can be used on `Unknown' files (see *note File status::.). The status of the file will - change to `Added', and you will have to use `c' (`cvs-commit', - see *note Committing changes::.) to really add the file to the - repository. + change to `Added', and you will have to use `c' + (`cvs-mode-commit', see *note Committing changes::.) to really + add the file to the repository. This command can also be used on `Removed' files (before you commit them) to resurrect them. @@ -1002,42 +1028,55 @@ remove files from the CVS repository. Selected files that are neither `Unknown' nor `Removed' will be ignored by this command. - The command that is run is `cvs-add'. + The command that is run is `cvs-mode-add'. `r' This command removes the selected files (after prompting for confirmation). The files are `rm'ed from your directory and - (unless the status was `Unknown'; *note File status::.) they - will also be `cvs remove'd. If the files were `Unknown' they - will disappear from the buffer. Otherwise their status will - change to `Removed', and you must use `c' (`cvs-commit', *note + (unless the status was `Unknown'; *note File status::.) they will + also be `cvs remove'd. If the files were `Unknown' they will + disappear from the buffer. Otherwise their status will change to + `Removed', and you must use `c' (`cvs-mode-commit', *note Committing changes::.) to commit the removal. - The command that is run is `cvs-remove-file'. + The command that is run is `cvs-mode-remove-file'. -File: pcl-cvs, Node: Removing handled entries, Next: Ignoring files, Prev: Adding and removing files, Up: Commands +File: pcl-cvs, Node: Undoing changes, Next: Removing handled entries, Prev: Adding and removing files, Up: Commands + +Undoing changes +=============== + +`U' + If you have modified a file, and for some reason decide that you + don't want to keep the changes, you can undo them with this + command. It works by removing your working copy of the file and + then getting the latest version from the repository + (`cvs-mode-undo-local-changes'. + + +File: pcl-cvs, Node: Removing handled entries, Next: Ignoring files, Prev: Undoing changes, Up: Commands Removing handled entries ======================== `x' This command allows you to remove all entries that you have - processed. More specifically, the lines for `Updated' files - (*note File status::. and files that have been checked in - (*note Committing changes::.) are removed from the buffer. If - a directory becomes empty the heading for that directory is - also removed. This makes it easier to get an overview of what - needs to be done. - - The command is called `cvs-remove-handled'. If + processed. More specifically, the lines for `Updated' files + (*note File status::. and files that have been checked in (*note + Committing changes::.) are removed from the buffer. If a + directory becomes empty the heading for that directory is also + removed. This makes it easier to get an overview of what needs + to be done. + + The command is called `cvs-mode-remove-handled'. If `cvs-auto-remove-handled' is set to non-`nil' this will automatically be performed after every commit. `C-k' - This command can be used for lines that `cvs-remove-handled' - would not delete, but that you want to delete - (`cvs-acknowledge'). + This command can be used for lines that + `cvs-mode-remove-handled' would not delete, but that you want to + delete (`cvs-mode-acknowledge'). File: pcl-cvs, Node: Ignoring files, Next: Viewing differences, Prev: Removing handled entries, Up: Commands @@ -1048,39 +1087,111 @@ Ignoring files `i' Arrange so that CVS will ignore the selected files. The file names are added to the `.cvsignore' file in the corresponding - directory. If the `.cvsignore' doesn't exist it will be - created. + directory. If the `.cvsignore' doesn't exist it will be created. - The `.cvsignore' file should normally be added to the - repository, but you could ignore it also if you like it better - that way. + The `.cvsignore' file should normally be added to the repository, + but you could ignore it also if you like it better that way. - This runs `cvs-ignore'. + This runs `cvs-mode-ignore'. -File: pcl-cvs, Node: Viewing differences, Prev: Ignoring files, Up: Commands +File: pcl-cvs, Node: Viewing differences, Next: Emerge, Prev: Ignoring files, Up: Commands Viewing differences =================== `d' Display a `cvs diff' between the selected files and the RCS - version that they are based on. *Note Customization:: - describes how you can send flags to `cvs diff'. (The function - that does the job is `cvs-diff-cvs'). + version that they are based on. *Note Customization:: describes + how you can send flags to `cvs diff'. If CVS-DIFF-IGNORE-MARKS + is set to a non-`nil' value or if a prefix argument is given + (but not both) any marked files will not be considered to be + selected. (`cvs-mode-diff-cvs'). `b' If CVS finds a conflict while merging two versions of a file - (during a `cvs update', *note Updating the directory::.) it - will save the original file in a file called `.#FILE.VERSION' - where FILE is the name of the file, and VERSION is the RCS - version number that your file was based on. + (during a `cvs update', *note Updating the directory::.) it will + save the original file in a file called `.#FILE.VERSION' where + FILE is the name of the file, and VERSION is the RCS version + number that your file was based on. With the `b' command you can run a `diff' on the files `.#FILE.VERSION' and `FILE'. You can get a context- or Unidiff by setting `cvs-diff-flags' - *note Customization::.. This command only works on files that have status `Conflict' or - `Merged'. The name of the command is `cvs-diff-backup'. + `Merged'. + + If CVS-DIFF-IGNORE-MARKS is set to a non-`nil' value or if a + prefix argument is given (but not both) any marked files will + not be considered to be selected. (`cvs-mode-diff-backup'). + + +File: pcl-cvs, Node: Emerge, Next: Reverting your buffers, Prev: Viewing differences, Up: Commands + +Running emerge +============== + +`e' + Invoke `emerge' on one file. This command works slightly + different depending on the file status. + + `Modified' + Run `emerge-files' with your working file as file A, and + the latest revision in the repository as file B. + + `Merged' + `Conflict' + Run `emerge-files-with-ancestor' with your working file (as + it was prior to your invocation of `cvs-update') as file A, + the latest revision in the repository as file B, and the + revision that you based your local modifications on as + ancestor. + + *Note:* CVS has already performed a merge. The resulting file is + not used in any way if you use this command. If you use the `q' + command inside `emerge' (to successfully terminate the merge) the + file that CVS created will be overwritten. + + +File: pcl-cvs, Node: Reverting your buffers, Next: Miscellaneous commands, Prev: Emerge, Up: Commands + +Reverting your buffers +====================== + +`R' + If you are editing (or just viewing) a file in a buffer, and + that file is changed by CVS during a `cvs-update', all you have + to do is type `R' in the *cvs* buffer to read in the new + versions of the files. + + All files that are `Updated', `Merged' or in `Conflict' are + reverted from the disk. Any other files are ignored. Only files + that you were already editing are read. + + An error is signalled if you have modified the buffer since it + was last changed. (`cvs-mode-revert-updated-buffers'). + + +File: pcl-cvs, Node: Miscellaneous commands, Prev: Reverting your buffers, Up: Commands + +Miscellaneous commands +====================== + +`M-x cvs-byte-compile-files' + Byte compile all selected files that end in .el. + +`M-x cvs-delete-lock' + This command can be used in any buffer, and deletes the lock + files that the *cvs* buffer informs you about. You should + normally never have to use this command since CVS tries very + carefully to always remove the lock files itself. + + You can only use this command when a message in the *cvs* buffer + tells you so. You should wait a while before using this command + in case someone else is running a cvs command. + +`q' + Bury the *cvs* buffer. (`bury-buffer'). File: pcl-cvs, Node: Customization, Next: Future enhancements, Prev: Commands, Up: Top @@ -1088,77 +1199,176 @@ File: pcl-cvs, Node: Customization, Next: Future enhancements, Prev: Commands Customization ************* - If you have an idea about any customization that would be handy -but isn't present in this list, please tell me! *Note Reporting -bugs and ideas:: for info on how to reach me. + If you have an idea about any customization that would be handy but +isn't present in this list, please tell me! *Note Bugs:: for info on +how to reach me. `cvs-erase-input-buffer' - If set to anything else than `nil' the edit buffer will be - erased before you write the log message (*note Committing - changes::.). + If set to anything else than `nil' the edit buffer will be erased + before you write the log message (*note Committing changes::.). `cvs-inhibit-copyright-message' The copyright message that is displayed on startup can be - annoying after a while. Set this variable to `t' if you want - to get rid of it. (But don't set this to `t' in the system - defaults file - new users should see this message at least - once). + annoying after a while. Set this variable to `t' if you want to + get rid of it. (But don't set this to `t' in the system defaults + file - new users should see this message at least once). -`cvs-cvs-diff-flags' - A list of strings to pass as arguments to the `cvs diff' - program. This is used by `cvs-diff-cvs' (key `d', *note - Viewing differences::.). If you prefer the Unidiff format you - could add this line to your `.emacs' file: +`cvs-diff-flags' + A list of strings to pass as arguments to the `cvs diff' and + `diff' programs. This is used by `cvs-mode-diff-cvs' and + `cvs-mode-diff-backup' (key `b', *note Viewing differences::.). + If you prefer the Unidiff format you could add this line to your + `.emacs' file: - (setq cvs-cvs-diff-flags '("-u")) + (setq cvs-diff-flags '("-u")) -`cvs-diff-flags' - Like `cvs-cvs-diff-flags', but passed to `diff'. This is used - by `cvs-diff-backup' (key `b', *note Viewing differences::.). +`cvs-diff-ignore-marks' + If this variable is non-`nil' or if a prefix argument is given + (but not both) to `cvs-mode-diff-cvs' or `cvs-mode-diff-backup' + marked files are not considered selected. `cvs-log-flags' - List of strings to send to `cvs log'. Used by `cvs-log' (key - `l', *note Getting info about files::.). + List of strings to send to `cvs log'. Used by `cvs-mode-log' + (key `l', *note Getting info about files::.). `cvs-status-flags' - List of strings to send to `cvs status'. Used by `cvs-status' - (key `s', *note Getting info about files::.). + List of strings to send to `cvs status'. Used by + `cvs-mode-status' (key `s', *note Getting info about files::.). `cvs-auto-remove-handled' If this variable is set to any non-`nil' value - `cvs-remove-handled' will be called every time you check in + `cvs-mode-remove-handled' will be called every time you check in files, after the check-in is ready. *Note Removing handled entries::. +`cvs-auto-revert-after-commit' + If this variable is set to any non-`nil' value any buffers you + have that visit a file that is committed will be automatically + reverted. This variable is default `t'. *Note Committing + changes::. + +`cvs-update-prog-output-skip-regexp' + The `-u' flag in the `modules' file can be used to run a command + whenever a `cvs update' is performed (see cvs(5)). This regexp + is used to search for the last line in that output. It is + normally set to `"$"'. That setting is only correct if the + command outputs nothing. Note that pcl-cvs will get very + confused if the command outputs *anything* to `stderr'. + +`cvs-cvsroot' + This variable can be set to override `CVSROOT'. It should be a + string. If it is set then everytime a cvs command is run it will + be called as `cvs -d CVS-CVSROOT...' This can be useful if your + site has several repositories. + +`TMPDIR' + Pcl-cvs uses this *environment variable* to decide where to put + the temporary files it needs. It defaults to `/tmp' if it is + not set. + +`cvs-commit-buffer-require-final-newline' + When you enter a log message in the `*cvs-commit-message*' buffer + pcl-cvs will normally automatically insert a trailing newline, + unless there already is one. This behavior can be controlled via + `cvs-commit-buffer-require-final-newline'. If it is `t' (the + default behavior), a newline will always be appended. If it is + `nil', newlines will never be appended. Any other value causes + pcl-cvs to ask the user whenever there is no trailing newline in + the commit message buffer. + +`cvs-sort-ignore-file' + If this variable is set to any non-`nil' value the `.cvsignore' + will always be sorted whenever you use `cvs-mode-ignore' to add + a file to it. This option is on by default. + -File: pcl-cvs, Node: Future enhancements, Next: Reporting bugs and ideas, Prev: Customization, Up: Top +File: pcl-cvs, Node: Future enhancements, Next: Bugs, Prev: Customization, Up: Top Future enhancements ******************* Pcl-cvs is still under development and needs a number of -enhancements to be called complete. Here is my current wish-list -for future releases of pcl-cvs: - - * Dired support. I have an experimental `dired-cvs.el' that works - together with CVS 1.2. Unfortunately I wrote it on top of a - non-standard `dired.el', so it must be rewritten. +enhancements to be called complete. Below is my current wish-list +for future releases of pcl-cvs. Please, let me know which of these +features you want most. They are listed below in approximately the +order that I currently think I will implement them in. + + * Rewritten parser code. There are many situations where pcl-cvs + will fail to recognize the output from CVS. The situation could + be greatly increased. + + * `cvs-status'. This will run `cvs status' in a directory and + produce a buffer that looks pretty much like the current *cvs* + buffer. That buffer will include information for all + version-controlled files. (There will be a simple keystroke to + remove all "uninteresting" files, that is, files that are + "Up-to-date"). In this new buffer you will be able to update a + file, commit a file, et c. The big win with this is that you + will be able to watch the differences between your current + working file and the head revision in the repository before you + update the file, and you can then choose to update it or let it + wait for a while longer. + + * Log mode. When this mode is finished you will be able to move + around (using `n' and `p') between the revisions of a file, mark + two of them, and run a diff between them. You will be able to + hide branches (similar to the way you can hide sub-paragraphs in + outline-mode) and do merges between revisions. Other ideas + about this are welcome. + + * The current model for marks in the *cvs* buffer seems to be + confusing. I am considering to use the VM model instead, where + marks are normally inactive. To activate the mark, you issue a + command like `cvs-mode-next-command-uses-marks'. I might + implement a flag so that you can use either version. Feedback + on this before I start coding it is very welcome. * It should be possible to run commands such as `cvs log', `cvs status' and `cvs commit' directly from a buffer containing a file, instead of having to `cvs-update'. If the directory contains many files the `cvs-update' can take quite some time, - especially on a slow machine. + especially on a slow machine. I planed to put these kind of + commands on the prefix `C-c C-v', but that turned out to be used + by for instance c++-mode. If you have any suggestions for a + better prefix key, please let me know. + + * Increased robustness. For instance, you can not currently press + `C-g' when you are entering the description of a file that you + are adding without confusing pcl-cvs. + + * Support for multiple active *cvs* buffers. + + * Dired support. I have an experimental `dired-cvs.el' that works + together with CVS 1.2. Unfortunately I wrote it on top of a + non-standard `dired.el', so it must be rewritten. + + * An ability to send user-supplied options to all the cvs commands. + + * Pcl-cvs is not at all clever about what it should do when `cvs + update' runs a program (due to the `-u' option in the `modules' + file -- see `cvs(5)'). The current release uses a regexp to + search for the end. At the very least that regexp should be + configured for different modules. Tell me if you have any idea + about what is the right thing to do. In a perfect world the + program should also be allowed to print to `stderr' without + causing pcl-cvs to crash. If you miss something in this wish-list, let me know! I don't promise that I will write it, but I will at least try to coordinate the efforts of making a good Emacs front end to CVS. See *Note -Reporting bugs and ideas:: for information about how to reach me. +Bugs:: for information about how to reach me. + + So far, I have written most of pcl-cvs in my all-to-rare spare +time. If you want pcl-cvs to be developed faster you can write a +contract with Signum Support to do the extension. You can reach +Signum Support by email to `info@signum.se' or via mail to Signum +Support AB, Box 2044, S-580 02 Linkoping, Sweden. Phone: +46 (0) 13 - +21 46 00. Fax: +46 (0) 13 - 21 47 00. -File: pcl-cvs, Node: Reporting bugs and ideas, Next: Function and Variable Index, Prev: Future enhancements, Up: Top +File: pcl-cvs, Node: Bugs, Next: Function and Variable Index, Prev: Future enhancements, Up: Top -Reporting bugs and ideas +Bugs (known and unknown) ************************ If you find a bug or misfeature, don't hesitate to tell me! Send @@ -1168,43 +1378,89 @@ email to `ceder@lysator.liu.se'. extensions to this package, I would like to hear from you. I hope that you find this package useful! + Below is a partial list of currently known problems with pcl-cvs +version 1.05. + +Commit causes Emacs to hang + Emacs waits for the `cvs commit' command to finish before you can + do anything. If you start a background job from the loginfo + file you must take care that it closes `stdout' and `stderr' if + you do not want to wait for it. (You do that with + `background-command &>- 2&>- &' if you are starting + `background-command' from a `/bin/sh' shell script). + + Your emacs will also hang if there was a lock file in the + repository. In this case you can type `C-g' to get control over + your emacs again. + +Name clash in Emacs 19 + This is really a bug in Elib or the Emacs 19 distribution. Both + Elib and Emacs 19.6 through at least 19.10 contains a file named + `cookie.el'. One of the files will have to be renamed, and we + are currently negotiating about which of the files to rename. + +Commands while cvs-update is running + It is possible to type commands in the *cvs* buffer while the + update is running, but error messages is all that you will get. + The error messages should be better. + +Unexpected output from CVS + Unexpected output from CVS confuses pcl-cvs. It will currently + create a bug report that you can mail to me. It should do + something more civilized. + -File: pcl-cvs, Node: Function and Variable Index, Next: Concept Index, Prev: Reporting bugs and ideas, Up: Top +File: pcl-cvs, Node: Function and Variable Index, Next: Concept Index, Prev: Bugs, Up: Top Function and Variable Index *************************** * Menu: +* bury-buffer: Miscellaneous commands. * cookie-next-cookie: Movement commands. * cookie-previous-cookie: Movement commands. -* cvs-acknowledge: Removing handled entries. -* cvs-add: Adding and removing files. -* cvs-add-change-log-entry-other-window: Editing files. * cvs-auto-remove-handled (variable): Customization. -* cvs-commit: Committing changes. -* cvs-cvs-diff-flags (variable): Customization. -* cvs-diff-backup: Viewing differences. -* cvs-diff-cvs: Viewing differences. +* cvs-auto-revert-after-commit (variable): Customization. +* cvs-auto-revert-after-commit (variable): Committing changes. +* cvs-byte-compile-files: Miscellaneous commands. +* cvs-commit-buffer-require-final-newline (variable): Customization. +* cvs-cvsroot (variable): Customization. +* cvs-delete-lock: Updating the directory. * cvs-diff-flags (variable): Customization. -* cvs-erase-input-buffer (variable): Committing changes. +* cvs-diff-ignore-marks (variable): Customization. +* cvs-diff-ignore-marks (variable): Viewing differences. * cvs-erase-input-buffer (variable): Customization. -* cvs-find-file: Editing files. -* cvs-find-file-other-window: Editing files. +* cvs-erase-input-buffer (variable): Committing changes. * cvs-inhibit-copyright-message (variable): Customization. -* cvs-log: Getting info about files. * cvs-log-flags (variable): Customization. -* cvs-mark: Marking files. -* cvs-mark-all-files: Marking files. -* cvs-remove-file: Adding and removing files. -* cvs-remove-handled: Removing handled entries. -* cvs-status: Getting info about files. +* cvs-mode-acknowledge: Removing handled entries. +* cvs-mode-add: Adding and removing files. +* cvs-mode-add-change-log-entry-other-window: Editing files. +* cvs-mode-commit: Committing changes. +* cvs-mode-diff-backup: Viewing differences. +* cvs-mode-diff-cvs: Viewing differences. +* cvs-mode-emerge: Emerge. +* cvs-mode-find-file: Editing files. +* cvs-mode-find-file-other-window: Editing files. +* cvs-mode-ignore: Removing handled entries. +* cvs-mode-log: Getting info about files. +* cvs-mode-mark: Marking files. +* cvs-mode-mark-all-files: Marking files. +* cvs-mode-remove-file: Adding and removing files. +* cvs-mode-remove-handled: Removing handled entries. +* cvs-mode-revert-updated-buffers: Reverting your buffers. +* cvs-mode-status: Getting info about files. +* cvs-mode-undo-local-changes: Undoing changes. +* cvs-mode-unmark: Marking files. +* cvs-mode-unmark-all-files: Marking files. +* cvs-mode-unmark-up: Marking files. +* cvs-mode-update-no-prompt: Updating the directory. +* cvs-sort-ignore-file (variable): Customization. * cvs-status-flags (variable): Customization. -* cvs-unmark: Marking files. -* cvs-unmark-all-files: Marking files. -* cvs-unmark-up: Marking files. * cvs-update: Updating the directory. -* cvs-update-no-prompt: Updating the directory. +* cvs-update-prog-output-skip-regexp (variable): Customization. +* TMPDIR (environment variable): Customization. File: pcl-cvs, Node: Concept Index, Next: Key Index, Prev: Function and Variable Index, Up: Top @@ -1214,21 +1470,29 @@ Concept Index * Menu: +* -u option in modules file: Customization. +* .cvsignore file, sorting: Customization. * About pcl-cvs: About pcl-cvs. * Active files: Selected files. * Added (file status): File status. * Adding files: Adding and removing files. * Archives: Archives. -* Author, how to reach: Reporting bugs and ideas. +* Author, how to reach: Bugs. * Authors: Contributors. +* Automatically inserting newline: Customization. * Automatically remove handled files: Customization. +* Automatically sorting .cvsignore: Customization. * Buffer contents: Buffer contents. -* Bugs, how to report them: Reporting bugs and ideas. +* Bugs, how to report them: Bugs. +* Bugs, known: Bugs. +* Byte compilation: Miscellaneous commands. * Ci: Committing changes. * Commit buffer: Committing changes. +* Commit message, inserting newline: Customization. * Committing changes: Committing changes. * Conflict (file status): File status. * Conflicts, how to resolve them: Viewing differences. +* Conflicts, resolving: Emerge. * Context diff, how to get: Customization. * Contributors: Contributors. * Copyright message, getting rid of it: Customization. @@ -1239,22 +1503,27 @@ Concept Index * Edit buffer: Committing changes. * Editing files: Editing files. * Email archives: Archives. -* Email to the author: Reporting bugs and ideas. +* Email to the author: Bugs. +* Emerge: Emerge. * Enhancements: Future enhancements. * Erasing commit message: Committing changes. * Erasing the input buffer: Customization. * Example run: Getting started. * Expunging uninteresting entries: Removing handled entries. +* FAQ: Bugs. * File selection: Selected files. * File status: File status. * Finding files: Editing files. +* Flush changes: Undoing changes. * Ftp-sites: Archives. * Generating a typeset manual: Typeset manual installation. * Generating the on-line manual: On-line manual installation. * Getting pcl-cvs: Archives. +* Getting rid of lock files: Miscellaneous commands. * Getting rid of the Copyright message.: Customization. * Getting rid of uninteresting lines: Removing handled entries. * Getting status: Getting info about files. +* Getting the *cvs* buffer: Updating the directory. * Handled lines, removing them: Removing handled entries. * Info-file (how to generate): On-line manual installation. * Inhibiting the Copyright message.: Customization. @@ -1264,7 +1533,10 @@ Concept Index * Installation of typeset manual: Typeset manual installation. * Introduction: Getting started. * Invoking dired: Editing files. +* Invoking emerge: Emerge. +* Known bugs: Bugs. * Loading files: Editing files. +* Lock files: Miscellaneous commands. * Log (RCS/cvs command): Getting info about files. * Manual installation (on-line): On-line manual installation. * Manual installation (typeset): Typeset manual installation. @@ -1272,28 +1544,40 @@ Concept Index * Marking files: Marking files. * Merged (file status): File status. * Modified (file status): File status. +* Modules file (-u option): Customization. * Move away FILE - it is in the way (file status): File status. * Movement Commands: Movement commands. * On-line manual (how to generate): On-line manual installation. * Printing a manual: Typeset manual installation. +* Problems, list of common: Bugs. * Putting files under CVS control: Adding and removing files. +* Recompiling elisp files: Miscellaneous commands. * Removed (file status): File status. * Removed by you, changed in repository (file status): File status. * Removed from repository (file status): File status. * Removed from repository, changed by you (file status): File status. * Removing files: Adding and removing files. * Removing uninteresting (processed) lines: Removing handled entries. -* Reporting bugs and ideas: Reporting bugs and ideas. +* Reporting bugs and ideas: Bugs. +* Require final newline: Customization. +* Resolving conflicts: Emerge. * Resurrecting files: Adding and removing files. +* Reverting buffers: Reverting your buffers. +* Reverting buffers after commit: Committing changes. +* Reverting buffers after commit: Customization. * Selected files: Selected files. * Selecting files (commands to mark files): Marking files. * Sites: Archives. +* Sorting the .cvsignore file: Customization. * Status (cvs command): Getting info about files. +* Syncing buffers: Reverting your buffers. * TeX - generating a typeset manual: Typeset manual installation. * This repository is missing!... (file status): File status. +* Undo changes: Undoing changes. * Unidiff, how to get: Customization. * Uninteresting entries, getting rid of them: Removing handled entries. * Unknown (file status): File status. +* Update program (-u option in modules file): Customization. * Updated (file status): File status. * Variables, list of all: Customization. * Viewing differences: Viewing differences. @@ -1306,62 +1590,70 @@ Key Index * Menu: +* a - add a file: Adding and removing files. * A - add ChangeLog entry: Editing files. +* b - diff backup file: Viewing differences. +* c - commit files: Committing changes. * C-k - remove selected entries: Removing handled entries. * C-n - Move down one file: Movement commands. * C-p - Move up one file: Movement commands. -* DEL - unmark previous file: Marking files. -* M - marking all files: Marking files. -* SPC - Move down one file: Movement commands. -* U - unmark all files: Marking files. -* a - add a file: Adding and removing files. -* b - diff backup file: Viewing differences. -* c - commit files: Committing changes. * d - run cvs diff: Viewing differences. +* DEL - unmark previous file: Marking files. +* e - invoke emerge: Emerge. +* ESC DEL - unmark all files: Marking files. * f - find file or directory: Editing files. * g - Rerun cvs update: Updating the directory. * l - run cvs log: Getting info about files. * m - marking a file: Marking files. +* M - marking all files: Marking files. * n - Move down one file: Movement commands. * o - find file in other window: Editing files. * p - Move up on file: Movement commands. +* q - bury the *cvs* buffer: Miscellaneous commands. * r - remove a file: Adding and removing files. +* R - revert buffers: Reverting your buffers. * s - run cvs status: Getting info about files. +* SPC - Move down one file: Movement commands. +* U - undo changes: Undoing changes. * u - unmark a file: Marking files. * x - remove processed entries: Removing handled entries. Tag Table: -Node: Top1004 -Node: Copying3396 -Node: Installation22716 -Node: Pcl-cvs installation23507 -Node: On-line manual installation25291 -Node: Typeset manual installation26310 -Node: About pcl-cvs27048 -Node: Contributors27417 -Node: Archives28440 -Node: Getting started29287 -Node: Buffer contents31728 -Node: File status32277 -Node: Selected files35303 -Node: Commands35976 -Node: Updating the directory37018 -Node: Movement commands38043 -Node: Marking files38629 -Node: Committing changes39456 -Node: Editing files40502 -Node: Getting info about files41335 -Node: Adding and removing files41805 -Node: Removing handled entries43145 -Node: Ignoring files44058 -Node: Viewing differences44593 -Node: Customization45595 -Node: Future enhancements47326 -Node: Reporting bugs and ideas48394 -Node: Function and Variable Index48842 -Node: Concept Index50743 -Node: Key Index55865 +Node: Top1007 +Node: Copying3571 +Node: Installation22803 +Node: Pcl-cvs installation23593 +Node: On-line manual installation25654 +Node: Typeset manual installation26672 +Node: About pcl-cvs27411 +Node: Contributors27780 +Node: Archives29083 +Node: Getting started29662 +Node: Buffer contents32105 +Node: File status32654 +Node: Selected files35679 +Node: Commands36347 +Node: Updating the directory37558 +Node: Movement commands39217 +Node: Marking files39803 +Node: Committing changes40658 +Node: Editing files42124 +Node: Getting info about files42969 +Node: Adding and removing files43448 +Node: Undoing changes44799 +Node: Removing handled entries45259 +Node: Ignoring files46176 +Node: Viewing differences46706 +Node: Emerge48014 +Node: Reverting your buffers48988 +Node: Miscellaneous commands49685 +Node: Customization50427 +Node: Future enhancements54107 +Node: Bugs58298 +Node: Function and Variable Index60079 +Node: Concept Index62872 +Node: Key Index69468 End Tag Table diff --git a/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs.texinfo b/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs.texinfo index 5ad8db1..0b51f77 100644 --- a/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs.texinfo +++ b/gnu/usr.bin/cvs/contrib/pcl-cvs/pcl-cvs.texinfo @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- -@comment pcl-cvs.texinfo,v 1.2 1992/04/07 20:49:23 berliner Exp +@comment Id: pcl-cvs.texinfo,v 1.45 1993/05/31 22:38:15 ceder Exp @comment Documentation for the GNU Emacs CVS mode. @comment Copyright (C) 1992 Per Cederqvist @@ -62,12 +62,12 @@ Free Software Foundation instead of in the original English. @sp @center @titlefont{pcl-cvs - the Emacs Front-End to CVS} @sp 2 -@center release 1.02 +@center release 1.05 @comment -release- @sp 3 @center Per Cederqvist @sp 3 -@center last updated 29 Mar 1992 +@center last updated 31 May 1993 @comment -date- @comment The following two commands start the copyright page @@ -104,7 +104,7 @@ Free Software Foundation instead of in the original English. @ifinfo This info manual describes pcl-cvs which is a GNU Emacs front-end to CVS. It works with CVS version 1.3. This manual is updated to release -1.02 of pcl-cvs. +1.05 of pcl-cvs. @end ifinfo @comment -release- @@ -119,9 +119,8 @@ CVS. It works with CVS version 1.3. This manual is updated to release * Customization:: How you can tailor pcl-cvs to suit your needs. * Future enhancements:: Future enhancements of pcl-cvs. -* Reporting bugs and ideas:: Where to report bugs. - -* Function and Variable Index:: List of functions and variables. +* Bugs:: Bugs (known and unknown). +* Function and Variable Index:: List of functions and variables. * Concept Index:: List of concepts. * Key Index:: List of keystrokes. @@ -129,7 +128,7 @@ CVS. It works with CVS version 1.3. This manual is updated to release Installation -* Pcl-cvs installation:: How to install pcl-cvs on your system. +* Pcl-cvs installation:: How to install pcl-cvs on your system. * On-line manual installation:: How to install the on-line manual. * Typeset manual installation:: How to create typeset documentation about pcl-cvs. @@ -155,9 +154,13 @@ Commands * Editing files:: Loading files into Emacs. * Getting info about files:: Display the log and status of files. * Adding and removing files:: Adding and removing files +* Undoing changes:: Undoing changes * Removing handled entries:: Uninteresting lines can easily be removed. * Ignoring files:: Telling CVS to ignore generated files. * Viewing differences:: Commands to @samp{diff} different versions. +* Emerge:: +* Reverting your buffers:: Reverting your buffers +* Miscellaneous commands:: Miscellaneous commands @end menu @node Copying, Installation, Top, Top @@ -565,7 +568,7 @@ steps are also described in the file @file{INSTALL} in the source directory. @menu -* Pcl-cvs installation:: How to install pcl-cvs on your system. +* Pcl-cvs installation:: How to install pcl-cvs on your system. * On-line manual installation:: How to install the on-line manual. * Typeset manual installation:: How to create typeset documentation about pcl-cvs. @@ -601,6 +604,13 @@ in emacs that causes it to dump core. The bug was fixed in emacs 18.58.@refill @item +Release 1.05 and later of pcl-cvs requires parts of the Elib library, +version 0.07 or later. Elib is available via anonymous ftp from +prep.ai.mit.edu in @file{pub/gnu/elib-0.07.tar.z}, and from a lot of +other sites that mirrors prep. Get Elib, and install it, before +proceeding. + +@item Type @samp{make install} in the source directory. This will byte-compile all @file{.el} files and copy both the @file{.el} and the @file{.elc} into the directory you specified in step 1. @@ -701,7 +711,7 @@ frequently used CVS commands into emacs. Contributions to the package are welcome. I have limited time to work on this project, but I will gladly add any code that you contribute to -me to this package (@pxref{Reporting bugs and ideas}). +me to this package (@pxref{Bugs}). The following persons have made contributions to pcl-cvs. @@ -724,8 +734,17 @@ the files @file{elib-node.el} and @file{compile-all.el}. The file Linus Tolke (@samp{linus@@lysator.liu.se}) contributed useful comments on both the functionality and the documentation.@refill +@item +Jamie Zawinski (@samp{jwz@@lucid.com}) contributed +@file{pcl-cvs-lucid.el}. + +@item +Leif Lonnblad contributed RCVS support. @end itemize +Apart from these, a lot of people have send me suggestions, ideas, +requests, bug reports and encouragement. Thanks a lot! Without your +there would be no new releases of pcl-cvs. @node Archives, , Contributors, About pcl-cvs @comment node-name, next, previous, up @@ -736,11 +755,6 @@ on both the functionality and the documentation.@refill @cindex Getting pcl-cvs @cindex Email archives -This release of pcl-cvs is included in the CVS 1.3 distribution. -However, since pcl-cvs has had less time to mature (the first line of -code was written less than a year ago) it is likely that there will be a -new release of pcl-cvs before the next release of CVS. - The latest release of pcl-cvs can be fetched via anonymous ftp from @code{ftp.lysator.liu.se}, (IP no. 130.236.254.1) in the directory @code{pub/emacs}. If you don't live in Scandinavia you should probably @@ -765,7 +779,7 @@ Pcl-cvs is only useful once you have checked out a module. So before you invoke it you must have a copy of a module somewhere in the file system. -You invoke pcl-cvs by typing @kbd{M-x pcl-cvs RET}. If your emacs +You invoke pcl-cvs by typing @kbd{M-x cvs-update RET}. If your emacs responds with @samp{[No match]} your system administrator has not installed pcl-cvs properly. Try @kbd{M-x load-library RET pcl-cvs RET}. If that also fails - talk to your root. If it succeeds you might put @@ -783,7 +797,7 @@ files that have been checked out from a CVS archive.) The output from @samp{*cvs*}. It might look something like this: @example -PCL-CVS release 1.02. +PCL-CVS release 1.05. @comment -release- In directory /users/ceder/FOO/test: @@ -979,16 +993,22 @@ you can use in pcl-cvs. They are grouped together by type. * Editing files:: Loading files into Emacs. * Getting info about files:: Display the log and status of files. * Adding and removing files:: Adding and removing files +* Undoing changes:: Undoing changes * Removing handled entries:: Uninteresting lines can easily be removed. * Ignoring files:: Telling CVS to ignore generated files. * Viewing differences:: Commands to @samp{diff} different versions. +* Emerge:: +* Reverting your buffers:: Reverting your buffers +* Miscellaneous commands:: Miscellaneous commands @end menu @node Updating the directory, Movement commands, Commands, Commands @comment node-name, next, previous, up @section Updating the directory @findex cvs-update -@findex cvs-update-no-prompt +@findex cvs-mode-update-no-prompt +@findex cvs-delete-lock +@cindex Getting the *cvs* buffer @kindex g - Rerun @samp{cvs update} @@ -1007,11 +1027,21 @@ argument to it (e.g., by typing @kbd{C-u M-x cvs-update RET}).@refill All other commands in pcl-cvs requires that you have a @samp{*cvs*} buffer. This is the command that you use to get one.@refill +CVS uses lock files in the repository to ensure the integrity of the +data files in the repository. They might be left behind i.e. if a +workstation crashes in the middle of a CVS operation. CVS outputs a +message when it is waiting for a lock file to go away. Pcl-cvs will +show the same message in the *cvs* buffer, together with instructions +for deleting the lock files. You should normally not have to delete +them manually --- just wait a little while and the problem should fix +itself. But if the lock files doesn't disappear you can delete them +with @kbd{M-x cvs-delete-lock RET}.@refill + @item g This will run @samp{cvs update} again. It will always use the same buffer that was used with the previous @samp{cvs update}. Give a prefix argument to avoid descending into subdirectories. This runs the command -@samp{cvs-update-no-prompt}.@refill +@samp{cvs-mode-update-no-prompt}.@refill @end table @node Movement commands, Marking files, Updating the directory, Commands @comment node-name, next, previous, up @@ -1051,13 +1081,13 @@ These keys move one file backward, towards the beginning of the buffer @kindex m - marking a file @kindex M - marking all files @kindex u - unmark a file -@kindex U - unmark all files +@kindex ESC DEL - unmark all files @kindex DEL - unmark previous file -@findex cvs-mark -@findex cvs-unmark -@findex cvs-mark-all-files -@findex cvs-unmark-all-files -@findex cvs-unmark-up +@findex cvs-mode-mark +@findex cvs-mode-unmark +@findex cvs-mode-mark-all-files +@findex cvs-mode-unmark-all-files +@findex cvs-mode-unmark-up Pcl-cvs works on a set of @dfn{selected files} (@pxref{Selected files}). You can mark and unmark files with these commands: @@ -1066,22 +1096,22 @@ You can mark and unmark files with these commands: @item m This marks the file that the cursor is positioned on. If the cursor is positioned on a directory all files in that directory will be marked. -(@code{cvs-mark}). +(@code{cvs-mode-mark}). @item u Unmark the file that the cursor is positioned on. If the cursor is on a directory, all files in that directory will be unmarked. -(@code{cvs-unmark}).@refill +(@code{cvs-mode-unmark}).@refill @item M -Mark @emph{all} files in the buffer (@code{cvs-mark-all-files}). +Mark @emph{all} files in the buffer (@code{cvs-mode-mark-all-files}). -@item U -Unmark @emph{all} files (@code{cvs-unmark-all-files}). +@item @key{ESC} @key{DEL} +Unmark @emph{all} files (@code{cvs-mode-unmark-all-files}). @item @key{DEL} Unmark the file on the previous line, and move point to that line -(@code{cvs-unmark-up}). +(@code{cvs-mode-unmark-up}). @end table @node Committing changes, Editing files, Marking files, Commands @@ -1089,12 +1119,14 @@ Unmark the file on the previous line, and move point to that line @section Committing changes @cindex Committing changes @cindex Ci -@findex cvs-commit +@findex cvs-mode-commit @kindex c - commit files @vindex cvs-erase-input-buffer (variable) +@vindex cvs-auto-revert-after-commit (variable) @cindex Commit buffer @cindex Edit buffer @cindex Erasing commit message +@cindex Reverting buffers after commit @table @kbd @item c @@ -1102,7 +1134,7 @@ All files that have a "need to be checked in"-marker (@pxref{Buffer contents}) can be checked in with the @kbd{c} command. It checks in all selected files (@pxref{Selected files}) (except those who lack the "ci"-marker - they are ignored). Pressing @kbd{c} causes -@code{cvs-commit} to be run.@refill +@code{cvs-mode-commit} to be run.@refill When you press @kbd{c} you will get a buffer called @samp{*cvs-commit-message*}. Enter the log message for the file(s) in @@ -1111,10 +1143,18 @@ commit the files (using @code{cvs-edit-done}). Normally the @samp{*cvs-commit-message*} buffer will retain the log message from the previous commit, but if the variable -@code{cvs-erase-input-buffer} is set to a non-nil value the buffer will -be erased. Point and mark will always be located around the entire -buffer so that you can easily erase it with @kbd{C-w} +@code{cvs-erase-input-buffer} is set to a non-@code{nil} value the +buffer will be erased. Point and mark will always be located around the +entire buffer so that you can easily erase it with @kbd{C-w} (@samp{kill-region}).@refill + +If you are editing the files in your emacs an automatic +@samp{revert-buffer} will be performed. (If the file contains +@samp{$@asis{Id}$} keywords @samp{cvs commit} will write a new file with +the new values substituted. The auto-revert makes sure that you get +them into your buffer). The revert will not occur if you have modified +your buffer, or if @samp{cvs-auto-revert-after-commit} is set to +@samp{nil}.@refill @end table @node Editing files, Getting info about files, Committing changes, Commands @@ -1126,9 +1166,9 @@ buffer so that you can easily erase it with @kbd{C-w} @cindex Loading files @cindex Dired @cindex Invoking dired -@findex cvs-find-file -@findex cvs-find-file-other-window -@findex cvs-add-change-log-entry-other-window +@findex cvs-mode-find-file +@findex cvs-mode-find-file-other-window +@findex cvs-mode-add-change-log-entry-other-window @kindex f - find file or directory @kindex o - find file in other window @kindex A - add ChangeLog entry @@ -1144,17 +1184,17 @@ Find the file that the cursor points to. Run @samp{dired} @ifinfo (@pxref{Dired,,,Emacs}) @end ifinfo -if the cursor points to a directory (@code{cvs-find-file}).@refill +if the cursor points to a directory (@code{cvs-mode-find-file}).@refill @item o Like @kbd{f}, but use another window -(@code{cvs-find-file-other-window}).@refill +(@code{cvs-mode-find-file-other-window}).@refill @item A Invoke @samp{add-change-log-entry-other-window} to edit a @samp{ChangeLog} file. The @samp{ChangeLog} will be found in the directory of the file the cursor points to. -(@code{cvs-add-change-log-entry-other-window}).@refill +(@code{cvs-mode-add-change-log-entry-other-window}).@refill @end table @node Getting info about files, Adding and removing files, Editing files, Commands @@ -1165,8 +1205,8 @@ directory of the file the cursor points to. @cindex Getting status @kindex l - run @samp{cvs log} @kindex s - run @samp{cvs status} -@findex cvs-log -@findex cvs-status +@findex cvs-mode-log +@findex cvs-mode-status Both of the following commands can be customized. @xref{Customization}.@refill @@ -1174,14 +1214,14 @@ Both of the following commands can be customized. @table @kbd @item l Run @samp{cvs log} on all selected files, and show the result in a -temporary buffer (@code{cvs-log}). +temporary buffer (@code{cvs-mode-log}). @item s Run @samp{cvs status} on all selected files, and show the result in a -temporary buffer (@code{cvs-status}). +temporary buffer (@code{cvs-mode-status}). @end table -@node Adding and removing files, Removing handled entries, Getting info about files, Commands +@node Adding and removing files, Undoing changes, Getting info about files, Commands @comment node-name, next, previous, up @section Adding and removing files @cindex Adding files @@ -1191,8 +1231,8 @@ temporary buffer (@code{cvs-status}). @cindex Putting files under CVS control @kindex a - add a file @kindex r - remove a file -@findex cvs-add -@findex cvs-remove-file +@findex cvs-mode-add +@findex cvs-mode-remove-file The following commands are available to make it easy to add and remove files from the CVS repository. @@ -1201,7 +1241,7 @@ files from the CVS repository. @item a Add all selected files. This command can be used on @samp{Unknown} files (see @pxref{File status}). The status of the file will change to -@samp{Added}, and you will have to use @kbd{c} (@samp{cvs-commit}, see +@samp{Added}, and you will have to use @kbd{c} (@samp{cvs-mode-commit}, see @pxref{Committing changes}) to really add the file to the repository.@refill @@ -1211,7 +1251,7 @@ them) to resurrect them. Selected files that are neither @samp{Unknown} nor @samp{Removed} will be ignored by this command. -The command that is run is @code{cvs-add}. +The command that is run is @code{cvs-mode-add}. @item r This command removes the selected files (after prompting for @@ -1219,13 +1259,29 @@ confirmation). The files are @samp{rm}ed from your directory and (unless the status was @samp{Unknown}; @pxref{File status}) they will also be @samp{cvs remove}d. If the files were @samp{Unknown} they will disappear from the buffer. Otherwise their status will change to -@samp{Removed}, and you must use @kbd{c} (@samp{cvs-commit}, +@samp{Removed}, and you must use @kbd{c} (@samp{cvs-mode-commit}, @pxref{Committing changes}) to commit the removal.@refill -The command that is run is @code{cvs-remove-file}. +The command that is run is @code{cvs-mode-remove-file}. +@end table + +@node Undoing changes, Removing handled entries, Adding and removing files, Commands +@comment node-name, next, previous, up +@section Undoing changes +@cindex Undo changes +@cindex Flush changes +@kindex U - undo changes +@findex cvs-mode-undo-local-changes + +@table @kbd +@item U +If you have modified a file, and for some reason decide that you don't +want to keep the changes, you can undo them with this command. It works +by removing your working copy of the file and then getting the latest +version from the repository (@code{cvs-mode-undo-local-changes}. @end table -@node Removing handled entries, Ignoring files, Adding and removing files, Commands +@node Removing handled entries, Ignoring files, Undoing changes, Commands @comment node-name, next, previous, up @section Removing handled entries @cindex Expunging uninteresting entries @@ -1235,8 +1291,9 @@ The command that is run is @code{cvs-remove-file}. @cindex Handled lines, removing them @kindex x - remove processed entries @kindex C-k - remove selected entries -@findex cvs-remove-handled -@findex cvs-acknowledge +@findex cvs-mode-remove-handled +@findex cvs-mode-acknowledge +@findex cvs-mode-ignore @table @kbd @item x @@ -1247,13 +1304,13 @@ are removed from the buffer. If a directory becomes empty the heading for that directory is also removed. This makes it easier to get an overview of what needs to be done. -The command is called @code{cvs-remove-handled}. If -@samp{cvs-auto-remove-handled} is set to non-@samp{nil} this will +The command is called @code{cvs-mode-remove-handled}. If +@samp{cvs-auto-remove-handled} is set to non-@code{nil} this will automatically be performed after every commit.@refill @item C-k -This command can be used for lines that @samp{cvs-remove-handled} would -not delete, but that you want to delete (@code{cvs-acknowledge}). +This command can be used for lines that @samp{cvs-mode-remove-handled} would +not delete, but that you want to delete (@code{cvs-mode-acknowledge}). @end table @node Ignoring files, Viewing differences, Removing handled entries, Commands @@ -1269,10 +1326,10 @@ the @file{.cvsignore} doesn't exist it will be created. The @file{.cvsignore} file should normally be added to the repository, but you could ignore it also if you like it better that way. -This runs @code{cvs-ignore}. +This runs @code{cvs-mode-ignore}. @end table -@node Viewing differences, , Ignoring files, Commands +@node Viewing differences, Emerge, Ignoring files, Commands @comment node-name, next, previous, up @section Viewing differences @cindex Diff @@ -1280,29 +1337,122 @@ This runs @code{cvs-ignore}. @cindex Viewing differences @kindex d - run @samp{cvs diff} @kindex b - diff backup file -@findex cvs-diff-cvs -@findex cvs-diff-backup +@findex cvs-mode-diff-cvs +@findex cvs-mode-diff-backup +@vindex cvs-diff-ignore-marks (variable) @table @kbd @item d Display a @samp{cvs diff} between the selected files and the RCS version that they are based on. @xref{Customization} describes how you can send -flags to @samp{cvs diff}. (The function that does the job is -@code{cvs-diff-cvs}).@refill +flags to @samp{cvs diff}. If @var{cvs-diff-ignore-marks} is set to a +non-@code{nil} value or if a prefix argument is given (but not both) any +marked files will not be considered to be selected. +(@code{cvs-mode-diff-cvs}).@refill @item b If CVS finds a conflict while merging two versions of a file (during a @samp{cvs update}, @pxref{Updating the directory}) it will save the original file in a file called @file{.#@var{FILE}.@var{VERSION}} where @var{FILE} is the name of the file, and @var{VERSION} is the RCS version -number that your file was based on. +number that your file was based on.@refill With the @kbd{b} command you can run a @samp{diff} on the files @file{.#@var{FILE}.@var{VERSION}} and @file{@var{FILE}}. You can get a context- or Unidiff by setting @samp{cvs-diff-flags} - @pxref{Customization}. This command only works on files that have -status @samp{Conflict} or @samp{Merged}. The name of the command is -@code{cvs-diff-backup}. @refill +status @samp{Conflict} or @samp{Merged}.@refill + +If @var{cvs-diff-ignore-marks} is set to a non-@code{nil} value or if a +prefix argument is given (but not both) any marked files will not be +considered to be selected. (@code{cvs-mode-diff-backup}).@refill +@end table + +@node Emerge, Reverting your buffers, Viewing differences, Commands +@comment node-name, next, previous, up +@section Running emerge +@cindex Emerge +@cindex Invoking emerge +@cindex Conflicts, resolving +@cindex Resolving conflicts +@kindex e - invoke @samp{emerge} +@findex cvs-mode-emerge + +@table @kbd +@item e +Invoke @samp{emerge} on one file. This command works slightly different +depending on the file status. + +@table @asis +@item @samp{Modified} +Run @samp{emerge-files} with your working file as file A, and the latest +revision in the repository as file B. + +@item @samp{Merged} +@itemx @samp{Conflict} +Run @samp{emerge-files-with-ancestor} with your working file (as it was +prior to your invocation of @samp{cvs-update}) as file A, the latest +revision in the repository as file B, and the revision that you based +your local modifications on as ancestor. +@end table + +@strong{Note:} CVS has already performed a merge. The resulting file is +not used in any way if you use this command. If you use the @kbd{q} +command inside @samp{emerge} (to successfully terminate the merge) the +file that CVS created will be overwritten. +@end table + +@node Reverting your buffers, Miscellaneous commands, Emerge, Commands +@comment node-name, next, previous, up +@section Reverting your buffers +@findex cvs-mode-revert-updated-buffers +@kindex R - revert buffers +@cindex Syncing buffers +@cindex Reverting buffers + +@table @kbd +@item R +If you are editing (or just viewing) a file in a buffer, and that file +is changed by CVS during a @samp{cvs-update}, all you have to do is type +@kbd{R} in the *cvs* buffer to read in the new versions of the +files.@refill + +All files that are @samp{Updated}, @samp{Merged} or in @samp{Conflict} +are reverted from the disk. Any other files are ignored. Only files +that you were already editing are read.@refill + +An error is signalled if you have modified the buffer since it was last +changed. (@code{cvs-mode-revert-updated-buffers}).@refill +@end table + +@node Miscellaneous commands, , Reverting your buffers, Commands +@comment node-name, next, previous, up +@section Miscellaneous commands +@findex cvs-byte-compile-files +@cindex Recompiling elisp files +@cindex Byte compilation +@cindex Getting rid of lock files +@cindex Lock files +@kindex q - bury the *cvs* buffer +@findex bury-buffer + +@table @kbd +@item M-x cvs-byte-compile-files +Byte compile all selected files that end in .el. + +@item M-x cvs-delete-lock +This command can be used in any buffer, and deletes the lock files that +the *cvs* buffer informs you about. You should normally never have to +use this command since CVS tries very carefully to always remove the +lock files itself. + +You can only use this command when a message in the *cvs* buffer tells +you so. You should wait a while before using this command in case +someone else is running a cvs command. + +@item q +Bury the *cvs* buffer. (@code{bury-buffer}). + @end table @node Customization, Future enhancements, Commands, Top @@ -1310,11 +1460,17 @@ status @samp{Conflict} or @samp{Merged}. The name of the command is @chapter Customization @vindex cvs-erase-input-buffer (variable) @vindex cvs-inhibit-copyright-message (variable) -@vindex cvs-cvs-diff-flags (variable) @vindex cvs-diff-flags (variable) +@vindex cvs-diff-ignore-marks (variable) @vindex cvs-log-flags (variable) @vindex cvs-status-flags (variable) @vindex cvs-auto-remove-handled (variable) +@vindex cvs-update-prog-output-skip-regexp (variable) +@vindex cvs-cvsroot (variable) +@vindex TMPDIR (environment variable) +@vindex cvs-auto-revert-after-commit (variable) +@vindex cvs-commit-buffer-require-final-newline (variable) +@vindex cvs-sort-ignore-file (variable) @cindex Inhibiting the Copyright message. @cindex Copyright message, getting rid of it @cindex Getting rid of the Copyright message. @@ -1324,14 +1480,24 @@ status @samp{Conflict} or @samp{Merged}. The name of the command is @cindex Context diff, how to get @cindex Unidiff, how to get @cindex Automatically remove handled files +@cindex -u option in modules file +@cindex Modules file (-u option) +@cindex Update program (-u option in modules file) +@cindex Reverting buffers after commit +@cindex Require final newline +@cindex Automatically inserting newline +@cindex Commit message, inserting newline +@cindex Sorting the .cvsignore file +@cindex .cvsignore file, sorting +@cindex Automatically sorting .cvsignore If you have an idea about any customization that would be handy but -isn't present in this list, please tell me! @xref{Reporting bugs and -ideas} for info on how to reach me.@refill +isn't present in this list, please tell me! @xref{Bugs} for info on how +to reach me.@refill @table @samp @item cvs-erase-input-buffer -If set to anything else than @samp{nil} the edit buffer will be erased +If set to anything else than @code{nil} the edit buffer will be erased before you write the log message (@pxref{Committing changes}). @item cvs-inhibit-copyright-message @@ -1340,71 +1506,180 @@ a while. Set this variable to @samp{t} if you want to get rid of it. (But don't set this to @samp{t} in the system defaults file - new users should see this message at least once). -@item cvs-cvs-diff-flags -A list of strings to pass as arguments to the @samp{cvs diff} program. -This is used by @samp{cvs-diff-cvs} (key @kbd{d}, @pxref{Viewing -differences}). If you prefer the Unidiff format you could add this line -to your @file{.emacs} file:@refill +@item cvs-diff-flags +A list of strings to pass as arguments to the @samp{cvs diff} and +@samp{diff} programs. This is used by @samp{cvs-mode-diff-cvs} and +@samp{cvs-mode-diff-backup} (key @kbd{b}, @pxref{Viewing differences}). If +you prefer the Unidiff format you could add this line to your +@file{.emacs} file:@refill @example -(setq cvs-cvs-diff-flags '("-u")) +(setq cvs-diff-flags '("-u")) @end example -@item cvs-diff-flags -Like @samp{cvs-cvs-diff-flags}, but passed to @samp{diff}. This is used -by @samp{cvs-diff-backup} (key @kbd{b}, @pxref{Viewing differences}). +@item cvs-diff-ignore-marks +If this variable is non-@code{nil} or if a prefix argument is given (but +not both) to @samp{cvs-mode-diff-cvs} or @samp{cvs-mode-diff-backup} +marked files are not considered selected. @item cvs-log-flags -List of strings to send to @samp{cvs log}. Used by @samp{cvs-log} (key -@kbd{l}, @pxref{Getting info about files}). +List of strings to send to @samp{cvs log}. Used by @samp{cvs-mode-log} +(key @kbd{l}, @pxref{Getting info about files}). @item cvs-status-flags -List of strings to send to @samp{cvs status}. Used by @samp{cvs-status} +List of strings to send to @samp{cvs status}. Used by @samp{cvs-mode-status} (key @kbd{s}, @pxref{Getting info about files}). @item cvs-auto-remove-handled -If this variable is set to any non-@samp{nil} value -@samp{cvs-remove-handled} will be called every time you check in files, -after the check-in is ready. @xref{Removing handled entries}.@refill +If this variable is set to any non-@code{nil} value +@samp{cvs-mode-remove-handled} will be called every time you check in +files, after the check-in is ready. @xref{Removing handled +entries}.@refill + +@item cvs-auto-revert-after-commit +If this variable is set to any non-@samp{nil} value any buffers you have +that visit a file that is committed will be automatically reverted. +This variable is default @samp{t}. @xref{Committing changes}.@refill + +@item cvs-update-prog-output-skip-regexp +The @samp{-u} flag in the @file{modules} file can be used to run a command +whenever a @samp{cvs update} is performed (see cvs(5)). This regexp +is used to search for the last line in that output. It is normally set +to @samp{"$"}. That setting is only correct if the command outputs +nothing. Note that pcl-cvs will get very confused if the command +outputs @emph{anything} to @samp{stderr}. + +@item cvs-cvsroot +This variable can be set to override @samp{CVSROOT}. It should be a +string. If it is set then everytime a cvs command is run it will be +called as @samp{cvs -d @var{cvs-cvsroot}@dots{}} This can be useful if +your site has several repositories. + +@item TMPDIR +Pcl-cvs uses this @emph{environment variable} to decide where to put the +temporary files it needs. It defaults to @file{/tmp} if it is not set. + +@item cvs-commit-buffer-require-final-newline +When you enter a log message in the @samp{*cvs-commit-message*} buffer +pcl-cvs will normally automatically insert a trailing newline, unless +there already is one. This behavior can be controlled via +@samp{cvs-commit-buffer-require-final-newline}. If it is @samp{t} (the +default behavior), a newline will always be appended. If it is +@samp{nil}, newlines will never be appended. Any other value causes +pcl-cvs to ask the user whenever there is no trailing newline in the +commit message buffer. + +@item cvs-sort-ignore-file +If this variable is set to any non-@samp{nil} value the +@file{.cvsignore} will always be sorted whenever you use +@samp{cvs-mode-ignore} to add a file to it. This option is on by +default. @end table -@node Future enhancements, Reporting bugs and ideas, Customization, Top +@node Future enhancements, Bugs, Customization, Top @comment node-name, next, previous, up @chapter Future enhancements @cindex Enhancements Pcl-cvs is still under development and needs a number of enhancements to -be called complete. Here is my current wish-list for future releases of -pcl-cvs: +be called complete. Below is my current wish-list for future releases +of pcl-cvs. Please, let me know which of these features you want most. +They are listed below in approximately the order that I currently think +I will implement them in. @itemize @bullet @item -Dired support. I have an experimental @file{dired-cvs.el} that works -together with CVS 1.2. Unfortunately I wrote it on top of a -non-standard @file{dired.el}, so it must be rewritten.@refill +Rewritten parser code. There are many situations where pcl-cvs will +fail to recognize the output from CVS. The situation could be greatly +increased. + +@item +@samp{cvs-status}. This will run @samp{cvs status} in a directory and +produce a buffer that looks pretty much like the current *cvs* buffer. +That buffer will include information for all version-controlled files. +(There will be a simple keystroke to remove all "uninteresting" files, +that is, files that are "Up-to-date"). In this new buffer you will be +able to update a file, commit a file, et c. The big win with this is +that you will be able to watch the differences between your current +working file and the head revision in the repository before you update +the file, and you can then choose to update it or let it wait for a +while longer. + +@item +Log mode. When this mode is finished you will be able to move around +(using @kbd{n} and @kbd{p}) between the revisions of a file, mark two of +them, and run a diff between them. You will be able to hide branches +(similar to the way you can hide sub-paragraphs in outline-mode) and do +merges between revisions. Other ideas about this are welcome. + +@item +The current model for marks in the *cvs* buffer seems to be confusing. +I am considering to use the VM model instead, where marks are normally +inactive. To activate the mark, you issue a command like +@samp{cvs-mode-next-command-uses-marks}. I might implement a flag so +that you can use either version. Feedback on this before I start coding +it is very welcome. @item It should be possible to run commands such as @samp{cvs log}, @samp{cvs status} and @samp{cvs commit} directly from a buffer containing a file, instead of having to @samp{cvs-update}. If the directory contains many files the @samp{cvs-update} can take quite some time, especially on a -slow machine. +slow machine. I planed to put these kind of commands on the prefix +@kbd{C-c C-v}, but that turned out to be used by for instance c++-mode. +If you have any suggestions for a better prefix key, please let me know. + +@item +Increased robustness. For instance, you can not currently press +@kbd{C-g} when you are entering the description of a file that you are +adding without confusing pcl-cvs. + +@item +Support for multiple active *cvs* buffers. + +@item +Dired support. I have an experimental @file{dired-cvs.el} that works +together with CVS 1.2. Unfortunately I wrote it on top of a +non-standard @file{dired.el}, so it must be rewritten.@refill + +@item +An ability to send user-supplied options to all the cvs commands. + +@item +Pcl-cvs is not at all clever about what it should do when @samp{cvs +update} runs a program (due to the @samp{-u} option in the +@file{modules} file --- see @samp{cvs(5)}). The current release uses a +regexp to search for the end. At the very least that regexp should be +configured for different modules. Tell me if you have any idea about +what is the right thing to do. In a perfect world the program should +also be allowed to print to @samp{stderr} without causing pcl-cvs to +crash. @end itemize If you miss something in this wish-list, let me know! I don't promise that I will write it, but I will at least try to coordinate the efforts -of making a good Emacs front end to CVS. See @xref{Reporting bugs and -ideas} for information about how to reach me.@refill +of making a good Emacs front end to CVS. See @xref{Bugs} for +information about how to reach me.@refill +So far, I have written most of pcl-cvs in my all-to-rare spare time. If +you want pcl-cvs to be developed faster you can write a contract with +Signum Support to do the extension. You can reach Signum Support by +email to @samp{info@@signum.se} or via mail to Signum Support AB, Box +2044, S-580 02 Linkoping, Sweden. Phone: +46 (0) 13 - 21 46 00. Fax: +46 +(0) 13 - 21 47 00. -@node Reporting bugs and ideas, Function and Variable Index, Future enhancements, Top +@node Bugs, Function and Variable Index, Future enhancements, Top @comment node-name, next, previous, up -@chapter Reporting bugs and ideas +@chapter Bugs (known and unknown) @cindex Reporting bugs and ideas @cindex Bugs, how to report them @cindex Author, how to reach @cindex Email to the author +@cindex Known bugs +@cindex Bugs, known +@cindex FAQ +@cindex Problems, list of common If you find a bug or misfeature, don't hesitate to tell me! Send email to @samp{ceder@@lysator.liu.se}. @@ -1413,8 +1688,40 @@ If you have ideas for improvements, or if you have written some extensions to this package, I would like to hear from you. I hope that you find this package useful! +Below is a partial list of currently known problems with pcl-cvs version +1.05. + +@table @asis +@item Commit causes Emacs to hang +Emacs waits for the @samp{cvs commit} command to finish before you can +do anything. If you start a background job from the loginfo file you +must take care that it closes @samp{stdout} and @samp{stderr} if you do +not want to wait for it. (You do that with @samp{background-command &>- +2&>- &} if you are starting @samp{background-command} from a +@samp{/bin/sh} shell script). + +Your emacs will also hang if there was a lock file in the repository. +In this case you can type @kbd{C-g} to get control over your emacs +again. + +@item Name clash in Emacs 19 +This is really a bug in Elib or the Emacs 19 distribution. Both Elib and +Emacs 19.6 through at least 19.10 contains a file named +@file{cookie.el}. One of the files will have to be renamed, and we are +currently negotiating about which of the files to rename. + +@item Commands while cvs-update is running +It is possible to type commands in the *cvs* buffer while the update is +running, but error messages is all that you will get. The error +messages should be better. + +@item Unexpected output from CVS +Unexpected output from CVS confuses pcl-cvs. It will currently create a +bug report that you can mail to me. It should do something more +civilized. +@end table -@node Function and Variable Index, Concept Index, Reporting bugs and ideas, Top +@node Function and Variable Index, Concept Index, Bugs, Top @comment node-name, next, previous, up @unnumbered Function and Variable Index |
