lp://qastaging/~jelmer/brz/no-safe-unicode
- Get this branch:
- bzr branch lp://qastaging/~jelmer/brz/no-safe-unicode
Branch merges
- Jelmer Vernooij: Approve
-
Diff: 776 lines (+102/-160) (has conflicts)26 files modifiedbreezy/_walkdirs_win32.pyx (+2/-5)
breezy/bzr/tests/per_versionedfile.py (+4/-4)
breezy/bzr/versionedfile.py (+4/-4)
breezy/bzr/workingtree_3.py (+1/-2)
breezy/bzr/workingtree_4.py (+3/-4)
breezy/config.py (+1/-1)
breezy/email_message.py (+3/-6)
breezy/errors.py (+0/-38)
breezy/git/branch.py (+2/-1)
breezy/git/fetch.py (+1/-1)
breezy/git/refs.py (+7/-7)
breezy/git/roundtrip.py (+1/-1)
breezy/git/tests/test_remote.py (+1/-1)
breezy/git/tree.py (+2/-3)
breezy/gpg.py (+1/-1)
breezy/osutils.py (+30/-2)
breezy/plugins/launchpad/lp_api.py (+1/-1)
breezy/plugins/po_merge/tests/test_po_merge.py (+16/-16)
breezy/plugins/weave_fmt/repository.py (+1/-1)
breezy/smtp_connection.py (+1/-8)
breezy/tests/blackbox/test_export.py (+7/-0)
breezy/tests/test_email_message.py (+2/-3)
breezy/tests/test_osutils.py (+2/-42)
breezy/tests/test_smtp_connection.py (+7/-5)
breezy/utextwrap.py (+2/-2)
breezy/workingtree.py (+0/-1)
- Jelmer Vernooij: Approve
-
Diff: 767 lines (+70/-196)26 files modifiedbreezy/_walkdirs_win32.pyx (+2/-5)
breezy/bzr/tests/per_versionedfile.py (+4/-4)
breezy/bzr/versionedfile.py (+4/-4)
breezy/bzr/workingtree_3.py (+1/-2)
breezy/bzr/workingtree_4.py (+3/-4)
breezy/config.py (+1/-1)
breezy/email_message.py (+3/-6)
breezy/errors.py (+0/-38)
breezy/git/branch.py (+2/-1)
breezy/git/fetch.py (+1/-1)
breezy/git/refs.py (+7/-7)
breezy/git/roundtrip.py (+1/-1)
breezy/git/tests/test_remote.py (+1/-1)
breezy/git/tree.py (+2/-3)
breezy/gpg.py (+1/-1)
breezy/osutils.py (+4/-37)
breezy/plugins/launchpad/lp_api.py (+1/-1)
breezy/plugins/po_merge/tests/test_po_merge.py (+16/-16)
breezy/plugins/weave_fmt/repository.py (+1/-1)
breezy/smtp_connection.py (+1/-8)
breezy/tests/blackbox/test_export.py (+1/-1)
breezy/tests/test_email_message.py (+2/-3)
breezy/tests/test_osutils.py (+2/-42)
breezy/tests/test_smtp_connection.py (+7/-5)
breezy/utextwrap.py (+2/-2)
breezy/workingtree.py (+0/-1)
Branch information
Recent revisions
- 7567. By Aleksandr Smyshliaev
-
Remove unnecessary osutils.open_file. (Aleksandr Smyshliaev)
Merged from https:/
/code.launchpad .net/~jelmer/ brz/open- file/+merge/ 413475 - 7566. By Aleksandr Smyshliaev
-
Fix win32utils on Python 3. (Aleksandr Smyshliaev)
Merged from https:/
/code.launchpad .net/~jelmer/ brz/win32utils/ +merge/ 413477 - 7565. By Aleksandr Smyshliaev
-
Two small error handling fixes for windows. (Aleksandr Smyshliaev)
Merged from https:/
/code.launchpad .net/~jelmer/ brz/some- win-fixes/ +merge/ 413476 - 7564. By Jelmer Vernooij
-
Remove has_symlinks and has_hardlinks in favour of supports_hardlinks and supports_symlinks.
Merged from https:/
/code.launchpad .net/~jelmer/ brz/symlink/ +merge/ 412914 - 7563. By Aleksandr Smyshliaev
-
Fix: location_to_url didn't call local_path_to_url for plain ASCII paths
On Windows, this produced "ssh:" urls instead of "file:"
Merged from https:/
/code.launchpad .net/~a1s/ brz/3.2- windows- local-paths/ +merge/ 411937 - 7562. By Jelmer Vernooij
-
Fix path reference in kind change.
Merged from https:/
/code.launchpad .net/~jelmer/ brz/3.2- fix-kind- change/ +merge/ 412727 - 7561. By Aleksandr Smyshliaev
-
Let osutils path functions on Windows accept byte strings as well as unicode strings
Merged from https:/
/code.launchpad .net/~a1s/ brz/3.2- windows- separators/ +merge/ 411935 - 7560. By Aleksandr Smyshliaev
-
Make "make installer" pass on Windows
Merged from https:/
/code.launchpad .net/~a1s/ brz/3.2- windows- installer/ +merge/ 411927
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/brz