← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/cmd_version_info.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/cmd_version_info.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Commands for generating snapshot information about a bzr tree."""
18
18
 
19
19
from bzrlib.lazy_import import lazy_import
 
20
 
20
21
lazy_import(globals(), """
21
22
from bzrlib import (
22
23
    branch,
23
24
    errors,
 
25
    ui,
 
26
    version_info_formats,
24
27
    workingtree,
25
 
    version_info_formats,
26
28
    )
27
29
""")
 
30
 
28
31
from bzrlib.commands import Command
29
32
from bzrlib.option import Option, RegistryOption
30
33
 
113
116
                include_revision_history=include_history,
114
117
                include_file_revisions=include_file_revisions,
115
118
                template=template)
116
 
        builder.generate(self.outf)
 
119
        builder.generate(ui.ui_factory.make_output_stream())