Parent Directory | Revision Log
|Links to HEAD:||(view) (annotate)|
|Links to asdf-import-branch~branch-point:||(view) (annotate)|
More renaming to get rid of mcvs- prefix. * code/chatter.lisp (*mcvs-debug*): Renamed to *chatter-debug*. (*mcvs-info*, *mcvs-terse*, *mcvs-silent*): Similarly. (*mcvs-chatter-level*): Renamed to *chatter-level*. * code/unix.lisp (*mcvs-editor*): Renamed to *edit-program*. * code/types.lisp (*mcvs-types-name*): Renamed to *types-file*. (*mcvs-types*): Renamed to *types-path*. (*mcvs-new-types*): Renamed to *types-new-path*. * code/mapping.lisp (*mcvs-dir*): Renamed to *admin-dir*. (*mcvs-map-name*): Renamed to *map-file*. (*mcvs-map-local-name*): Renamed to *map-local-file*. (*mcvs-displaced-name*): Renamed to *displaced-file*. (*mcvs-map*): Renamed to *map-path*. (*mcvs-map-local*): Renamed to *map-local-path*. (*mcvs-displaced*): Renamed to *displaced-path*.
Getting rid of mcvs- prefixes. * code/package.lisp (defpackage): shadow the merge symbol. * code/purge.lisp (mcvs-purge): renamed to purge (mcvs-purge-wrapper): renamed to purge-wrapper * code/restore.lisp (mcvs-restore): renamed to restore (mcvs-restore-wrapper): renamed to restore-wrapper * code/update.lisp (mcvs-update): renamed to update (mcvs-update-wrapper): renamed to update-wrapper * code/main.lisp (mcvs-help): renamed to help (*mcvs-command-table*): renamed to *command-table* (mcvs-terminate catch): renamed to terminate. * code/execute.lisp (mcvs-execute): renamed to execute * code/move.lisp (mcvs-move): renamed to move (mcvs-move-wrapper): renamed to move-wrapper * code/grab.lisp (mcvs-grab): renamed to grab (mcvs-grab-wrapper): renamed to grab-wrapper * code/prop.lisp (mcvs-prop): renamed to prop (mcvs-prop-wrapper): renamed to prop-wrapper * code/filt.lisp (mcvs-filt-loop): renamed to filt-loop (mcvs-filt): renamed to filt (mcvs-remote-filt): renamed to remote-filt (mcvs-filt-wrapper): renamed to filt-wrapper (mcvs-remote-filt-wrapper): renamed to remote-filt-wrapper * code/branch.lisp (mcvs-branch): renamed to branch (mcvs-branch-wrapper): renamed to branch-wrapper (mcvs-merge): renamed to merge (mcvs-list-branches): renamed to list-branches (mcvs-merge-wrapper): renamed to merge-wrapper (mcvs-remerge-wrapper): renamed to remerge-wrapper (mcvs-list-branches-wrapper): renamed to list-branches-wrapper (mcvs-switch-wrapper): renamed to switch-wrapper * code/link.lisp (mcvs-link): renamed to ln (mcvs-link-wrapper): renamed to link-wrapper * code/watch.lisp (mcvs-watch): renamed to watch (mcvs-watch-wrapper): renamed to watch-wrapper * code/add.lisp (mcvs-add): renamed to add (mcvs-add-wrapper): renamed to add-wrapper * code/remove.lisp (mcvs-remove): renamed to rm (mcvs-remove-wrapper): renamed to remove-wrapper * code/convert.lisp (mcvs-convert): renamed to convert (mcvs-convert-wrapper): renamed to convert-wrapper * code/error.lisp (mcvs-terminate): renamed to terminate (mcvs-error-handler): renamed to error-handler (*mcvs-error-treatment*): renamed to *error-treatment* (*mcvs-errors-occured-p*): renamed to *errors-occured-p* * code/checkout.lisp (mcvs-checkout): renamed to checkout (mcvs-checkout-wrapper): renamed to checkout-wrapper (mcvs-export-wrapper): renamed to export-wrapper * code/generic.lisp (mcvs-generic): renamed to generic (mcvs-commit-wrapper): renamed to commit-wrapper (mcvs-diff-wrapper): renamed to diff-wrapper (mcvs-tag-wrapper): renamed to tag-wrapper (mcvs-log-wrapper): renamed to log-wrapper (mcvs-status-wrapper): renamed to status-wrapper (mcvs-annotate-wrapper): renamed to annotate-wrapper (mcvs-watchers-wrapper): renamed to watchers-wrapper (mcvs-edit-wrapper): renamed to edit-wrapper (mcvs-unedit-wrapper): renamed to unedit-wrapper (mcvs-editors-wrapper): renamed to editors-wrapper (mcvs-sync-to-wrapper): renamed to sync-to-wrapper (mcvs-sync-from-wrapper): renamed to sync-from-wrapper * code/create.lisp (mcvs-create): renamed to create (mcvs-create-wrapper): renamed to create-wrapper * code/remap.lisp (mcvs-remap): renamed to remap (mcvs-remap-wrapper): renamed to remap-wrapper * code/mapping.lisp (mcvs-locate): renamed to locate
Stylistic change. * code/add.lisp: Change in-package calls not to use the all-caps "META-CVS" string string, but rather the :meta-cvs keyword. * code/branch.lisp: Likewise. * code/chatter.lisp: Likewise. * code/checkout.lisp: Likewise. * code/clisp-unix.lisp: Likewise. * code/cmucl-unix.lisp: Likewise. * code/convert.lisp: Likewise. * code/create.lisp: Likewise. * code/dirwalk.lisp: Likewise. * code/error.lisp: Likewise. * code/execute.lisp: Likewise. * code/filt.lisp: Likewise. * code/find-bind.lisp: Likewise. * code/generic.lisp: Likewise. * code/grab.lisp: Likewise. * code/link.lisp: Likewise. * code/main.lisp: Likewise. * code/mapping.lisp: Likewise. * code/memoize.lisp: Likewise. * code/move.lisp: Likewise. * code/multi-hash.lisp: Likewise. * code/options.lisp: Likewise. * code/paths.lisp: Likewise. * code/print.lisp: Likewise. * code/prop.lisp: Likewise. * code/purge.lisp: Likewise. * code/rcs-utils.lisp: Likewise. * code/remap.lisp: Likewise. * code/remove.lisp: Likewise. * code/restart.lisp: Likewise. * code/restore.lisp: Likewise. * code/seqfuncs.lisp: Likewise. * code/slot-refs.lisp: Likewise. * code/split.lisp: Likewise. * code/sync.lisp: Likewise. * code/types.lisp: Likewise. * code/unix.lisp: Likewise. * code/update.lisp: Likewise. * code/watch.lisp: Likewise.
Revamped loading system. Got rid of require/provide in all Lisp source files. * code/mcvs.lisp: New file. Responsible for compiling and loading everything in the right order. * code/mcvs-main.lisp: File renamed to main.lisp. * code/mcvs-package.lisp: File renamed to package.lisp. * code/system.lisp: File removed.
Merging from mcvs-1-0-branch. Improved error handling again in a flash of sanity. The whole idea of ``bail'' as a restart is gone. All code which must perform some complex cleanup action does so as part of normal unwinding. And so termination becomes safe. * code/update.lisp (mcvs-update): Change bail restart to continue. * code/mcvs-main.lisp (*global-options*): Remove "error-bail". (*usage*): Remove description of --error-bail. (mcvs-execute): Bind *mcvs-error-treatment* to :terminate rather than :bail if controlling TTY cannot be opened. * code/move.lisp (mcvs-move): Change "Undoing move" error message to "Undoing changes to map". * code/add.lisp (mcvs-add): Get rid of bail restart; move cleanup code into unwind-protect block. * code/error.lisp (*mcvs-error-treatment*): Touch up docstring. (mcvs-error-handler): Remove anything having to do with :bail. Change description of `T' command to suggest that it is safe. * code/options.lisp (filter-mcvs-options): Remove handling of "error-bail" option. * code/mapping.lisp (mapping-update): Get rid of outermost restart-case, which had just a bail restart. Replace it with unwind-protect block which does exactly the same restoration.
Merging from mcvs-1-0-branch. Slightly redesigned error handling protocol. * code/update.lisp (mcvs-update): Change continue restart to bail. * code/add.lisp (mcvs-add): Likewise. * code/error.lisp (mcvs-error-handler): Specially recognize two additional restart symbols, bail and info. A bail restart performs any rolling back and cleanup and terminates. Continuation is now properly reserved for actions that proceed boldly to finish the job, possibly irretrievably clobbering precious data. The info restart is now a standard way to indicate that more details about the error can be obtained, so this does not have to be represented as a special action with an ad-hoc restart. * code/create.lisp (mcvs-create): Change show restart to info. * code/remap.lisp (mcvs-remap): Change ignore restart to continue. * code/mapping.lisp (mapping-update): Change ignore and do-clobber restarts to continue, and print-clobbers restart to info. Change continue restart to bail.
Merging from mcvs-1-0-branch. * code/mapping.lisp (mapping-read): Provide a restart for file errors, which lets the user interactively substitute an empty map if the file can't be read. This is intended to handle the case when MCVS/MAP is missing; for example, the user updated to a sticky date for which no revision of the MAP exists. The effect of continuing will be that all files will disappear. (mapping-synchronize): New :direction key parameter, passed down to synchronize-filed. The new :no-sync return value from synchronize-files is handled. (mapping-update): Select the :right direction for synchronizing moves, adds or rollbacks. Revamped the synchronization logic. Synchronization now happens in a specific direction. For example, if we are doing a diff, we just need to push changes from the tree to the MCVS directory, not the other way around. Or: before an update or commit, we push from the tree to MCVS, then after the update, in the other direction. * code/update.lisp (mcvs-update): The before update is done in the :left direction only, and the after update in the :right. * code/move.lisp (mcvs-move): The just-in-case sync is done in the :left direction only. * code/link.lisp (mcvs-link): Likewise. * code/remove.lisp (mcvs-remove): Likewise. * code/add.lisp (mcvs-add): Get rid of mapping-synchronize call; it's completely unnecessary, since the new files are not even in the MAP-LOCAL, and the add logic explicitly links them into the MCVS directory. * code/generic.lisp (mcvs-generic): New keyword parameter, need-sync-before. Before-synchronization done in :left direction, after-synchronization in :right direction. Before-synchronization is now not done by default; need-sync-before must be specified. (mcvs-commit-wrapper): Specify before and after sync. (mcvs-diff-wrapper, mcvs-status-wrapper, mcvs-edit-wrapper): Explicitly specify before sync. (mcvs-tag-wrapper, mcvs-annotate-wrapper): Implicitly specify no sync. (mcvs-unedit-wrapper): Add before sync. * code/sync.lisp (synchronize-files): New key parameter :direction, values can be :left, :right or :either. Default is :either. If the value is :left or :right, then a sync is done only in that direction, otherwise the value :no-sync is returned. Behavior change: if the left file is missing (F- file in MCVS directory) it is not re-created, but rather :no-sync is returned. Also, if both files exist, have the same timestamp, and are distinct objects, if the direction is :left or :right, then the appropriate restart is automatically chosen. So this will do the right thing on filesystems where link() is performed by copying, without bothering the user with the error.
Merging from mcvs-1-0-branch.
* code/mcvs-package.lisp: New file, defines META-CVS package. * code/purge.lisp: Put all symbols in new package. * code/restore.lisp: Likewise. * code/paths.lisp: Likewise. * code/install.sh: Likewise. * code/restart.lisp: Likewise. * code/update.lisp: Likewise. * code/move.lisp: Likewise. * code/grab.lisp: Likewise. * code/unix.lisp: Likewise. * code/slot-refs.lisp: Likewise. * code/prop.lisp: Likewise. * code/multi-hash.lisp: Likewise. * code/rcs-utils.lisp: Likewise. * code/branch.lisp: Likewise. * code/find-bind.lisp: Likewise. * code/execute.lisp: Likewise. * code/link.lisp: Likewise. * code/split.lisp: Likewise. * code/watch.lisp: Likewise. * code/clisp-unix.lisp: Likewise. * code/add.lisp: Likewise. * code/chatter.lisp: Likewise. * code/print.lisp: Likewise. * code/types.lisp: Likewise. * code/remove.lisp: Likewise. * code/convert.lisp: Likewise. * code/error.lisp: Likewise. * code/options.lisp: Likewise. * code/dirwalk.lisp: Likewise. * code/checkout.lisp: Likewise. * code/generic.lisp: Likewise. * code/sync.lisp: Likewise. * code/create.lisp: Likewise. * code/memoize.lisp: Likewise. * code/seqfuncs.lisp: Likewise. * code/cmucl-unix.lisp: Likewise. * code/remap.lisp: Likewise. * code/mapping.lisp: Put symbols in new package. Replace use of CLISP specific substring function with subseq. * code/filt.lisp: Likewise. * code/mcvs-main.lisp: Put symbols in new package. The mcvs function is renamed to main. * code/install.sh: Generate mcvs script that uses qualified name of new startup functiont to start the software.
Merging from mcvs-1-0-branch. * code/mcvs-main.lisp (*usage*): Expand tabs to spaces. * code/add.lisp (*add-help*): Likewise. * code/remove.lisp (*remove-help*): Likewise. * code/create.lisp (*create-help*): Likewise. * code/purge.lisp (mcvs-purge): Get rid the processing of the nonexistent -n option from purge code. The global option -n does an adequate job of implementing a dry run. * code/mapping.lisp (mapping-removed-files): Skip over the MCVS/CVS directory, which can contain CVS-generated files with F- names and a ,t suffix. These trip up the algorithm.
* code/add.lisp (*add-help*): Remove spurious text cut and pasted from checkout help.
* code/add.lisp (mcvs-add): Provide a continue restart around the code that builds up the expanded-paths for each iteration of the loop. Without this, errors in that code cause the program to bail, even though errors in the rest of the loop body are continuable.
* code/add.lisp (mcvs-add): Reshuffle restart to a higher nesting level, so that an error on one item won't abort the whole operation.
Error messages no longer specify prefixes like "mcvs:" or "mcvs-remove:". When no restarts are available, the error handler now adds the "mcvs:" prefix when dumping the error text to the standard error stream, and also adds a terminating newline. The inability to write to the MAP file is converted to a more informative error message. New --debug option is supported to set the chatter level to 3.
* code/mcvs-main.lisp (*checkout-options*): Removed -A and -N options. (*mcvs-command-table*): Added help for checkout and add. * code/checkout.lisp (*checkout-help*): New string constant. * code/add.help (*add-help*): Likewise. * code/create.lisp (*create-help*): Mention interactive file type specification.
Low level support for versioning executable bit. * code/unix-bindings/unix.lisp (unix-funcs:chmod): New callout function. * code/clisp-unix.lisp (executable-p, make-executable, make-non-executable): New generic functions. (executable-p (file-info), make-executable (file-info), make-executable (string), make-non-executable (file-info), make-non-executable (string)): New methods. * code/add.lisp (mcvs-add): Record whether new file is executable or not, by setting executable slot in mapping-entry. * code/create.lisp (mcvs-create): Likewise. * code/sync.lisp (synchronize-files): New parameter, should-be-executable, tells function which way to set permissions after synchronizing files. * code/mapping.lisp (mapping-entry): New slot, executable. (mapping-entry-parse-attributes): New function, parses new optional property list from :FILE entries in a mapping. (mapping-convert-in): Parse property list that may be present in fourth list element of a :FILE entry. (mapping-convert-out): Write out executable flag as :EXEC property, if true. (mapping-synchronize): Pass executable flag down to synchronize-files.
Merging symlink-branch to main trunk.
Merging from partial-sandbox-branch.
* add.lisp (mcvs-add): Error message changed to tell user to use -R to add directory. * remove.lisp (mcvs-remove): New generalized boolean parameter indicates to do a recursive remove. This is controlled by the -R option which already exists. Behavior changed to not act on directories unless recursion is explicitly requested. (mcvs-remove-wrapper): Extract "R" option, pass down new boolean to mcvs-remove.
* update.lisp (mcvs-update): Changing level of chatter messages. * move.lisp (mcvs-move): Likewise. * add.lisp (mcvs-add): Likewise. * remove.lisp (mcvs-remove): Likewise. * checkout.lisp (mcvs-checkout): Likewise. * generic.lisp (mcvs-generic): Likewise. * import.lisp (mcvs-import): Likewise. * mapping.lisp (mapping-dupe-check): Likewise. (mapping-update): Likewise.
*** empty log message ***
Support for file type keyword treatment under mcvs add. * add.lisp (mcvs-add): Restructured to build up list of new file suffixes, allow the user to edit the file which determines how they are treated, filter out ignored files and pass -k options to multiple cvs adds. * types.lisp (*mcvs-new-types*): New constant. (*types-comments*): Constant moved here from import.lisp. (types-remove-ignores): New function. Code factored out from mcvs-import. (types-let-user-edit): Likewise. (types-make-cvs-adds): New function. * import.lisp (*types-comments*): Constant removed. Moved to types.lisp (mcvs-import): Code factored out to new functions in types.lisp, which are also used by add.lisp.
* print.lisp: New file. (print-assoc-list): New function. * types.lisp: Use print-assoc-list to nicely print the types. * import.lisp (mcvs-import): Don't bother getting user to edit the types if the type list is empty. In fact, don't even create the file. * add.lisp (mcvs-add): Use new form of mapping-generate-name.
* add.lisp (mcvs-add): Last change completely broke add due to not breaking out of the retry loop.
Don't provide special restart for keeping the add, because that will happen anyway if the user chooses to terminate. Restarts that do about the same thing as termination will certainly be confusing.
* update.lisp (mcvs-update): Re-print the "Invoking CVS" chatter if the user re-tries the error. * add.lisp (mcvs-add): CVS failure is now a restartable error; user can decide whether to roll back the effects, retry the CVS add, or keep the effects anyway despite the failed add. * install.sh: Stop the script if there are compilation errors.
Remove spurious newlines from error messages.
Renamed all ``filemap-'' functions to ``mapping-'' prefix. * mapping.lisp (filemap-generate-name, filemap-sort, filemap-extract-paths, filemap-lookup, filemap-prefix-lookup, filemap-prefix-matches, filemap-object-lookup, filemap-same-object-p, filemap-same-path-p, filemap-moved-p, filemap-rename-files, filemap-sane-p): Old names removed. (mapping-generate-name, mapping-sort, mapping-extract-paths, mapping-lookup, mapping-prefix-lookup, mapping-prefix-matches, mapping-object-lookup, mapping-same-object-p, mapping-same-path-p, mapping-moved-p, mapping-rename-files, mapping-sane-p): New names created. (mapping-read, mapping-write, mapping-synchronize, mapping-update): Edit calls to renamed functions. * add.lisp (mcvs-add): Likewise. * diff.lisp (mcvs-diff): Likewise. * filt.lisp (mcvs-filt): Likewise. * import.lisp (mcvs-import): Likewise. * move.lisp (simple-rename, simple-move-to-dir, move-guts): Likewise. * remove.lisp (mcvs-remove): Likewise.
Factored out repeated code for reading and writing of the MAP and MAP-LOCAL files. * mapping.lisp (mapping-read, mapping-write): New functions. (mapping-synchronize, mapping-update): Use new functions. * move.lisp (mcvs-move): Likewise. * filt.lisp (mcvs-filt): Likewise. * add.lisp (mcvs-add): Likewise. * remove.lisp (mcvs-remove): Likewise. * checkout.lisp (mcvs-checkout): Likewise. * diff.lisp (mcvs-diff): Likewise. * import.lisp (mcvs-import): Likewise.
MCVS is being renamed to Meta-CVS.
Bugfix for mcvs add -R.
First cut at pass-through of CVS options.
Moving closer toward delivery.
mcvs-add: do not allow addition of files that are in MCVS area.
A bit of refactoring. Added mcvs-move.
Adding all existing source files.
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.
|Powered by ViewVC 1.1.5|