/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/info.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
Merge rename-controldir branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/info.py
347
347
        outfile.write(f.getvalue())
348
348
 
349
349
 
350
 
def show_bzrdir_info(a_bzrdir, verbose=False, outfile=None):
351
 
    """Output to stdout the 'info' for a_bzrdir."""
 
350
def show_bzrdir_info(a_controldir, verbose=False, outfile=None):
 
351
    """Output to stdout the 'info' for a_controldir."""
352
352
    if outfile is None:
353
353
        outfile = sys.stdout
354
354
    try:
355
 
        tree = a_bzrdir.open_workingtree(
 
355
        tree = a_controldir.open_workingtree(
356
356
            recommend_upgrade=False)
357
357
    except (NoWorkingTree, NotLocalUrl, NotBranchError):
358
358
        tree = None
359
359
        try:
360
 
            branch = a_bzrdir.open_branch(name="")
 
360
            branch = a_controldir.open_branch(name="")
361
361
        except NotBranchError:
362
362
            branch = None
363
363
            try:
364
 
                repository = a_bzrdir.open_repository()
 
364
                repository = a_controldir.open_repository()
365
365
            except NoRepositoryPresent:
366
366
                lockable = None
367
367
                repository = None
378
378
    if lockable is not None:
379
379
        lockable.lock_read()
380
380
    try:
381
 
        show_component_info(a_bzrdir, repository, branch, tree, verbose,
 
381
        show_component_info(a_controldir, repository, branch, tree, verbose,
382
382
                            outfile)
383
383
    finally:
384
384
        if lockable is not None:
500
500
    non_aliases = set(controldir.format_registry.keys())
501
501
    non_aliases.difference_update(controldir.format_registry.aliases())
502
502
    for key in non_aliases:
503
 
        format = controldir.format_registry.make_bzrdir(key)
 
503
        format = controldir.format_registry.make_controldir(key)
504
504
        if isinstance(format, bzrdir.BzrDirMetaFormat1):
505
505
            if (tree and format.workingtree_format !=
506
506
                tree._format):