/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 bzr-handle-patch

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 16:11:12 UTC
  • mfrom: (475.2.2 gtk)
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629161112-3j4zp0r0e7cv6cds
Merge Chad's progress bar in viz patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzr-handle-patch
2
2
 
3
3
from bzrlib import errors, merge_directive
4
4
from bzrlib.plugin import load_plugins
5
 
from bzrlib.plugins.gtk.commands import open_display
6
 
 
 
5
from bzrlib.plugins.gtk import open_display
7
6
load_plugins()
8
7
 
9
8
import sys
26
25
        try:
27
26
                directive = merge_directive.MergeDirective.from_lines(lines)
28
27
        except errors.NotAMergeDirective:
29
 
                controller = DiffController(path, lines, allow_dirty=True)
 
28
                controller = DiffController(path, lines)
30
29
        else:
31
30
                controller = MergeDirectiveController(path, directive)
32
31
        window = controller.window
33
32
        window.show()
34
 
        Gtk = open_display()
 
33
        gtk = open_display()
35
34
        window.connect("destroy", gtk.main_quit)
36
35
except Exception, e:
37
 
        from bzrlib.plugins.gtk.dialog import error_dialog
 
36
        from dialog import error_dialog
38
37
        error_dialog('Error', str(e))
39
38
        raise
40
39
gtk.main()