← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Aaron Bentley
  • Date: 2006-03-10 16:10:04 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: abentley@panoramicfeedback.com-20060310161004-8e7c784a0ba225de
Switched display functions to conflict_lines

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
21
21
from bzrlib.log import line_log
22
22
from bzrlib.osutils import is_inside_any
23
23
from bzrlib.symbol_versioning import *
 
24
from bzrlib.transform import conflicts_strings
24
25
 
25
26
# TODO: when showing single-line logs, truncate to the width of the terminal
26
27
# if known, but only if really going to the terminal (not into a file)
136
137
 
137
138
        if new_is_working_tree:
138
139
            list_paths('unknown', new.unknowns(), specific_files, to_file)
139
 
            list_paths('conflicts', new.iter_conflicts(), specific_files, to_file)
 
140
            conflict_title = False
 
141
            for conflict in conflicts_strings(wt.conflict_lines()):
 
142
                if conflict_title is False:
 
143
                    print >> to_file, "conflicts:"
 
144
                    conflict_title = True
 
145
                print >> to_file, "  %s" % conflict
140
146
        if new_is_working_tree and show_pending:
141
147
            show_pending_merges(new, to_file)
142
148
    finally: