ViewVC logotype

Contents of /meta-cvs/F-B3689DBB46386B16F4B2331934B69223

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.138 - (hide annotations)
Sat Oct 26 18:56:29 2002 UTC (11 years, 5 months ago) by kaz
Branch: MAIN
Changes since 1.137: +4 -0 lines
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.
1 kaz 1.115 Release Notes for Meta-CVS
2 kaz 1.1
3 kaz 1.135 Release 0.99, 2002-1?-??:
5     Failure to invoke text editor is handled.
7 kaz 1.136 The -r option of filt is fixed; it has been broken since the change to the
8     new MAP format, because it was reading the raw map representation, not
9     passing it through the right conversion steps that are needed now.
11 kaz 1.138 Bugfix to purge and remap commands: they were fooled by CVS-generated
12     files in the MCVS/CVS directory. Specifically, files having F- names, and a
13     the suffix ,t.
15 kaz 1.137 Help text added for move command.
17 kaz 1.134 Release 0.98, 2002-10-13:
18 kaz 1.128
19 kaz 1.133 The prop command was mistakenly reading from MAP-LOCAL and writing to MAP,
20     which could cause information loss if the two differ. It now reads from MAP
21     and writes to MAP. (The property changes propagate to MAP-LOCAL by the
22     update operation invoked by prop, as before).
24     Invocation of external programs included in debug trace.
25 kaz 1.128
26     The filt command does not filter F- names if they are immediately preceded by
27     the MCVS/ prefix; such occurences are clearly concrete, sandbox-relative
28     references to the actual F- links, rather than abstract references.
30 kaz 1.129 The update command now supports the -C option, to fetch the repository
31     copy, throwing away local changes. It also now honors the --metaonly
32     and --nometa options.
33 kaz 1.130
34     The export command has been added, for checking out documents without creating
35     a working copy (no MCVS directory in the root of the checkout).
36 kaz 1.131
37 kaz 1.133 The watch command has been added. Note that its syntax differs from that
38     of CVS.
39 kaz 1.132
40     The watchers, editors, edit, and unedit commands have been added.
41 kaz 1.134
42     A script called mcvs-upgrade is now included, and installs alongside the mcvs
43     script. This allows the Meta-CVS Lisp image to recompile and patch itself,
44     giving users of binary distributions an easy way to upgrade from source
45     code.
47 kaz 1.127 Release 0.97, 2002-10-06:
48 kaz 1.119
49     Meta-CVS now builds and runs on Microsoft Windows, under Cygwin
50     (www.cygwin.com). It still relies on hard links, which requires
51     Windows 2000 or XP, and the NTFS filesystem. It probably won't
52     work over FAT.
53 kaz 1.120
54     New --debug option for verbose output.
56     Cleaned up of error messages. Error messages don't specify prefixes like
57     ``mcvs-add:'' or ``mcvs-grab:'' any more. Rather, the error handler adds the
58     ``mcvs:'' prefix when printing the messages in a situation when the error is
59     not continuable.
60 kaz 1.119
61 kaz 1.121 Fixed bug introduced in release 0.13: mcvs add -R was adding only
62     directories, effectively ignoring arguments that are regular files.
63 kaz 1.122 The error-continuation behavior of mcvs add has been revised.
64 kaz 1.121
65 kaz 1.125 Trying to rename an object onto itself, or to move the sandbox root
66     directory are no longer silent no-ops, but produce an error.
67 kaz 1.123
68 kaz 1.124 The remap command now preserves property lists, and picks up changes
69     in executable permission.
71     The grab command now notices when a file changes from having execute
72     permission to not having execute permission.
74 kaz 1.126 Operations on the path . now work in a partial sandbox.
76 kaz 1.118 Release 0.96, 2002-09-21:
77 kaz 1.110
78     The restore command was left broken during the change to the new
79     filemap format. It is now fixed.
81 kaz 1.111 The grab command now handles execute permission bits properly.
83 kaz 1.112 Some more commands have detailed help.
85 kaz 1.113 There is now a global option -i which specifies a script to be
86 kaz 1.114 executed. This allows Meta-CVS to be scripted using Lisp. For
87     instance suppose you have the following script and call it
88     list-matching:
89 kaz 1.113
90     #!/usr/local/bin/mcvs -i
91     (in-sandbox-root-dir
92 kaz 1.114 (let ((mapping (mapping-read *mcvs-map*))
93 kaz 1.117 (test-func (eval (read-from-string (pop *args*)))))
94 kaz 1.114 (dolist (entry mapping)
95     (with-slots (path raw-plist) entry
96 kaz 1.117 (when (funcall test-func raw-plist)
97 kaz 1.114 (format t "~a~%" path))))))
99     Then to list the names of files whose "importance" property is
100     a value greater than two, run:
102     ./list-matching '(lambda (plist)
103     (let ((imp (getf plist :importance)))
104     (and imp (> imp 2))))'
105 kaz 1.117
106     WARNING: Scripting accesses the guts of Meta-CVS directly, so scripts may
107     break as Meta-CVS is maintained. There is currently no published set of
108     stable interfaces.
109 kaz 1.113
110 kaz 1.109 Release 0.95, 2002-09-16:
111 kaz 1.104
112 kaz 1.107 The install.sh script no longer uses a borrowed copy of the clisp-link script
113     or the linkkit directory; these have been removed. These materials
114     are available at every CLISP installation; install.sh now finds them
115     and uses them. Users of non-x86 machines ran into problems because of this
116     because linkkit/clisp.h contains architecture-dependent information.
117 kaz 1.104
118 kaz 1.105 A bug in mcvs filt was fixed; it wasn't handling F- names that aren't found
119     in the map.
121 kaz 1.108 A more detailed help system now exists, though it's not complete. The ``mcvs
122     help'' command acts just like ``mcvs --help'' without any arguments. If given
123     an additional parameter which specifies a Meta-CVS command, it produces more
124     detailed documentation for that comand. Help exists already for a few
125     commands.
127 kaz 1.107 The release number is being warped to 0.95, which means that Meta-CVS is now
128     in beta. It is only five updates away from a 1.0 release.
129 kaz 1.106
130 kaz 1.103 Release 0.24, 2002-09-08:
131 kaz 1.98
132 kaz 1.99 The mapping entries for both symlinks and files have extensible property
133     lists now. These are stored in the optional fourth and fifth list elements,
134     respectively of the :FILE and :SYMLINK map entries.
136     Versioning of the execute permission of files is supported, represented as
137     the :EXEC property of a :FILE mapping entry.
138 kaz 1.98
139 kaz 1.100 Some lame syntax is provided for manipulating properties:
141 kaz 1.102 mcvs prop --set foo --clear bar --remove baz main.c list.c
142 kaz 1.100
143     will set the property FOO to true, set the property BAR to false,
144     and remove the property BAZ, in the files main.c and list.c.
145     The execute permission is represented by the property EXEC.
147 kaz 1.97 Release 0.23, 2002-09-02:
148 kaz 1.95
149 kaz 1.96 Bugfix: the grab command notices edited symlinks and incorporates the
150     changes into the mapping.
152     The grab command now figures out moved symlinks. Moved symlinks are those
153     whose pathname has changed, but which continue to point to the same object
154     (which may also have been moved).
155 kaz 1.95
156 kaz 1.94 Release 0.22, 2002-08-31:
157 kaz 1.93
158     Symbolic links are now versioned objects. The format of the MAP file
159     changes to accomodate this; the new Meta-CVS will read old MAP
160     files; when it writes it will write the new format. Old Meta-CVS won't
161     read the new format.
163     When a new module is created from an existing file tree, symbolic
164     links will be recognized and added. The add command will also add
165     symbolic links. Symbolic links can be renamed and moved; this does
166     nothing with their contents. They can point outside of the sandbox
167     using relative or absolute paths.
169 kaz 1.94 TODO:
171 kaz 1.93 There doesn't exist yet a special command to create symbolic links, nor to
172     retarget them; retargetting a link can be done manually by editing MCVS/MAP
173     and updating. Retargetting a link using the ln -s command, won't
174 kaz 1.94 backpropagate to the MAP file; an update will clobber the link.
176     The grab command does not yet compute symbolic link moves; a moved symbolic
177     link is treated as a remove and add. This will be easy to fix.
179     The remap command ignores symlinks.
180 kaz 1.93
181 kaz 1.92 Release 0.21, 2002-08-04:
182 kaz 1.88
183 kaz 1.89 Syntax of grab command changed. The branch is no longer specified as an
184     argument, but using the -r command option. If no revision is specified with
185     -r, then a -A must be specified to make the grab go to the main trunk. This
186     is a safety feature, since grabbing foreign snapshots to the trunk is almost
187     always wrong, though it could be useful during backup recovery, or for fixing
188     mistakes.
190 kaz 1.91 The way operating system functions are targetted has changed. Instead of
191     relying on the ``linuxlibc6'' module provided by CLISP, Meta-CVS now
192     has its own module for calling foreign functions. This module is portable;
193     it does not depend on the layout of glibc data structures. So Meta-CVS
194     is in theory now portable to other Unixes (provided they have /dev/urandom).
196 kaz 1.87 Release 0.20, 2002-07-27:
197 kaz 1.86
198     The commit command does a true global commit when given no file or directory
199     parameters, and not given the --metaonly option. This means commiting all
200     changes in the MCVS directory, even if they are in F-files that are not
201     currently mapped.
203 kaz 1.85 Release 0.19, 2002-07-16:
204 kaz 1.81
205     When moving multiple files or directories to a subdirectory, a
206     restart is now provided to skip over bad ones and continue.
208 kaz 1.83 Grab no longer scans files if there are only added files, or only removed
209     files. There are no moves to deduce in that case.
211 kaz 1.84 Restore properly creates lost+found at the root of a partial sandbox,
212     rather than at the abstract root of the module.
214 kaz 1.83 Some other algorithmic improvements made.
215 kaz 1.82
216     The first few sections of a user guide have been written.
218 kaz 1.80 Release 0.18, 2002-07-07:
219 kaz 1.77
220 kaz 1.78 Cool new feature: checkout takes an extra argument, which specifies a
221     subdirectory of the project. Specifying a subdirectory results in a ``partial
222     sandbox'', whose root directory is the specified subdirectory of the larger
223     project. The rest of the project is ``invisible'' to that sandbox. A
224     subdirectory argument can also be given to mcvs grab, which will cause it to
225     integrate the new source tree against a subtree of the Meta-CVS project
226 kaz 1.79 rather than the entire project. The subtree doesn't have to exist; in
227     that case you get an empty sandbox. Adding files to this sandbox will cause
228     the tree to exist in the project.
229 kaz 1.78
230 kaz 1.77 Bugfix: mcvs grab was not computing moves properly over small file sets,
231     wrongly treating them as removes and adds.
233 kaz 1.76 Release 0.17, 2002-07-02:
234 kaz 1.71
235     The create command no longer takes a vendor branch. Instead the symbol
236     ``Created-by-Meta-CVS'' is used as the vendor tag to satisfy CVS.
238 kaz 1.72 The grab command no longer does useless synchronization on files that
239     are about to be deleted.
241 kaz 1.75 New purge command; does ``cvs rm'' on deleted files, that is to say, F- files
242     that have no mapping.
244     New restore command; re-enters deleted files into the mapping, under
245     the ``lost+found'' directory, using their F- names as sandbox names.
246 kaz 1.73
247 kaz 1.74 Bugfix: when a checkout bails because it is requested over top of an existing
248     working copy, it must not delete that working copy's MCVS sub directory.
250 kaz 1.70 Release 0.16, 2002-06-29:
251 kaz 1.67
252     Added new heuristics to grab command. Paths are analyzed to determine
253     move distance. Greater distances reduce the confidence in a move.
254     These rules help sort out grabs in a project where similar or
255     duplicate files are subject to parallel moves, the ambiguity being
256 kaz 1.68 resolved by favoring shorter moves. Word comparisons are case-insensitive
257     now. Common words (those that appear in many files) are ignored when
258     comparing files.
259 kaz 1.67
260 kaz 1.69 New options, --meta and --metaonly. This area of Meta-CVS is cleaned
261     up a little bit. Most reporting commands like log or diff no longer
262     operate on meta files by default; they must be explicitly told to do
263     so with --meta or --metaonly. Only the commit command implicitly includes
264     metafiles by default, and so if this is not wanted, --nometa must be
265     selected. The update command remains special; if it is given file
266     arguments, it does not include meta files. If given no arguments, it
267     does a global CVS up across the entire project.
269 kaz 1.66 Release 0.15, 2002-06-25:
270 kaz 1.61
271 kaz 1.65 Optimized a string splitting routine which is used heavily for processing
272     paths; the result is a noticeable performance improvement in some commands
273     that process large numbers of files.
274 kaz 1.61
275 kaz 1.62 Renamed ``import'' command to ``create''.
277 kaz 1.65 Bugfix: checkout and create showed errors when removing directory, due to
278     broken :postorder support in directory walking function.
279 kaz 1.63
280 kaz 1.65 Bugfix: on failure, checkout was failing to delete the MCVS directory when
281     the checkout was directed to an existing directory.
283 kaz 1.66 New feature: ``mcvs grab'' command imports third-party snapshots to a
284 kaz 1.65 branch. This is invoked in the root directory of the source tree to import.
285     It determines what files have been added and removed in the snapshot, and
286     tries to compute which removes and adds are actually moves. This is done by
287     analyzing the actual contents of the files according to a crude algorithm to
288     do fuzzy comparisons, so that even files which were modified as well as moved
289     are discovered.
290 kaz 1.64
291 kaz 1.60 Release 0.14, 2002-06-21:
292 kaz 1.59
293     Bugfix: mcvs add was broken for files that have no suffix, causing
294 kaz 1.60 the underlying cvs add to fail. This was broken in 0.7 when type
295     handling was added.
296 kaz 1.59
297 kaz 1.58 Release 0.13, 2002-06-06:
298 kaz 1.55
299     Sandbox synchronization now handles the case of two files having
300     the same timestamp. An error is signaled, with interactive resolution
301     to synchronize either way, or do nothing.
303 kaz 1.56 If a file must be deleted on update, and this cannot be done, it
304     is now a continuable error.
306     Bugfix: pass -I ! to cvs import so that it won't ignore some F- files
307     whose suffix is one of the ones cvs ignores by default.
309 kaz 1.57 New command: mcvs remap. The user can move or delete files directly without
310     going through Meta-CVS. When mcvs remap is invoked, it will hunt down the
311     moves and deletions, and reconstruct the mapping accordingly; that is,
312     it remaps the new structure. This command uses inode numbers to identify
313     files; if a file is copied and then the original is deleted, that won't
314     be recognized as a move.
316 kaz 1.53 Release 0.12, 2002-04-18:
317 kaz 1.51
318     Bugfix: remove was broken in 0.10, fixed now.
320 kaz 1.54 Bugfix: status, diff, etc. work in empty project rather than complaining
321     ``. not known to Meta-CVS''.
323 kaz 1.52 The checkout operation now can now populate an existing directory, including
324     the current working directory (mcvs co -d . modulename). Of course, the
325     target directory cannot be an existing Meta-CVS sandbox.
326     This is a useful feature, which allows sandboxes to blend with an
327     existing directory structure.
329     Checkout now uses the same function for generating the sandbox
330     structure as does update. This is now necessary, because local files
331     can be clobbered by the checkout.
333 kaz 1.50 Release 0.11, 2002-04-12:
334 kaz 1.46
335     Bugfix: when branch invokes rtag, it now takes the CVSROOT information
336     from CVS/Root and passes it via -d. This is necessary because rtag does not
337     look at a local CVS subdirectory for this information, only the
338     -d option or the environment variable.
340 kaz 1.48 Command for listing branches added (list-branches or lb). Also shows
341     what sticky tag the sandbox is updated to.
343     Command for switching branches added (switch or sw).
345     Merge detects that working copy is on non-branch tag and bails.
346 kaz 1.47
347 kaz 1.49 Absolute paths can now be specified as file arguments. These are
348     based from the root directory of the sandbox, not the actual filesystem root
349     directory.
351 kaz 1.45 Release 0.10, 2002-04-03:
352 kaz 1.44
353     Automatic merging implemented. Branch is created using branch command,
354     and merging from another branch is done using simple merge command.
355     Meta-CVS maintains the tags to keep track of what has been merged
356     from what branch to what branch.
357 kaz 1.40
358     Bugfix: checkout -d foo bar was complaining about directory bar already
359     existing, even though it should only care about foo.
361 kaz 1.41 The remove command now requires explicit -R option to recursively remove
362 kaz 1.42 a directory. It has more detailed error reporting.
363 kaz 1.41
364 kaz 1.43 The move command has better error reporting.
366 kaz 1.39 Release 0.9, 2002-03-14:
367 kaz 1.37
368     Bugfix: the .cvsignore file is now subject to tagging, status, etc,
369     (unless --nometa is specified, of course).
370 kaz 1.38
371     The mcvs filt command takes -r <revision> or -D <date> parameters.
372     This means to retrieve the MAP file as of the specified revision or
373     date and use that mapping to perform the filtering translation,
374     rather than using MAP-LOCAL.
375 kaz 1.39
376     The mcvs update command takes filename arguments now and also
377     supports the -p option.
378 kaz 1.37
379 kaz 1.36 Release 0.8, 2002-03-13:
380 kaz 1.28
381 kaz 1.29 Bug fixed in mcvs add; it was not ignoring files that are already
382     listed as :ignore in MCVS/TYPES.
384 kaz 1.34 Bug fixed in mcvs move: a target with a trailing slash is now treated
385     as a directory (if it does not already exist and is a non-directory).
387 kaz 1.30 The -d option of mcvs checkout can now be used to override the checkout
388     directory, which is normally the same as the module name.
390 kaz 1.31 The global options --version, --help, -q, -Q and -e are now supported.
392 kaz 1.33 New global options --error-continue and --error-terminate to disable
393     interactive error handling in two different ways.
395 kaz 1.32 Log level of many messages has changed; many messages have been
396     relegated to debug level.
398 kaz 1.35 The import command now creates a .cvsignore file containing the name
399     MAP-LOCAL.
401 kaz 1.24 Release 0.7, 2002-03-09:
403 kaz 1.27 The import command collects a list of the file suffixes and brings up
404     a text editor to allow the user to edit their CVS keyword expansion
405     behavior. This information is kept in a new metafile called TYPES. The
406     add command also updates TYPES; it identifies any suffixes which are new,
407     and brings up an editor. The F- files now carry suffixes, which
408     simplifies interfacing with CVS, and also allows cvswrappers to work.
410     Recursive add works (mcvs add -R ...).
412     New command line option --nometa allows metafiles to be excluded from
413     diff, tag, and other commands; without the option they are inserted
414     into the list of files to be processed.
415 kaz 1.25
416 kaz 1.27 The commit option now takes an optional list of files or directories,
417     just like tag, diff, and others.
418 kaz 1.26
419 kaz 1.23 Release 0.6, 2002-02-16:
420 kaz 1.19
421 kaz 1.27 The add operation was horribly broken in 0.5, it is fixed.
422 kaz 1.21
423 kaz 1.27 User can interactively select whether to clobber local files or leave
424     everything alone. Effects on the mapping file of a mcvs move are undone,
425     if the restructuring is rolled back, or raises a condition that leads
426     to termination.
428     Meta-CVS now keeps a new meta-file called MCVS/TYPES. This is created
429     during import, and specifies the CVS keyword expansion mode for files
430     having given suffixes, and can also tell Meta-CVS to ignore certain files
431     when importing or adding.
432 kaz 1.22
433 kaz 1.18 Release 0.5, 2002-02-10:
434 kaz 1.14
435 kaz 1.27 Much improved error handling. Filesystem rearranging code performs
436     sanity checks to prevent adds and moves from accidentally clobbering
437     local files. A rearranging gone bad can be rolled back. Effects
438     of a failed mcvs add can also be rolled back.
439 kaz 1.14
440 kaz 1.27 MAP-LOCAL is now sorted in the same way as MAP.
441 kaz 1.15
442 kaz 1.13 Release 0.4, 2002-02-04:
443 kaz 1.10
444 kaz 1.27 CVS is invoked using internal function resembling the xargs utility,
445     which ensures that multiple command lines are generated if necessary to
446     avoid surpassing the operating system limit on argument and environment
447     vector size. This is important when someone wants to diff or stat a
448     subdirectory, which requires Meta-CVS to pick out the individual files
449     at the CVS level.
451     The tag, log, status and annotate commands are now available.
453     The MAP file is sorted on F- file names now, not path names. This
454     improves merging, since files do not move within the file when
455     they are renamed.
456 kaz 1.12
457 kaz 1.5 Release 0.3, 2002-02-02:
459 kaz 1.27 Process termination done is properly in top level handler, by a nonlocal
460     exit. The program properly indicates failed termination when it exits
461     due to an error condition.
463     Corrections are made in the command line option processing. If z is an
464     option that takes an argument, and the argument is -zx, then x is
465     treated as the argument to the option. Long options arguments are
466     recognized properly, according to the --opt=arg convention. The option
467     processing is restructured. Most of the commands now take the
468     appropriate cvs command-specific options.
470     The update algorithm performs dupe checking over the map, which could
471     happen during a merge.
473     Some more bugfixing has been done to the move command. It was still not
474     handling right some cases of an unversioned file being clobbered. Also,
475     it wasn't renaming a directory containing just one file.
477     I did some performance investigation for larger file sets, and
478     ended up rewriting the code that computes filesystem restructuring
479     changes and map duplicates.
480 kaz 1.5
481 kaz 1.4 Release 0.2, 2002-01-30:
483 kaz 1.27 Changed official name from MCVS to Meta-CVS. The move command now
484     performs some filesystem tests so it does the right thing when a versioned
485     file is moved over a non-versioned file, or when a file is moved into
486     a directory not known to Meta-CVS. Factored out reading and writing of
487     map files into functions.
488 kaz 1.4
489 kaz 1.2 Release 0.1, 2002-01-28:
491 kaz 1.27 Support for mcvs diff -u added. The -R option works for mcvs add command.
492     Bug fixed in mcvs mv command; it wasn't working analogously to the Unix
493     mv command when copying a directory to an existing directory.
494 kaz 1.2
495     Release 0.0, 2002-01-27:
496 kaz 1.1
497 kaz 1.27 This is alpha software. It is not complete, and lacks documentation.
498     However, it is already usable in its present state and is being used for
499     version control by its author. If you can program in Common Lisp and would
500     like to help, take a look through the TODO file. Send me patches, ideas,
501     feature requests.

  ViewVC Help
Powered by ViewVC 1.1.5