[darcs-devel] darcs patch: Harmonise capitalisation (etc) in flags ... (and 25 more)

Tommy Pettersson ptp at lysator.liu.se
Sat Jul 21 15:29:01 PDT 2007


I've looked at most of these patches.

> Sun Jul  8 14:27:19 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Harmonise capitalisation (etc) in flags help.
> 
> Sun Jul  8 16:17:27 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * More concise --look-for-adds description.

Looks fine.

> Sun Jul 15 01:05:19 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Add crossref.png (issue485).
> 
> Sun Jul 15 13:03:24 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Remove GUI code and stuff to build it.

Didn't look.

> Sun Jul 15 19:08:43 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Fix supercommand --help (issue282).
> 
> Sun Jul 15 22:01:19 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Rewrite disambiguate_commands.
> 
> Sun Jul 15 22:01:40 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Refactor parsing of command line arguments.
> 
> Sun Jul 15 22:32:56 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Distinguish between strict and permissive disambiguation (regression).
> 
> Mon Jul 16 22:29:44 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Implement command stubs 'rm', 'unadd', 'move' (issue127).
> 
> Mon Jul 16 22:41:07 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Implement hidden commands.

Looks fine. I like this code. I'll skip commenting on naming and
existence of various commands / stubs / aliases (where relevant)
here, as this is done on the user mailing list. I'm ready to
pull this into darcs-stable as soon as we've settled on the
naming matters.

> Mon Jul 16 23:06:31 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Allow --list-options even if command cannot be run (issue297).

Looks fine.

> Tue Jul 17 00:03:08 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Make --directories the default in query manifest (issue456).

Looks fine, but see below (on rename query to list).

> Tue Jul 17 00:56:35 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Rename resolve to mark-conflicts (issue113).

This will require updating of tests/missed_resolution.pl (if you
haven't noticed so yet).

> Tue Jul 17 01:00:13 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Tweak padding in usage_helper (mark-conflicts needs an extra space).
> 
> Tue Jul 17 07:06:13 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Use Control.Exception.catch in Darcs.Utils
> 
> Tue Jul 17 07:07:32 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Use prettyException in clarify_errors (issue73).
> 
> Tue Jul 17 07:16:31 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Always use permissive disambiguation of commands.
> 
> Tue Jul 17 07:43:19 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Filter out empty filenames (issue396).
> 
> Tue Jul 17 07:44:31 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Add test for issue396.
> 
> Tue Jul 17 12:16:07 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Do not set defaultrepo if --dry-run (issue186).
> 
> Tue Jul 17 12:32:57 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Implement apply --dry-run (issue37).
> 
> Tue Jul 17 20:01:27 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Add all pulled repos to _darcs/prefs/repos (issue368).

Looks fine.

> Wed Jul 18 22:09:40 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Add helpers command_alias and command_stub.
> 
> Wed Jul 18 22:14:53 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Refactor aliases and stubs (rm, unadd, resolve).

Very nice.

> Wed Jul 18 22:47:03 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Rename query to list; manifest to files.
>   
>   Note that the list manifest and list files commands differ in that the
>   former displays directories by default and the latter does not.

Looks fine (pending naming decisions aside).

Is it possible to find this difference with the help command? I
think not, but I may be missing it right under my nose.

Also, I think in the help messages we should say 'list' (or
'show', or whatever) instead of 'query information',
to reinforce the command name association.

> Wed Jul 18 23:01:38 CEST 2007  Eric Kow <eric.kow at loria.fr>
>   * Fix missing newline in inventory (issue412).

Looks fine.


I want to pull all these patches (except 'remove GUI') to
darcs-stable when we decide on the namings. To do this I had to
pull David's 'rewrite --lazy' patch in, and with that a bunch of
other hashed repo patches to keep things together, but I can't
pull the gadt stuff and still be GHC 6.4 compatible, so I had to
make a duplicate 'resolve conflicts' which will conflict "in
every way" with one of yours in darcs-unstable. I did a test to
merge them, and it worked like a breeze, didn't even generate
nested mergers, and the "conflict resolve conflict" was trivial
to resolv. Mergers aren't that bad when they're working. :-)


-- 
Tommy Pettersson <ptp at lysator.liu.se>


More information about the darcs-devel mailing list