/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-12-20 16:16:57 UTC
  • Revision ID: jelmer@canonical.com-20111220161657-zjn6rqjrw8ouehf8
Drop support for old bencode location.

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