Parent Directory | Revision Log
|Links to HEAD:||(view) (annotate)|
|Links to mcvs-1-0-branch~merged-to-HEAD-1:||(view) (annotate)|
* remap.lisp (mcvs-remap): Provide a restart for continuing in the case when an F- file is referenced in the MAP, but no working copy of it exists. By continuing through all these errors, the MAP is cleaned of the nonexistent entries, which provies a way to clean up after the naive ``mcvs convert'' algorithm. * convert.lisp (*convert-help*): Add text recommending the use of ``mcvs remap'' to clean up.
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.
* code/remap.lisp (mcvs-remap): Preserve property lists of mapping entries, and pick up changes in execute permission. * code/mapping.lisp (mapping-convert-out): If the mapping entry's executable flag is nil, then remove the :exec entry from the property list.
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.
Merging symlink-branch to main trunk.
Merging from partial-sandbox-branch.
* remap.lisp (mcvs-remap): Loads MAP as well as MAP-LOCAL. If it the mappings differ, an error is signaled. The user can choose to ignore the error, in which case MAP is clobbered.
Adding mcvs remap command. * dirwalk.lisp (dirwalk-fi, dirwalk, for-each-file-info): Default behavior is now preorder (visit directory before its entries). A keyword is provided to select the old postorder behavior. A catch is provided in dirwalk-fi that allows the caller to skip processing the currently traversed directory. The for-each-* macros provide a local function called (skip) to do this. (delete-recursive): This function depends on postorder behavior in for-each-file-info, so it explicitly selects it now. * mcvs.lisp (*remap-options*): New constant. (*mcvs-command-table*): Add entry for new function. (*usage*): Describes new function. * remap.lisp: New file. (mcvs-remap, mcvs-remap-wrapper): New functions.
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|