[MERGE] include tortoise icons in windows binary distributions

[Mark Hammond]

> ^- Using 'chdir()' is rather ugly. Can't you just do:

"rather ugly" is getting fairly subjective given the intent was always
relative filenames, but I've changed it.

> +        fse = sys.getfilesystemencoding()
> +        map_items = [(f.replace('\\', '/').decode(fse), rid)
> +                     for rid, (_, f) in enumerate(icos)]
> +        ico_map = dict(map_items)
> 
> Technically, getfilesystemencoding() is not valid on all platforms. I
> think BSD returns None. So you probably want 'osutils._fs_encoding',
> which we should probably make more public somehow. (I realize TBZR may
> not be bundled using setup.py for BSD, but it is probably good to use
> it anyway.)

Yeah - but as it will end up in tbzr's setup I'd prefer to avoid depending
on bzrlib at build time, and the code as written is appropriate for tbzr.

> (Again, this seems like it should really be in the TBZR setup, ...

Again, agreed - see below.

> I'm a bit concerned about how TBZR will lookup these icons.

There's no need to be.

> I'm a bit uncomfortable using a pickle, as it is a known unsafe data
> structure.

Unsafe how?  The pickled bytes are being written to the executable - if we
are concerned about the implications of random/targetted bytes being changed
in the executable, the behaviour of pickle wouldn't be near the top of the
list ;)

> Again, we need to
> watch out for how bzr is packaging TBZR and how TBZR expects to be
> packaged getting out of sync.)

Yes, we discussed this via private email over the last couple of days and
explicitly agreed we would go for the lowest impact patch for the 1.7 cycle
and look at splitting setup.py for 1.8+.  I'm surprised you feel the need to
keep reminding me about your longer term desires in this area, but again for
the record, I understand and fully agree.

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: include_tbzr_icons.patch
Type: application/octet-stream
Size: 5476 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080904/c4a2683c/attachment.obj