/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Vincent Ladeuil
  • Date: 2009-04-16 14:13:57 UTC
  • mto: (4331.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4332.
  • Revision ID: v.ladeuil+lp@free.fr-20090416141357-dowo6huqi1232fgm
Far too many modifications for a single commit, need to restart.

* bzrlib/tests/workingtree_implementations/test_parents.py:
(TestSetParents.test_unicode_symlink): Add more checks for
involved trees.

* bzrlib/tests/tree_implementations/test_get_symlink_target.py:
(TestGetSymlinkTarget.test_get_unicode_symlink_target): Bah, no
need to test unicode file-ids here.

* bzrlib/tests/test_transform.py:
(TestBuildTree.test_case_insensitive_build_tree_inventory): Fix
the test condition for good.

* bzrlib/tests/test_shelf.py:
Fix imports.
(TestPrepareShelf._test_shelve_symlink_target_change): Factored
out.
(TestPrepareShelf.test_shelve_symlink_target_change)
(TestPrepareShelf.test_shelve_unicode_symlink_target_change): Also
test unicode symlinks.

* bzrlib/tests/test_bundle.py:
(BundleTester._test_symlink_bundle): Factored out.
(BundleTester.test_symlink_bundle,
BundleTester.test_unicode_symlink_bundle): Also test unicode
symlinks.

* bzrlib/tests/test__dirstate_helpers.py:
Fix some imports.
(load_tests): Start parametrizing against DirReaders.

* bzrlib/merge_directive.py:
(MergeDirectiveFormatRegistry): Add Aaron explanation for the
double registration.

* bzrlib/hashcache.py:
(HashCache.get_sha1): Instrumented for pronto.

* bzrlib/revisiontree.py:
(RevisionTree.get_symlink_target): Add comment.

* bzrlib/osutils.py:
(_walkdirs_utf8, UnicodeDirReader.read_dir): Intrumented for pronto.

* bzrlib/dirstate.py:
(DirState._read_link): Intrumented for pronto.

* bzrlib/tests/per_repository/test_commit_builder.py:
(TestCommitBuilder._add_commit_change_check_changed): Add a
file_id optional parameter.
(TestCommitBuilder._test_last_mod_rev_after_content_link_changes_ric):
Factored out.
(TestCommitBuilder.test_last_modified_rev_after_content_link_changes_ric,
TestCommitBuilder.test_last_modified_rev_after_content_unicode_link_changes_ric):
Also test unicode symlinks.

* bzrlib/tests/branch_implementations/test_sprout.py:
(TestSprout.test_sprout_with_unicode_symlink): Use an unicode name
for the link too. Add more checks for involved trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1381
1381
        path-from-top might be unicode or utf8, but it is the correct path to
1382
1382
        pass to os functions to affect the file in question. (such as os.lstat)
1383
1383
    """
 
1384
    import pronto; pronto.bzr_test('osutils._walkdirs_utf8')
1384
1385
    global _selected_dir_reader
1385
1386
    if _selected_dir_reader is None:
1386
1387
        fs_encoding = _fs_enc.upper()
1449
1450
 
1450
1451
        See DirReader.read_dir for details.
1451
1452
        """
 
1453
        import pronto; pronto.bzr_test('UnicodeDirReader._read_dir')
1452
1454
        _utf8_encode = self._utf8_encode
1453
1455
        _lstat = os.lstat
1454
1456
        _listdir = os.listdir