On Fri, Sep 26, 2008 at 11:03:29 -0400, David Roundy wrote:
> I'd like to get this into 2.1, just because I'm not entirely
> comfortable with how Dmitry's change to drop_dotdots might affect the
> darcs internals.  This way we can keep the patch theory itself frozen
> unless bugs are found, while still reworking the UI.  And yes,
> UglyFileName is a stupid name.  It's supposed to be stupid, so noone
> will want to use it.

Yep! This patch is straightforward enough, doesn't actually change
anything... so I would be willing to put it in the release.

Some quibbling below about where the slice the baby.

split FileName into two modules.
--------------------------------
Here is my summary of the reshuffling with some doubts below.  I did not
audit this very carefully (because nothing actually changes):

Darcs.Patch.FileName:
> hunk ./src/Darcs/Commands/Add.lhs 43
> hunk ./src/Darcs/Commands/Changes.lhs 44
> hunk ./src/Darcs/Commands/Mv.lhs 43
> hunk ./src/Darcs/FilePathMonad.lhs 27
> hunk ./src/Darcs/Match.lhs 59
> hunk ./src/Darcs/Patch/Prim.lhs 55
> hunk ./src/Darcs/Patch/QuickCheck.lhs 33
> hunk ./src/Darcs/Patch/Test.lhs 58
> hunk ./src/Darcs/Population.lhs 39
> hunk ./src/Darcs/Patch/Commute.lhs 37
> hunk ./src/Darcs/Patch/Core.lhs 37
> hunk ./src/Darcs/Repository/Prefs.lhs 46

UglyFileName [DEPRECATED]:
> hunk ./src/Darcs/Commands/Dist.lhs 34
> hunk ./src/Darcs/Commands/Send.lhs 65
> hunk ./src/Darcs/CommandsAux.lhs 24
> hunk ./src/Darcs/External.hs 67
> hunk ./src/Darcs/FilePathUtils.hs 27 [DEPRECATED]
> hunk ./src/Darcs/Lock.lhs 64

Both:
> hunk ./src/Darcs/RepoPath.hs 36 [Ugly, but D.P.F for SubPath]

Unsure:
> hunk ./src/Darcs/IO.lhs 60 (using Darcs.Patch.FileName)
> hunk ./src/Darcs/Patch/Apply.lhs (D.P.FileName... but maybe both?)

> hunk ./src/Darcs/Repository/HashedIO.lhs

Maybe this should also be importing both modules?  When I see
Darcs.Patch.FileName, I expect us to only manipulate paths which we
would see in a patch.  But here we seem to be using it for all sorts
of subpaths, for example, for _darcs/patch/foo, which sound more
like they are on the Ugly side of the fence.

> hunk ./src/Darcs/Repository/HashedRepo.lhs 62

Likewise?

> hunk ./src/Darcs/Repository/Pristine.lhs 51

Potentially ugly if we consider _darcs/pristine to be an ugly filename
(again, I'm not looking closely, maybe we're only touching tree paths)

Other comments:

> +module Darcs.Patch.FileName ( FileName( ),
> +                              fp2fn, fn2fp,
> +                              fn2ps, ps2fn,
> +                              niceps2fn, fn2niceps,
> +                              break_on_dir, norm_path, own_name, super_name,
> +                              movedirfilename,
> +                              encode_white, decode_white,
> +                              (///),
> +                            ) where

Should we scrutinise this export list and get rid of some unused stuff?

Roll back Dmitry's drop_dotdot change in Darcs.Patch.Filename.  
----------------------------------------------------------------
Right... because we've still got in UglyFileName

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9

Attachment: signature.asc
Description: Digital signature

_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users

Reply via email to