lp://staging/~songofacandy/bzr/523746-difftool-file-names

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

5175. By methane on 2011-04-04

Make test for the case of userencoding can't encode filename.

5174. By methane on 2011-04-03

merge lp:bzr

5173. By Gary van der Merwe on 2010-05-04

Add test_execute_unicode_paths.

5172. By Vincent Ladeuil on 2010-04-22

Force mbcs encoding on windows.

5171. By Vincent Ladeuil on 2010-04-21

Encode the paths before calling the external diff tool.

* bzrlib/tests/test_diff.py:
(TestEncodedDiffFromTool): Ensure the paths parameters are
properly encoded.

* bzrlib/diff.py:
(DiffFromTool._get_command): Encode the paths with the user
encoding so they can be properly decoded by the invoked command.
(DiffFromTool.edit_file): The file is written in 'wb' mode, we may
as well open it in the same way.

5170. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-21

(vila) Fix bt.test_diff imports

5169. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-21

(lifeless) Avoid zombies for selftest --parallel=fork (Vincent Ladeuil)

5168. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-20

(lifeless) Set unbuffered mode in --parallel so that line endings are not mangled on win32. (Gordon Tyler)

5167. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-20

(lifeless) Don't allow RemoteRepository to stack on an incompatible-format repository. (#562380) (Andrew Bennetts)

5166. By Canonical.com Patch Queue Manager <email address hidden> on 2010-04-20

(lifeless) Add --clean-obsolete-packs option to the pack command. (Parth Malwankar)