~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to patchsource.py

  • Committer: Alexander Belchenko
  • Date: 2006-06-15 10:33:19 UTC
  • mto: (0.6.1 shelf-win32)
  • mto: This revision was merged to the branch mainline in revision 414.
  • Revision ID: bialix@ukr.net-20060615103319-d66c46769262859d
fix import and usage of msvcrt to get user input on win32

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
import re
2
 
 
3
 
from bzrlib import patches
4
 
 
5
 
from bzrlib.plugins.bzrtools import errors
 
1
import patches
6
2
 
7
3
class PatchSource(object):
8
4
    def __iter__(self):
55
51
 
56
52
        show_diff_trees(self.old_tree, self.tree, f, self.file_list,
57
53
                        old_label='', new_label='')
58
 
        if re.search('Binary files .* differ', f.getvalue()):
59
 
            raise errors.ChangedBinaryFiles()
 
54
 
60
55
        f.seek(0)
61
56
        return f.readlines()