/[meta-cvs]/meta-cvs/F-58F396B2ADF675136DD8552C6FFD5310.lisp
ViewVC logotype

Log of /meta-cvs/F-58F396B2ADF675136DD8552C6FFD5310.lisp

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (annotate)
Sticky Tag:

Revision 1.23 - (view) (annotate) - [select for diffs]
Tue Nov 28 07:47:22 2006 UTC (7 years, 4 months ago) by kaz
Branch: MAIN
CVS Tags: HEAD, asdf-import-branch~branch-point, asdf-import-branch~merged-to-HEAD-0, mcvs-1-1-98
Branch point for: asdf-import-branch
Changes since 1.22: +6 -6 lines
Diff to previous 1.22 , to selected 1.8
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*.

Revision 1.22 - (view) (annotate) - [select for diffs]
Tue Nov 28 04:12:08 2006 UTC (7 years, 4 months ago) by kaz
Branch: MAIN
Changes since 1.21: +14 -14 lines
Diff to previous 1.21 , to selected 1.8
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

Revision 1.21 - (view) (annotate) - [select for diffs]
Fri Nov 24 04:53:50 2006 UTC (7 years, 5 months ago) by kaz
Branch: MAIN
Changes since 1.20: +1 -1 lines
Diff to previous 1.20 , to selected 1.8
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.

Revision 1.20 - (view) (annotate) - [select for diffs]
Mon Mar 8 06:11:40 2004 UTC (10 years, 1 month ago) by kaz
Branch: MAIN
CVS Tags: mcvs-1-1-0
Changes since 1.19: +0 -8 lines
Diff to previous 1.19 , to selected 1.8
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.

Revision 1.19 - (view) (annotate) - [select for diffs]
Thu Jan 29 05:40:14 2004 UTC (10 years, 2 months ago) by kaz
Branch: MAIN
Changes since 1.18: +1 -1 lines
Diff to previous 1.18 , to selected 1.8
Oops; picked up a SUBSTRING use from 1.0 branch.

Revision 1.18 - (view) (annotate) - [select for diffs]
Tue Jan 27 06:43:37 2004 UTC (10 years, 2 months ago) by kaz
Branch: MAIN
Changes since 1.17: +12 -8 lines
Diff to previous 1.17 , to selected 1.8
Merging from mcvs-1-0-branch.

Revision 1.12.2.4 - (view) (annotate) - [select for diffs]
Tue Jan 27 06:43:17 2004 UTC (10 years, 2 months ago) by kaz
Branch: mcvs-1-0-branch
CVS Tags: mcvs-1-0-11, mcvs-1-0-12, mcvs-1-0-13, mcvs-1-0-branch~merged-to-HEAD-0, mcvs-1-0-branch~merged-to-HEAD-1
Changes since 1.12.2.3: +12 -8 lines
Diff to previous 1.12.2.3 , to branch point 1.12 , to next main 1.23 , to selected 1.8
* code/branch.lisp (equal-sticky): Add missing cases for handling
the valid tag value NIL.

Revision 1.17 - (view) (annotate) - [select for diffs]
Fri Jan 9 05:18:14 2004 UTC (10 years, 3 months ago) by kaz
Branch: MAIN
Changes since 1.16: +26 -6 lines
Diff to previous 1.16 , to selected 1.8
Merging from mcvs-1-0-branch.

Revision 1.12.2.3 - (view) (annotate) - [select for diffs]
Fri Jan 9 05:09:20 2004 UTC (10 years, 3 months ago) by kaz
Branch: mcvs-1-0-branch
CVS Tags: mcvs-1-0-10
Changes since 1.12.2.2: +26 -6 lines
Diff to previous 1.12.2.2 , to branch point 1.12 , to selected 1.8
Parsing directory sticky tag from CVS/Tag requires
slightly different logic from the sticky tags in CVS/Entries.
CVS/Entries doesn't distinguish branch and version
sticky tags.

This change gets rid of the incorrect warning about
not all files being on the same tag when the working
copy is sticky to a version tag.

* code/branch.lisp (parse-sticky): Function renamed to
parse-dir-sticky.
(parse-entries-sticky): New function.
(equal-sticky): New function.
(read-cvs-entries): Use parse-entries-sticky.
(same-tag-check): Use equal-sticky instead of equal.
(what-are-we-sticky-to): Use parse-dir-sticky.

Revision 1.16 - (view) (annotate) - [select for diffs]
Tue Feb 18 07:00:41 2003 UTC (11 years, 2 months ago) by kaz
Branch: MAIN
Changes since 1.15: +2 -2 lines
Diff to previous 1.15 , to selected 1.8
Fix portability mistakes.

* code/grab.lisp (read-word-hash): Use the standard code-char
function instead of the int-char CLISP extension.

* code/branch.lisp (parse-sticky, mcvs-list-branches): Use the
portable subseq function instead of CLISP's ext::substring.

