/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: Curtis Hovey
  • Date: 2012-02-09 02:55:06 UTC
  • mto: This revision was merged to the branch mainline in revision 776.
  • Revision ID: sinzui.is@verizon.net-20120209025506-qa8yd8livobyv5yy
Replace unsupports notify event with an new strategy to set and pane size
when the config is saved.
Hush lint.

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
6
5
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)
 
28
                controller = DiffController(path, lines, allow_dirty=True)
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 dialog import error_dialog
 
36
        from bzrlib.plugins.gtk.dialog import error_dialog
37
37
        error_dialog('Error', str(e))
38
38
        raise
39
 
gtk.main()
 
39
 
 
40
if len(sys.argv) == 3 and sys.argv[2] == 'test':
 
41
    sys.exit(0)
 
42
 
 
43
Gtk.main()