/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 __init__.py

  • Committer: Vincent Ladeuil
  • Date: 2008-06-09 15:59:13 UTC
  • mto: This revision was merged to the branch mainline in revision 503.
  • Revision ID: v.ladeuil+lp@free.fr-20080609155913-ueadh6vzmn81wwuk
Fix test failing after a feature rename in bzr.

* tests/test_diff.py:
(TestDiffView.test_unicode):
bzrlib.tests.test_diff.UnicodeFilename has benn renamed
bzrlib.tests.UnicodeFilenameFeature in bzr.

* tests/test_commit.py:
(TestCommitDialog_Commit.test_commit_unicode_messages):
bzrlib.tests.test_diff.UnicodeFilename has benn renamed
bzrlib.tests.UnicodeFilenameFeature in bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
37
37
 
38
38
import bzrlib
39
39
 
40
 
version_info = (0, 94, 0, 'rc', 1)
 
40
version_info = (0, 95, 0, 'dev', 1)
41
41
 
42
42
if version_info[3] == 'final':
43
43
    version_string = '%d.%d.%d' % version_info[:3]
193
193
            if revision is not None:
194
194
                if len(revision) == 1:
195
195
                    tree1 = wt
196
 
                    revision_id = revision[0].in_history(branch).rev_id
 
196
                    revision_id = revision[0].as_revision_id(tree1.branch)
197
197
                    tree2 = branch.repository.revision_tree(revision_id)
198
198
                elif len(revision) == 2:
199
 
                    revision_id_0 = revision[0].in_history(branch).rev_id
 
199
                    revision_id_0 = revision[0].as_revision_id(branch)
200
200
                    tree2 = branch.repository.revision_tree(revision_id_0)
201
 
                    revision_id_1 = revision[1].in_history(branch).rev_id
 
201
                    revision_id_1 = revision[1].as_revision_id(branch)
202
202
                    tree1 = branch.repository.revision_tree(revision_id_1)
203
203
            else:
204
204
                tree1 = wt
261
261
            if revision is None:
262
262
                revids.append(br.last_revision())
263
263
            else:
264
 
                (revno, revid) = revision[0].in_history(br)
265
 
                revids.append(revid)
 
264
                revids.append(revision[0].as_revision_id(br))
266
265
        import gtk
267
266
        pp = start_viz_window(br, revids, limit)
268
267
        pp.connect("destroy", lambda w: gtk.main_quit())
312
311
        if revision is not None:
313
312
            if len(revision) != 1:
314
313
                raise BzrCommandError("Only 1 revion may be specified.")
315
 
            revision_id = revision[0].in_history(br).rev_id
 
314
            revision_id = revision[0].as_revision_id(br)
316
315
            tree = br.repository.revision_tree(revision_id)
317
316
        else:
318
317
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
359
358
            br = wt.branch
360
359
        except NoWorkingTree, e:
361
360
            from dialog import error_dialog
362
 
            error_dialog(_('Directory does not have a working tree'),
363
 
                         _('Operation aborted.'))
 
361
            error_dialog(_i18n('Directory does not have a working tree'),
 
362
                         _i18n('Operation aborted.'))
364
363
            return 1 # should this be retval=3?
365
364
 
366
365
        # It is a good habit to keep things locked for the duration, but it
393
392
        
394
393
        if revision is not None:
395
394
            try:
396
 
                revision_id = revision[0].in_history(wt.branch).rev_id
 
395
                revision_id = revision[0].as_revision_id(wt.branch)
397
396
            except:
398
397
                from bzrlib.errors import BzrError
399
398
                raise BzrError('Revision %r doesn\'t exist' % revision[0].user_spec )
705
704
 
706
705
    def run(self, path):
707
706
        try:
708
 
            from bzrlib.plugins.gtk.diff import (DiffWindow,
709
 
                                                 MergeDirectiveWindow)
710
 
            lines = open(path, 'rb').readlines()
 
707
            from bzrlib.plugins.gtk.diff import (DiffController,
 
708
                                                 MergeDirectiveController)
 
709
            if path == '-':
 
710
                lines = sys.stdin.readlines()
 
711
            else:
 
712
                lines = open(path, 'rb').readlines()
711
713
            lines = [l.replace('\r\n', '\n') for l in lines]
712
714
            try:
713
715
                directive = merge_directive.MergeDirective.from_lines(lines)
714
716
            except errors.NotAMergeDirective:
715
 
                window = DiffWindow()
716
 
                window.set_diff_text(path, lines)
 
717
                controller = DiffController(path, lines)
717
718
            else:
718
 
                window = MergeDirectiveWindow(directive, path)
719
 
                window.set_diff_text(path, directive.patch.splitlines(True))
 
719
                controller = MergeDirectiveController(path, directive)
 
720
            window = controller.window
720
721
            window.show()
721
722
            gtk = self.open_display()
722
723
            window.connect("destroy", gtk.main_quit)
733
734
import gettext
734
735
gettext.install('olive-gtk')
735
736
 
 
737
# Let's create a specialized alias to protect '_' from being erased by other
 
738
# uses of '_' as an anonymous variable (think pdb for one).
 
739
_i18n = gettext.gettext
736
740
 
737
741
class NoDisplayError(BzrCommandError):
738
742
    """gtk could not find a proper display"""