← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

(jelmer) Skip tests that require an inventory when run against a WorkingTree
 that is not inventory based. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4693
4693
    @display_command
4694
4694
    def run(self, filename, all=False, long=False, revision=None,
4695
4695
            show_ids=False, directory=None):
4696
 
        from bzrlib.annotate import (
4697
 
            annotate_file_tree,
4698
 
            )
 
4696
        from bzrlib.annotate import annotate_file, annotate_file_tree
4699
4697
        wt, branch, relpath = \
4700
4698
            _open_directory_or_containing_tree_or_branch(filename, directory)
4701
4699
        if wt is not None:
4716
4714
            annotate_file_tree(wt, file_id, self.outf, long, all,
4717
4715
                show_ids=show_ids)
4718
4716
        else:
4719
 
            annotate_file_tree(tree, file_id, self.outf, long, all,
4720
 
                show_ids=show_ids, branch=branch)
 
4717
            file_version = tree.get_file_revision(file_id)
 
4718
            annotate_file(branch, file_version, file_id, long, all, self.outf,
 
4719
                          show_ids=show_ids)
4721
4720
 
4722
4721
 
4723
4722
class cmd_re_sign(Command):
6154
6153
            self.outf.write('%s %s\n' % (path, location))
6155
6154
 
6156
6155
 
6157
 
class cmd_export_pot(Command):
6158
 
    __doc__ = """Export command helps and error messages in po format."""
6159
 
 
6160
 
    hidden = True
6161
 
 
6162
 
    def run(self):
6163
 
        from bzrlib.export_pot import export_pot
6164
 
        export_pot(self.outf)
6165
 
 
6166
 
 
6167
6156
def _register_lazy_builtins():
6168
6157
    # register lazy builtins from other modules; called at startup and should
6169
6158
    # be only called once.