/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: Launchpad Translations on behalf of bzr-gtk
  • Date: 2012-02-12 05:08:39 UTC
  • mto: (778.1.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 781.
  • Revision ID: launchpad_translations_on_behalf_of_bzr-gtk-20120212050839-u6u442rofxavmple
Launchpad automatic translations update.

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