← 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: 2005-10-17 21:20:18 UTC
  • mfrom: (1461)
  • mto: This revision was merged to the branch mainline in revision 1462.
  • Revision ID: robertc@robertcollins.net-20051017212018-5e2a78c67f36a026
merge from integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
17
17
import sys
18
18
from bzrlib.osutils import is_inside_any
19
19
from bzrlib.delta import compare_trees
 
20
from bzrlib.log import line_log
 
21
from bzrlib.errors import NoSuchRevision
20
22
 
21
23
 
22
24
def show_status(branch, show_unchanged=False,
88
90
            if show_pending and len(branch.pending_merges()) > 0:
89
91
                print >>to_file, 'pending merges:'
90
92
                for merge in branch.pending_merges():
91
 
                    print >> to_file, ' ', merge
 
93
                    try:
 
94
                        m_revision = branch.get_revision(merge)
 
95
                        print >> to_file, ' ', line_log(m_revision, 77)
 
96
                    except NoSuchRevision:
 
97
                        print >> to_file, ' ', merge 
 
98
                        
92
99
    finally:
93
100
        branch.unlock()
94
101