← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to patchsource.py

  • Committer: Aaron Bentley
  • Date: 2009-03-11 01:19:53 UTC
  • Revision ID: aaron@aaronbentley.com-20090311011953-2xgksl6krrs1yb4d
bzr patch handles URLs with trailing slashes

Show diffs side-by-side

added added

removed removed

Lines of Context:
patchsource.py
1
 
import patches
 
1
import re
 
2
 
 
3
from bzrlib import patches
 
4
 
 
5
from bzrlib.plugins.bzrtools import errors
2
6
 
3
7
class PatchSource(object):
4
8
    def __iter__(self):
7
11
                yield p
8
12
        return iterator(self)
9
13
 
10
 
    def can_live_update(self):
11
 
        return False
12
 
 
13
14
    def readlines(self):
14
15
        raise NotImplementedError()
15
16
 
27
28
 
28
29
class BzrPatchSource(PatchSource):
29
30
    def __init__(self, revision=None, file_list=None):
30
 
        from bzrlib.branch import Branch
 
31
        from bzrlib.builtins import tree_files
 
32
        self.tree, self.file_list = tree_files(file_list)
 
33
        self.base = self.tree.basedir
31
34
        self.revision = revision
32
 
        self.file_list = file_list
33
 
        if file_list is not None and len(file_list) > 0:
34
 
            location = file_list[0]
 
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()
35
42
        else:
36
 
            location = '.'
37
 
        self.branch = Branch.open_containing(location)[0]
 
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)
38
48
 
39
49
        PatchSource.__init__(self)
40
50
 
41
 
    def can_live_update(self):
42
 
        return True
43
 
 
44
51
    def readlines(self):
 
52
        from bzrlib.diff import show_diff_trees
45
53
        from StringIO import StringIO
46
 
        from bzrlib.diff import show_diff
47
54
        f = StringIO()
48
 
        show_diff(self.branch, self.revision,
49
 
                specific_files=self.file_list, output=f)
 
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()
50
60
        f.seek(0)
51
61
        return f.readlines()