/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/status.py

Refactored out ControlFiles and RevisionStore from _Branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
61
61
        elif len(revision) > 0:
62
62
            try:
63
63
                rev_id = revision[0].in_history(branch).rev_id
64
 
                old = branch.revision_tree(rev_id)
 
64
                old = branch.storage.revision_tree(rev_id)
65
65
            except NoSuchRevision, e:
66
66
                raise BzrCommandError(str(e))
67
67
            if len(revision) > 1:
68
68
                try:
69
69
                    rev_id = revision[1].in_history(branch).rev_id
70
 
                    new = branch.revision_tree(rev_id)
 
70
                    new = branch.storage.revision_tree(rev_id)
71
71
                    new_is_working_tree = False
72
72
                except NoSuchRevision, e:
73
73
                    raise BzrCommandError(str(e))
97
97
                for merge in branch.pending_merges():
98
98
                    ignore.add(merge)
99
99
                    try:
100
 
                        m_revision = branch.get_revision(merge)
 
100
                        m_revision = branch.storage.get_revision(merge)
101
101
                        print >> to_file, ' ', line_log(m_revision, 77)
102
102
                        inner_merges = branch.get_ancestry(merge)
103
103
                        inner_merges.reverse()