← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Robert Collins
  • Date: 2007-10-22 01:23:51 UTC
  • mfrom: (2921.3.1 graph)
  • mto: This revision was merged to the branch mainline in revision 2933.
  • Revision ID: robertc@robertcollins.net-20071022012351-16lm27an2lbzk038
Merge graph history-access bugfix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
127
127
                conflicts = conflicts.select_conflicts(new, specific_files,
128
128
                    ignore_misses=True, recurse=True)[1]
129
129
            if len(conflicts) > 0 and not short:
130
 
                print >> to_file, "conflicts:"
 
130
                to_file.write("conflicts:\n")
131
131
            for conflict in conflicts:
132
132
                if short:
133
133
                    prefix = 'C  '
134
134
                else:
135
135
                    prefix = ' '
136
 
                print >> to_file, "%s %s" % (prefix, conflict)
 
136
                to_file.write("%s %s\n" % (prefix, conflict))
137
137
            if new_is_working_tree and show_pending:
138
138
                show_pending_merges(new, to_file, short)
139
139
        finally:
151
151
    branch = new.branch
152
152
    last_revision = parents[0]
153
153
    if not short:
154
 
        print >>to_file, 'pending merges:'
 
154
        to_file.write('pending merges:\n')
155
155
    if last_revision is not None:
156
156
        try:
157
157
            ignore = set(branch.repository.get_ancestry(last_revision,
174
174
                prefix = 'P  '
175
175
            else:
176
176
                prefix = ' '
177
 
            print >> to_file, prefix, line_log(m_revision, width - 4)
 
177
            to_file.write(prefix + ' ' + line_log(m_revision, width - 4))
 
178
            to_file.write('\n')
178
179
            inner_merges = branch.repository.get_ancestry(merge)
179
180
            assert inner_merges[0] is None
180
181
            inner_merges.pop(0)
187
188
                    prefix = 'P.  '
188
189
                else:
189
190
                    prefix = '   '
190
 
                print >> to_file, prefix, line_log(mm_revision, width - 5)
 
191
                to_file.write(prefix + ' ' + line_log(mm_revision, width - 5))
 
192
                to_file.write('\n')
191
193
                ignore.add(mmerge)
192
194
        except errors.NoSuchRevision:
193
195
            if short:
194
196
                prefix = 'P  '
195
197
            else:
196
198
                prefix = ' '
197
 
            print >> to_file, prefix, merge
 
199
            to_file.write(prefix + ' ' + merge)
 
200
            to_file.write('\n')