← 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-08 00:39:04 UTC
  • mfrom: (1185.1.52)
  • Revision ID: robertc@robertcollins.net-20051008003904-aaffaea2778efe3e
merge in martins reweave, integrated to fetch, and a bugfix for commit and upgrade with executable files

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
22
20
 
23
21
 
24
22
def show_status(branch, show_unchanged=False,
90
88
            if show_pending and len(branch.pending_merges()) > 0:
91
89
                print >>to_file, 'pending merges:'
92
90
                for merge in branch.pending_merges():
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
 
                        
 
91
                    print >> to_file, ' ', merge
99
92
    finally:
100
93
        branch.unlock()
101
94