~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/status.py

Status command shows pending merges

added added

removed removed

def show_status(branch, show_unchanged=False,

specific_files=None,

show_ids=False,

to_file=None):

to_file=None,

show_pending=True):

"""Display single-line status for non-ignored working files.

show_all

print >>to_file, 'unknown:'

done_header = True

print >>to_file, ' ', path

if show_pending and len(branch.pending_merges()) > 0:

print >>to_file, 'pending merges:'

for merge in branch.pending_merges():

print >> to_file, ' ', merge

finally:

branch.unlock()