← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

[merge] Robert's integration 1453

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
71
71
        elif len(revision) > 0:
72
72
            try:
73
73
                rev_id = revision[0].in_history(branch).rev_id
74
 
                old = branch.revision_tree(rev_id)
 
74
                old = branch.repository.revision_tree(rev_id)
75
75
            except NoSuchRevision, e:
76
76
                raise BzrCommandError(str(e))
77
77
            if len(revision) > 1:
78
78
                try:
79
79
                    rev_id = revision[1].in_history(branch).rev_id
80
 
                    new = branch.revision_tree(rev_id)
 
80
                    new = branch.repository.revision_tree(rev_id)
81
81
                    new_is_working_tree = False
82
82
                except NoSuchRevision, e:
83
83
                    raise BzrCommandError(str(e))
109
109
    print >>to_file, 'pending merges:'
110
110
    last_revision = branch.last_revision()
111
111
    if last_revision is not None:
112
 
        ignore = set(branch.get_ancestry(last_revision))
 
112
        ignore = set(branch.repository.get_ancestry(last_revision))
113
113
    else:
114
114
        ignore = set()
115
115
    for merge in new.pending_merges():
116
116
        ignore.add(merge)
117
117
        try:
118
 
            m_revision = branch.get_revision(merge)
 
118
            m_revision = branch.repository.get_revision(merge)
119
119
            print >> to_file, ' ', line_log(m_revision, 77)
120
 
            inner_merges = branch.get_ancestry(merge)
 
120
            inner_merges = branch.repository.get_ancestry(merge)
121
121
            inner_merges.reverse()
122
122
            for mmerge in inner_merges:
123
123
                if mmerge in ignore:
124
124
                    continue
125
 
                mm_revision = branch.get_revision(mmerge)
 
125
                mm_revision = branch.repository.get_revision(mmerge)
126
126
                print >> to_file, '   ', line_log(mm_revision, 75)
127
127
                ignore.add(mmerge)
128
128
        except NoSuchRevision: