/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_diff.py

  • Committer: Aaron Bentley
  • Date: 2008-05-22 03:43:15 UTC
  • Revision ID: aaron@aaronbentley.com-20080522034315-enx7iqqut16kue6h
Convert remaining uses of RevisionSpec.in_history to as_revision_id

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_diff.py
19
19
import os
20
20
 
21
21
from bzrlib import errors, tests
22
 
from bzrlib.merge_directive import MergeDirective2
 
22
from bzrlib.merge_directive import MergeDirective
23
23
 
24
24
from bzrlib.plugins.gtk.diff import (
25
25
    DiffController,
69
69
class TestDiffView(tests.TestCaseWithTransport):
70
70
 
71
71
    def test_unicode(self):
72
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
72
        from bzrlib.tests.test_diff import UnicodeFilename
 
73
        self.requireFeature(UnicodeFilename)
73
74
 
74
75
        tree = self.make_branch_and_tree('tree')
75
76
        self.build_tree([u'tree/\u03a9'])
168
169
        other.commit('second commit')
169
170
        other.lock_write()
170
171
        try:
171
 
            directive = MergeDirective2.from_objects(other.branch.repository,
172
 
                                                     other.last_revision(), 0,
173
 
                                                     0, 'this')
 
172
            directive = MergeDirective.from_objects(other.branch.repository,
 
173
                                                    other.last_revision(), 0,
 
174
                                                    0, 'this')
174
175
        finally:
175
176
            other.unlock()
176
177
        return this, other, directive