Bazaar

lp:~garyvdm/bzr/523746-difftool-file-names

Created by Gary van der Merwe and last modified
Get this branch:
bzr branch lp:~garyvdm/bzr/523746-difftool-file-names
Only Gary van der Merwe can upload to this branch. If you are Gary van der Merwe please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Gary van der Merwe
Project:
Bazaar
Status:
Development

Recent revisions

5173. By Gary van der Merwe

Add test_execute_unicode_paths.

5172. By Vincent Ladeuil

Force mbcs encoding on windows.

5171. By Vincent Ladeuil

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>

(vila) Fix bt.test_diff imports

5169. By Canonical.com Patch Queue Manager <email address hidden>

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

5168. By Canonical.com Patch Queue Manager <email address hidden>

(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>

(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>

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

5165. By Canonical.com Patch Queue Manager <email address hidden>

(lifeless) Fix running selftest when paramiko is not installed. (Martin [gz])

5164. By Canonical.com Patch Queue Manager <email address hidden>

(lifeless) When writing temporary files for external diff do not set the file utime if we don't know when the in-tree file was last modified. (Martin [gz])

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:bzr
This branch contains Public information 
Everyone can see this information.