/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 handle-patch

  • Committer: Vincent Ladeuil
  • Date: 2008-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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()
 
1
#!/bin/sh
 
2
/home/abentley/bin/bzr ghandle-patch "$@"