← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to patchsource.py

  • Committer: Michael Ellerman
  • Date: 2006-02-11 03:43:34 UTC
  • mto: (0.1.73 shelf-tmp)
  • mto: This revision was merged to the branch mainline in revision 334.
  • Revision ID: michael@ellerman.id.au-20060211034334-bb98844557509512
Fix test now that we have a message always.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patchsource.py
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):
11
7
                yield p
12
8
        return iterator(self)
13
9
 
 
10
    def can_live_update(self):
 
11
        return False
 
12
 
14
13
    def readlines(self):
15
14
        raise NotImplementedError()
16
15
 
28
27
 
29
28
class BzrPatchSource(PatchSource):
30
29
    def __init__(self, revision=None, file_list=None):
31
 
        from bzrlib.builtins import tree_files
32
 
        self.tree, self.file_list = tree_files(file_list)
33
 
        self.base = self.tree.basedir
 
30
        from bzrlib.branch import Branch
34
31
        self.revision = revision
35
 
 
36
 
        # Hacks to cope with v0.7 and v0.8 of bzr
37
 
        if self.revision is None:
38
 
            if hasattr(self.tree, 'basis_tree'):
39
 
                self.old_tree = self.tree.basis_tree()
40
 
            else:
41
 
                self.old_tree = self.tree.branch.basis_tree()
 
32
        self.file_list = file_list
 
33
        if file_list is not None and len(file_list) > 0:
 
34
            location = file_list[0]
42
35
        else:
43
 
            revision_id = self.revision.in_store(self.tree.branch).rev_id
44
 
            if hasattr(self.tree.branch, 'repository'):
45
 
                self.old_tree = self.tree.branch.repository.revision_tree(revision_id)
46
 
            else:
47
 
                self.old_tree = self.tree.branch.revision_tree(revision_id)
 
36
            location = '.'
 
37
        self.branch = Branch.open_containing(location)[0]
48
38
 
49
39
        PatchSource.__init__(self)
50
40
 
 
41
    def can_live_update(self):
 
42
        return True
 
43
 
51
44
    def readlines(self):
52
 
        from bzrlib.diff import show_diff_trees
53
45
        from StringIO import StringIO
 
46
        from bzrlib.diff import show_diff
54
47
        f = StringIO()
55
 
 
56
 
        show_diff_trees(self.old_tree, self.tree, f, self.file_list,
57
 
                        old_label='', new_label='')
58
 
        if re.search('Binary files .* differ', f.getvalue()):
59
 
            raise errors.ChangedBinaryFiles()
 
48
        show_diff(self.branch, self.revision,
 
49
                specific_files=self.file_list, output=f)
60
50
        f.seek(0)
61
51
        return f.readlines()