← 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: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/cmd_version_info.py
16
16
 
17
17
"""Commands for generating snapshot information about a bzr tree."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
from bzrlib.lazy_import import lazy_import
20
22
 
21
23
lazy_import(globals(), """
105
107
        if format is None:
106
108
            format = version_info_formats.format_registry.get()
107
109
 
108
 
        wt = None
109
110
        try:
110
111
            wt = workingtree.WorkingTree.open_containing(location)[0]
111
112
        except errors.NoWorkingTree:
112
113
            b = branch.Branch.open(location)
 
114
            wt = None
113
115
        else:
114
116
            b = wt.branch
115
117