/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 __init__.py

  • Committer: Aaron Bentley
  • Date: 2008-05-08 08:16:51 UTC
  • mto: This revision was merged to the branch mainline in revision 492.
  • Revision ID: aaron@aaronbentley.com-20080508081651-cx3a679h03m7wt1n
Refactor merge directive window into MergeController

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
706
706
    def run(self, path):
707
707
        try:
708
708
            from bzrlib.plugins.gtk.diff import (DiffWindow,
709
 
                                                 MergeDirectiveWindow)
 
709
                                                 MergeDirectiveController)
710
710
            lines = open(path, 'rb').readlines()
711
711
            lines = [l.replace('\r\n', '\n') for l in lines]
712
712
            try:
715
715
                window = DiffWindow()
716
716
                window.set_diff_text(path, lines)
717
717
            else:
718
 
                window = MergeDirectiveWindow(directive, path)
719
 
                window.set_diff_text(path, directive.patch.splitlines(True))
 
718
                controller = MergeDirectiveController.for_gtk(directive, path)
 
719
                window = controller.window
720
720
            window.show()
721
721
            gtk = self.open_display()
722
722
            window.connect("destroy", gtk.main_quit)