/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 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:
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 import open_display
5
6
load_plugins()
6
 
from bzrlib.plugins.gtk.commands import open_display
7
7
 
8
8
import sys
9
9
 
25
25
        try:
26
26
                directive = merge_directive.MergeDirective.from_lines(lines)
27
27
        except errors.NotAMergeDirective:
28
 
                controller = DiffController(path, lines, allow_dirty=True)
 
28
                controller = DiffController(path, lines)
29
29
        else:
30
30
                controller = MergeDirectiveController(path, directive)
31
31
        window = controller.window
32
32
        window.show()
33
 
        Gtk = open_display()
34
 
        window.connect("destroy", Gtk.main_quit)
 
33
        gtk = open_display()
 
34
        window.connect("destroy", gtk.main_quit)
35
35
except Exception, e:
36
 
        from bzrlib.plugins.gtk.dialog import error_dialog
 
36
        from dialog import error_dialog
37
37
        error_dialog('Error', str(e))
38
38
        raise
39
 
 
40
 
if len(sys.argv) == 3 and sys.argv[2] == 'test':
41
 
    sys.exit(0)
42
 
 
43
 
Gtk.main()
 
39
gtk.main()