← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: abentley
  • Date: 2005-10-14 03:50:50 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1460.
  • Revision ID: abentley@lappy-20051014035050-d779472ccb599a51
semi-broke merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
87
87
            unknowns = new.unknowns()
88
88
            list_paths('unknown', unknowns, specific_files, to_file)
89
89
            list_paths('conflicts', conflicts, specific_files, to_file)
90
 
            if show_pending and len(new.pending_merges()) > 0:
 
90
            if show_pending and len(branch.pending_merges()) > 0:
91
91
                print >>to_file, 'pending merges:'
92
 
                last_revision = branch.last_revision()
93
 
                if last_revision is not None:
94
 
                    ignore = set(branch.get_ancestry(last_revision))
95
 
                else:
96
 
                    ignore = set()
97
 
                for merge in new.pending_merges():
98
 
                    ignore.add(merge)
 
92
                for merge in branch.pending_merges():
99
93
                    try:
100
94
                        m_revision = branch.get_revision(merge)
101
95
                        print >> to_file, ' ', line_log(m_revision, 77)
102
 
                        inner_merges = branch.get_ancestry(merge)
103
 
                        inner_merges.reverse()
104
 
                        for mmerge in inner_merges:
105
 
                            if mmerge in ignore:
106
 
                                continue
107
 
                            mm_revision = branch.get_revision(mmerge)
108
 
                            print >> to_file, '   ', line_log(mm_revision, 75)
109
 
                            ignore.add(mmerge)
110
 
                            
111
96
                    except NoSuchRevision:
112
97
                        print >> to_file, ' ', merge 
113
98