Revision 1.15 - (view) (annotate) - [select for diffs]
Tue Jan 14 05:53:00 2003 UTC (11 years, 3 months ago) by kaz
Branch: MAIN
CVS Tags: mcvs-1-0-3
Changes since 1.14: +5 -6 lines
Diff to previous 1.14 , to selected 1.8
Merging from mcvs-1-0-branch.

Support -k CVS option in merge and remerge commands.
Reported by Jamie Wellnitz.

* code/mcvs-main.lisp (*merge-options*, *remerge-options*): Add
one argument -k option.

* code/merge.lisp (mcvs-merge): Support extra argument for passing
command options. Pass them down to mcvs-update.
(mcvs-merge-wrapper, mcvs-remerge-wrapper): Don't ignore command
options but pass them to mcvs-merge.

Revision 1.12.2.2 - (view) (annotate) - [select for diffs]
Tue Jan 14 05:50:42 2003 UTC (11 years, 3 months ago) by kaz
Branch: mcvs-1-0-branch
CVS Tags: mcvs-1-0-1, mcvs-1-0-2, mcvs-1-0-4, mcvs-1-0-5, mcvs-1-0-6, mcvs-1-0-7, mcvs-1-0-8, mcvs-1-0-9
Changes since 1.12.2.1: +5 -6 lines
Diff to previous 1.12.2.1 , to branch point 1.12 , to selected 1.8
Support -k CVS option in merge and remerge commands.
Reported by Jamie Wellnitz.

* code/mcvs-main.lisp (*merge-options*, *remerge-options*): Add
one argument -k option.

* code/merge.lisp (mcvs-merge): Support extra argument for passing
command options. Pass them down to mcvs-update.
(mcvs-merge-wrapper, mcvs-remerge-wrapper): Don't ignore command
options but pass them to mcvs-merge.

Revision 1.14 - (view) (annotate) - [select for diffs]
Mon Nov 4 02:09:17 2002 UTC (11 years, 5 months ago) by kaz
Branch: MAIN
Changes since 1.13: +57 -0 lines
Diff to previous 1.13 , to selected 1.8
Merging from mcvs-1-0-branch.

Revision 1.12.2.1 - (view) (annotate) - [select for diffs]
Sun Nov 3 20:31:16 2002 UTC (11 years, 5 months ago) by kaz
Branch: mcvs-1-0-branch
CVS Tags: mcvs-0-99, mcvs-1-0
Changes since 1.12: +57 -0 lines
Diff to previous 1.12 , to selected 1.8
* code/branch.lisp (*branch-help*): New string constant.

* code/mcvs-main.lisp (*mcvs-command-table*): *branch-help* hooked in.

Revision 1.13 - (view) (annotate) - [select for diffs]
Thu Oct 31 04:06:01 2002 UTC (11 years, 5 months ago) by kaz
Branch: MAIN
Changes since 1.12: +4 -0 lines
Diff to previous 1.12 , to selected 1.8
* 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.

Revision 1.12 - (view) (annotate) - [select for diffs]
Sat Oct 5 18:09:48 2002 UTC (11 years, 6 months ago) by kaz
Branch: MAIN
CVS Tags: mcvs-0-97, mcvs-0-98, mcvs-1-0-branch~branch-point
Branch point for: mcvs-1-0-branch
Changes since 1.11: +13 -13 lines
Diff to previous 1.11 , to selected 1.8
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.

Revision 1.11 - (view) (annotate) - [select for diffs]
Sun Sep 8 20:34:51 2002 UTC (11 years, 7 months ago) by kaz
Branch: MAIN
CVS Tags: mcvs-0-24, mcvs-0-95, mcvs-0-96
Changes since 1.10: +1 -1 lines
Diff to previous 1.10 , to selected 1.8
Fix mistake dating back to April.

* code/branch.lisp (mcvs-merge): Symbol T was being invoked
as function in the case that merge is invoked on a sandbox
that is sticky to a non-branch tag.

Revision 1.10 - (view) (annotate) - [select for diffs]
Tue Apr 16 20:43:44 2002 UTC (12 years ago) by kaz
Branch: MAIN
CVS Tags: mcvs-0-12, mcvs-0-13, mcvs-0-14, mcvs-0-15, mcvs-0-16, mcvs-0-17, mcvs-0-18, mcvs-0-19, mcvs-0-20, mcvs-0-21, mcvs-0-22, mcvs-0-23, old-convert-hacking-branch~branch-point, partial-sandbox-branch~branch-point, partial-sandbox-branch~merged-to-HEAD-0, symlink-branch~branch-point, symlink-branch~merged-to-HEAD-0
Branch point for: old-convert-hacking-branch, partial-sandbox-branch, symlink-branch
Changes since 1.9: +64 -24 lines
Diff to previous 1.9 , to selected 1.8
* branch.lisp (parse-sticky): New function.
(read-cvs-entries): New function.
(same-tag-check): New function.
(what-tag-are-we-on): Renamed to what-are-we-sticky-to. Calls
parse-sticky to return structured tag.
(mcvs-merge): Make use of structured tags.
(mcvs-list-branches): Make use of structured tags. Indicate
when sandbox is inconsistently sticky.

