Merge lp:~myfreeweb/bzr/osx-unicode-paths-fix into lp:bzr

So, now it's
 [myfreeweb@grigorijs-mac-mini ~/test] $ bzr add
 adding "yéah"

fine. Without this fix, it would throw a KeyError.

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

MyFreeWeb wrote:
> MyFreeWeb has proposed merging lp:~lol2fast4u/bzr/osx-unicode-paths-fix into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
>
> Please merge this. It is a fix for #172383 and #102935
>

 review: needs_fixing

At a minimum this will break the test suite which checks the return of
the function you are modifying.

  bzrlib/tests/test_osutils.py should be where the update is needed

  bzr selftest -s bt.test_osutils

Is a way to easily run those tests.

However, there is a larger logical concern. The original goal of the
code you are changing was to handle the differences in how Mac handles
filenames. Specifically Mac normalizes filenames on disk, and does so
differently than the 'standard' way people create files on most platforms.

For example, most systems use NFC characters, such as u'\xe1', while Mac
will rewrite that to u'a\0u0301' (which is considered to be the same
effective character, with NFD normalization)

I certainly agree that today the normalization code is broken. The
question is whether the fix is to remove it completely, or whether to
get it working. Your patch is a step towards removing it (albeit
incomplete). There are people that would rather we make it work, which
would make this a step in the wrong direction.

I don't think we (as a project) have decided which route we want to
take, so we should discuss this on the bzr mailing list.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkvoFUMACgkQJdeBCYSNAAOPvQCbBiOEj4xgRS05CcfJmdPQo+Mf
pb0AoMrPuSIfqdi1ocMvaE4b/uqF6Uns
=AxV8
-----END PGP SIGNATURE-----