~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-10-26 07:45:29 UTC
  • mfrom: (4769.1.1 merge-2.0-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20091026074529-g0v5lnaqpzksl9kl
(andrew) Merge lp:bzr/2.0 into lp:bzr.  Includes fixes for #436325,
        #436794, #437626 and documentation improvements.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2754
2754
        rev2_tree = tree.branch.repository.revision_tree(rev2_id)
2755
2755
        self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
2756
2756
 
 
2757
    def test_ascii_limbo_paths(self):
 
2758
        self.requireFeature(tests.UnicodeFilenameFeature)
 
2759
        branch = self.make_branch('any')
 
2760
        tree = branch.repository.revision_tree(_mod_revision.NULL_REVISION)
 
2761
        tt = TransformPreview(tree)
 
2762
        foo_id = tt.new_directory('', ROOT_PARENT)
 
2763
        bar_id = tt.new_file(u'\u1234bar', foo_id, 'contents')
 
2764
        limbo_path = tt._limbo_name(bar_id)
 
2765
        self.assertEqual(limbo_path.encode('ascii', 'replace'), limbo_path)
 
2766
 
2757
2767
 
2758
2768
class FakeSerializer(object):
2759
2769
    """Serializer implementation that simply returns the input.