/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: 2011-03-23 09:49:44 UTC
  • mfrom: (723.1.1 isearch)
  • Revision ID: jelmer@samba.org-20110323094944-7n5h1vif3xpbze3p
Merge support for interactive substring search in bzr viz and annotate.

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
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
36
        from bzrlib.plugins.gtk.dialog import error_dialog