Revision 1.9 - (view) (annotate) - [select for diffs]
Thu Apr 4 18:55:29 2002 UTC (12 years ago) by kaz
Branch: MAIN
CVS Tags: deferred-adds-branch~branch-point, mcvs-0-11
Branch point for: deferred-adds-branch
Changes since 1.8: +89 -56 lines
Diff to previous 1.8
New switch command added, plus sticky tag related
bugfixes and enhancement of mcvs list-branches.

mcvs-main.lisp (*switch-options*): New constant.
(*mcvs-command-table*): New entries.
(*usage*): New help text.

branch.lisp (what-branch-are-we-on): Function renamed to
what-tag-are-we-on. Tests the first letter which is T or N; if
it is not T, then it's not a branch tag. If there is a tag,
it returns two values; the second value is NIL if it is not
a branch tag, T otherwise.
(mcvs-merge): Modified to use what-tag-are-we-on.
(mcvs-list-branches): Show additional information about the
current sticky tag.
(mcvs-merge-wrapper): Fix wrong parenthesization introduced
earlier today.
(mcvs-switch-wrapper): New function.

Revision 1.8 - (view) (annotate) - [selected]
Thu Apr 4 17:52:14 2002 UTC (12 years ago) by kaz
Branch: MAIN
Changes since 1.7: +5 -2 lines
Diff to previous 1.7
Branch listing command shows the current branch.

Revision 1.7 - (view) (annotate) - [select for diffs]
Thu Apr 4 16:58:50 2002 UTC (12 years ago) by kaz
Branch: MAIN
Changes since 1.6: +3 -1 lines
Diff to previous 1.6 , to selected 1.8
* branch.lisp (branch-tag-check): Check reserved symbol HEAD.

Revision 1.6 - (view) (annotate) - [select for diffs]
Thu Apr 4 16:55:09 2002 UTC (12 years ago) by kaz
Branch: MAIN
Changes since 1.5: +26 -3 lines
Diff to previous 1.5 , to selected 1.8
New command to list branches.

* mcvs-main.lisp (*list-branches-options*): New constant.
(*mcvs-command-table*): Entries for new command added.
(*usage*): Help text added.

* branch.lisp (mcvs-list-branches,
mcvs-list-branches-wrapper): New functions.

Revision 1.5 - (view) (annotate) - [select for diffs]
Wed Apr 3 21:52:55 2002 UTC (12 years ago) by kaz
Branch: MAIN
Changes since 1.4: +7 -2 lines
Diff to previous 1.4 , to selected 1.8
* branch.lisp (where-is-the-repository): New function.
(cvs-make-or-advance-tag): Pass down CVSROOT to cvs rtag using
the -d global option.

Revision 1.4 - (view) (annotate) - [select for diffs]
Wed Apr 3 17:00:54 2002 UTC (12 years ago) by kaz
Branch: MAIN
CVS Tags: mcvs-0-10
Changes since 1.3: +15 -10 lines
Diff to previous 1.3 , to selected 1.8
* branch.lisp (what-module-is-this): New function.
(cvs-make-or-advance-tag): Use rtag rather than tag for tagging
the branch being merged. This fixes the failure to merge added files.
(mcvs-merge): Use mcvs-update rather than directly using cvs.

Revision 1.3 - (view) (annotate) - [select for diffs]
Wed Apr 3 00:55:05 2002 UTC (12 years ago) by kaz
Branch: MAIN
Changes since 1.2: +29 -11 lines
Diff to previous 1.2 , to selected 1.8
Implemented remerge command; redo a merge without moving
around any tags.

* branch.lisp (mcvs-merge): New keyword parameter remerge-p
to indicate that a re-merge should be done, plus logic for
doing so.
(mcvs-remerge-wrapper): New function.

* mcvs-main.lisp (*remerge-options*): New constant.
(*mcvs-command-table*): New entry for remerge command.

Revision 1.2 - (view) (annotate) - [select for diffs]
Tue Apr 2 23:45:46 2002 UTC (12 years ago) by kaz
Branch: MAIN
Changes since 1.1: +8 -6 lines
Diff to previous 1.1 , to selected 1.8
Use more human readable symbols for tracking merges.

Revision 1.1 - (view) (annotate) - [select for diffs]
Tue Apr 2 23:38:20 2002 UTC (12 years ago) by kaz
Branch: MAIN
Diff to selected 1.8
First cut at implementing more automated branching and merging.

* mcvs-main.lisp (*branch-options*, *merge-options*): New constants.
(*mcvs-command-table*): New entries for branch and merge commands.
(*usage*): New help text.

* branch.lisp: New file.
(*branch-char*): New constant.
(tags-from-cvs-log, what-branch-are-we-on, branch-tag-check,
mcvs-branch, mcvs-branch-wrapper, cvs-make-or-advance-tag, mcvs-merge,
mcvs-merge-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.

  Diffs between and
  Type of Diff should be a

Sort log by:

  ViewVC Help
Powered by ViewVC 1.1.5