/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-22 02:22:38 UTC
  • mfrom: (478.1.1 bzr-gtk)
  • Revision ID: aaron@aaronbentley.com-20080522022238-8ppt63f6n0o8hi8i
Merge patch to support - for stdin on ghandle-patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
707
707
        try:
708
708
            from bzrlib.plugins.gtk.diff import (DiffWindow,
709
709
                                                 MergeDirectiveWindow)
710
 
            lines = open(path, 'rb').readlines()
 
710
            if path == '-':
 
711
                lines = sys.stdin.readlines()
 
712
            else:
 
713
                lines = open(path, 'rb').readlines()
711
714
            lines = [l.replace('\r\n', '\n') for l in lines]
712
715
            try:
713
716
                directive = merge_directive.MergeDirective.from_lines(lines)