← 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: 2005-10-06 04:29:10 UTC
  • mfrom: (1185.14.11)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: aaron.bentley@utoronto.ca-20051006042910-a3263271389bfdc2
Merged conflict handling work

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
82
82
                   show_unchanged=show_unchanged)
83
83
 
84
84
        if new_is_working_tree:
 
85
            conflicts = new.iter_conflicts()
85
86
            unknowns = new.unknowns()
86
 
            done_header = False
87
 
            for path in unknowns:
88
 
                if specific_files and not is_inside_any(specific_files, path):
89
 
                    continue
90
 
                if not done_header:
91
 
                    print >>to_file, 'unknown:'
92
 
                    done_header = True
93
 
                print >>to_file, ' ', path
 
87
            list_paths('unknown', unknowns, specific_files, to_file)
 
88
            list_paths('conflicts', conflicts, specific_files, to_file)
94
89
            if show_pending and len(branch.pending_merges()) > 0:
95
90
                print >>to_file, 'pending merges:'
96
91
                for merge in branch.pending_merges():
98
93
    finally:
99
94
        branch.unlock()
100
95
        
 
96
def list_paths(header, paths, specific_files, to_file):
 
97
    done_header = False
 
98
    for path in paths:
 
99
        if specific_files and not is_inside_any(specific_files, path):
 
100
            continue
 
101
        if not done_header:
 
102
            print >>to_file, '%s:' % header
 
103
            done_header = True
 
104
        print >>to_file, ' ', path