Merge lp:~jelmer/brz/encoding-no-extensions into lp:brz

[Jelmer Vernooij]

Defer sorting paths until utf8 encoding has happened.

This fixes the testsuite when run without extensions built. The only tests that
fail without this change are under
breezy.tests.per_workingtree.test_workingtree.TestIllegalPaths

[Martin Packman (gz)]

Thanks!

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/340/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/342/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/343/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/344/

=== modified file 'breezy/osutils.py'
--- breezy/osutils.py	2018-07-13 00:21:51 +0000
+++ breezy/osutils.py	2018-07-17 18:24:46 +0000
@@ -1900,7 +1900,7 @@
 
         dirblock = []
         append = dirblock.append
-        for name in sorted(_listdir(top)):
+        for name in _listdir(top):
             try:
                 name_utf8 = _utf8_encode(name)[0]
             except UnicodeDecodeError:
@@ -1910,7 +1910,7 @@
             statvalue = _lstat(abspath)
             kind = _kind_from_mode(statvalue.st_mode)
             append((relprefix + name_utf8, name_utf8, kind, statvalue, abspath))
-        return dirblock
+        return sorted(dirblock)
 
 
 def copy_tree(from_path, to_path, handlers={}):