← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: INADA Naoki
  • Date: 2011-05-14 09:58:36 UTC
  • mfrom: (5830.2.22 i18n-msgextract)
  • mto: This revision was merged to the branch mainline in revision 5891.
  • Revision ID: songofacandy@gmail.com-20110514095836-38l651fp8bmb4bni
merge from i18n-msgextract

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 annotate_file, annotate_file_tree
 
4696
        from bzrlib.annotate import (
 
4697
            annotate_file_tree,
 
4698
            )
4697
4699
        wt, branch, relpath = \
4698
4700
            _open_directory_or_containing_tree_or_branch(filename, directory)
4699
4701
        if wt is not None:
4714
4716
            annotate_file_tree(wt, file_id, self.outf, long, all,
4715
4717
                show_ids=show_ids)
4716
4718
        else:
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)
 
4719
            annotate_file_tree(tree, file_id, self.outf, long, all,
 
4720
                show_ids=show_ids, branch=branch)
4720
4721
 
4721
4722
 
4722
4723
class cmd_re_sign(Command):
6153
6154
            self.outf.write('%s %s\n' % (path, location))
6154
6155
 
6155
6156
 
 
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
 
6156
6167
def _register_lazy_builtins():
6157
6168
    # register lazy builtins from other modules; called at startup and should
6158
6169
    # be only called once.