← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-08-19 03:44:37 UTC
  • mfrom: (3636.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080819034437-8cr7y59abr4wemaz
(robertc) Fix performance regression in status PATH. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
184
184
            raise errors.BzrCommandError('bzr status --revision takes exactly'
185
185
                                         ' one or two revision specifiers')
186
186
 
187
 
        tree, file_list = tree_files(file_list)
188
 
            
 
187
        tree, relfile_list = tree_files(file_list)
 
188
        # Avoid asking for specific files when that is not needed.
 
189
        if relfile_list == ['']:
 
190
            relfile_list = None
 
191
            # Don't disable pending merges for full trees other than '.'.
 
192
            if file_list == ['.']:
 
193
                no_pending = True
 
194
        # A specific path within a tree was given.
 
195
        elif relfile_list is not None:
 
196
            no_pending = True
189
197
        show_tree_status(tree, show_ids=show_ids,
190
 
                         specific_files=file_list, revision=revision,
 
198
                         specific_files=relfile_list, revision=revision,
191
199
                         to_file=self.outf, short=short, versioned=versioned,
192
 
                         show_pending=not no_pending)
 
200
                         show_pending=(not no_pending))
193
201
 
194
202
 
195
203
class cmd_cat_revision(Command):