~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2008-04-24 04:58:42 UTC
  • mfrom: (3377 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3380.
  • Revision ID: aaron@aaronbentley.com-20080424045842-0cajl9v6s4u52kaw
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
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):
4433
4436
                     tree='Reconfigure to a tree.',
4434
4437
                     checkout='Reconfigure to a checkout.',
4435
4438
                     lightweight_checkout='Reconfigure to a lightweight'
4436
 
                     ' checkout.'),
 
4439
                     ' checkout.',
 
4440
                     standalone='Reconfigure to be standalone.',
 
4441
                     use_shared='Reconfigure to use a shared repository.'),
4437
4442
                     Option('bind-to', help='Branch to bind checkout to.',
4438
4443
                            type=str),
4439
4444
                     Option('force',
4455
4460
        elif target_type == 'lightweight-checkout':
4456
4461
            reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
4457
4462
                directory, bind_to)
 
4463
        elif target_type == 'use-shared':
 
4464
            reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
 
4465
        elif target_type == 'standalone':
 
4466
            reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
4458
4467
        reconfiguration.apply(force)
4459
4468
 
4460
4469