/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: Jelmer Vernooij
  • Date: 2008-06-29 18:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

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 MergeDirective
 
22
from bzrlib.merge_directive import MergeDirective2
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
 
        from bzrlib.tests.test_diff import UnicodeFilename
73
 
        self.requireFeature(UnicodeFilename)
 
72
        self.requireFeature(tests.UnicodeFilenameFeature)
74
73
 
75
74
        tree = self.make_branch_and_tree('tree')
76
75
        self.build_tree([u'tree/\u03a9'])
169
168
        other.commit('second commit')
170
169
        other.lock_write()
171
170
        try:
172
 
            directive = MergeDirective.from_objects(other.branch.repository,
173
 
                                                    other.last_revision(), 0,
174
 
                                                    0, 'this')
 
171
            directive = MergeDirective2.from_objects(other.branch.repository,
 
172
                                                     other.last_revision(), 0,
 
173
                                                     0, 'this')
175
174
        finally:
176
175
            other.unlock()
177
176
        return this, other, directive