/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: 2006-05-19 16:37:13 UTC
  • Revision ID: jelmer@samba.org-20060519163713-be77b31c72cbc7e8
Move visualisation code to a separate directory, preparing for bundling 
the GTK+ plugins for bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzr-handle-patch
1
 
#!/usr/bin/python
2
 
 
3
 
from bzrlib import errors, merge_directive
4
 
from bzrlib.plugin import load_plugins
5
 
load_plugins()
6
 
from bzrlib.plugins.gtk.commands import open_display
7
 
 
8
 
import sys
9
 
 
10
 
if len(sys.argv) < 2:
11
 
    print "Usage: handle-patch <path>"
12
 
    sys.exit(1)
13
 
 
14
 
 
15
 
path = sys.argv[1]
16
 
 
17
 
try:
18
 
    from bzrlib.plugins.gtk.diff import (DiffController,
19
 
                                         MergeDirectiveController)
20
 
    if path == '-':
21
 
        lines = sys.stdin.readlines()
22
 
    else:
23
 
        lines = open(path, 'rb').readlines()
24
 
    lines = [l.replace('\r\n', '\n') for l in lines]
25
 
    try:
26
 
        directive = merge_directive.MergeDirective.from_lines(lines)
27
 
    except errors.NotAMergeDirective:
28
 
        controller = DiffController(path, lines, allow_dirty=True)
29
 
    else:
30
 
        controller = MergeDirectiveController(path, directive)
31
 
    window = controller.window
32
 
    window.show()
33
 
    Gtk = open_display()
34
 
    window.connect("destroy", Gtk.main_quit)
35
 
except Exception, e:
36
 
    from bzrlib.plugins.gtk.dialog import error_dialog
37
 
    error_dialog('Error', str(e))
38
 
    raise
39
 
 
40
 
if len(sys.argv) == 3 and sys.argv[2] == 'test':
41
 
    sys.exit(0)
42
 
 
43
 
Gtk.main()