← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Reconcile NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
166
166
                     Option('short', help='Use short status indicators.',
167
167
                            short_name='S'),
168
168
                     Option('versioned', help='Only show versioned files.',
169
 
                            short_name='V')
 
169
                            short_name='V'),
 
170
                     Option('no-pending', help='Don\'t show pending merges.',
 
171
                           ),
170
172
                     ]
171
173
    aliases = ['st', 'stat']
172
174
 
175
177
    
176
178
    @display_command
177
179
    def run(self, show_ids=False, file_list=None, revision=None, short=False,
178
 
            versioned=False):
 
180
            versioned=False, no_pending=False):
179
181
        from bzrlib.status import show_tree_status
180
182
 
181
183
        if revision and len(revision) > 2:
186
188
            
187
189
        show_tree_status(tree, show_ids=show_ids,
188
190
                         specific_files=file_list, revision=revision,
189
 
                         to_file=self.outf, short=short, versioned=versioned)
 
191
                         to_file=self.outf, short=short, versioned=versioned,
 
192
                         show_pending=not no_pending)
190
193
 
191
194
 
192
195
class cmd_cat_revision(Command):