← 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-06-08 04:43:46 UTC
  • mto: (0.3.1 shelf-dev)
  • mto: This revision was merged to the branch mainline in revision 393.
  • Revision ID: michael@ellerman.id.au-20060608044346-2f58031501426a8f
Add a test for basic switch functionality.

Show diffs side-by-side

added added

removed removed

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