← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to patchsource.py

  • Committer: Aaron Bentley
  • Date: 2006-03-18 17:14:51 UTC
  • mfrom: (0.1.98 shelf)
  • Revision ID: aaron.bentley@utoronto.ca-20060318171451-2b15a9bcf7b77d69
Merge from shelf

Show diffs side-by-side

added added

removed removed

Lines of Context:
patchsource.py
1
 
import re
2
 
 
3
 
from bzrlib import (
4
 
    patches,
5
 
    workingtree,
6
 
    )
7
 
 
8
 
from bzrlib.plugins.bzrtools import errors
 
1
import patches
9
2
 
10
3
class PatchSource(object):
11
4
    def __iter__(self):
17
10
    def readlines(self):
18
11
        raise NotImplementedError()
19
12
 
20
 
    def readpatches(self):
 
13
    def readhunks(self):
21
14
        return patches.parse_patches(self.readlines())
22
15
 
23
16
class FilePatchSource(PatchSource):
31
24
 
32
25
class BzrPatchSource(PatchSource):
33
26
    def __init__(self, revision=None, file_list=None):
34
 
        open_containing_paths = workingtree.WorkingTree.open_containing_paths
35
 
        self.tree, self.file_list = open_containing_paths(file_list)
36
 
        self.base = self.tree.basedir
 
27
        self.file_list = file_list
 
28
        if file_list is not None and len(file_list) > 0:
 
29
            location = file_list[0]
 
30
        else:
 
31
            location = '.'
 
32
 
 
33
        # Hack to cope with 0.7 and 0.8 bzr
 
34
        try:
 
35
            from bzrlib.workingtree import WorkingTree
 
36
            self.wt = WorkingTree.open_containing(location)[0]
 
37
            self.base = self.wt.basedir
 
38
            self.__readlines = self._v08_readlines
 
39
        except ImportError:
 
40
            from bzrlib.branch import Branch
 
41
            self.branch = Branch.open_containing(location)[0]
 
42
            self.base = self.branch.base
 
43
            self.__readlines = self._v07_readlines
 
44
 
37
45
        self.revision = revision
38
46
 
39
 
        # Hacks to cope with v0.7 and v0.8 of bzr
40
 
        if self.revision is None:
41
 
            if hasattr(self.tree, 'basis_tree'):
42
 
                self.old_tree = self.tree.basis_tree()
43
 
            else:
44
 
                self.old_tree = self.tree.branch.basis_tree()
45
 
        else:
46
 
            revision_id = self.revision.in_store(self.tree.branch).rev_id
47
 
            if hasattr(self.tree.branch, 'repository'):
48
 
                self.old_tree = self.tree.branch.repository.revision_tree(revision_id)
49
 
            else:
50
 
                self.old_tree = self.tree.branch.revision_tree(revision_id)
51
 
 
52
47
        PatchSource.__init__(self)
53
48
 
54
49
    def readlines(self):
55
 
        from bzrlib.diff import show_diff_trees
56
50
        from StringIO import StringIO
57
51
        f = StringIO()
58
 
 
59
 
        show_diff_trees(self.old_tree, self.tree, f, self.file_list,
60
 
                        old_label='', new_label='')
61
 
        if re.search('Binary files .* differ', f.getvalue()):
62
 
            raise errors.ChangedBinaryFiles()
 
52
        self.__readlines(f)
63
53
        f.seek(0)
64
54
        return f.readlines()
 
55
 
 
56
    def _v07_readlines(self, output):
 
57
        from bzrlib.diff import show_diff
 
58
        show_diff(self.branch, self.revision,
 
59
            specific_files=self.file_list, output=output)
 
60
 
 
61
    def _v08_readlines(self, output):
 
62
        import sys
 
63
        from bzrlib.diff import diff_cmd_helper
 
64
        tmp = sys.stdout
 
65
        sys.stdout = output
 
66
        # FIXME diff_cmd_helper() should take an output parameter
 
67
        diff_cmd_helper(self.wt, self.file_list, external_diff_options=None,
 
68
                        old_revision_spec=self.revision)
 
69
        sys.stdout = tmp