/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 00:17:06 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610001706-xn6jiuev350246mr
Rename a number of attributes from bzrdir to controldir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/info.py
345
345
        outfile.write(f.getvalue())
346
346
 
347
347
 
348
 
def show_bzrdir_info(a_bzrdir, verbose=False, outfile=None):
349
 
    """Output to stdout the 'info' for a_bzrdir."""
 
348
def show_bzrdir_info(a_controldir, verbose=False, outfile=None):
 
349
    """Output to stdout the 'info' for a_controldir."""
350
350
    if outfile is None:
351
351
        outfile = sys.stdout
352
352
    try:
353
 
        tree = a_bzrdir.open_workingtree(
 
353
        tree = a_controldir.open_workingtree(
354
354
            recommend_upgrade=False)
355
355
    except (NoWorkingTree, NotLocalUrl, NotBranchError):
356
356
        tree = None
357
357
        try:
358
 
            branch = a_bzrdir.open_branch(name="")
 
358
            branch = a_controldir.open_branch(name="")
359
359
        except NotBranchError:
360
360
            branch = None
361
361
            try:
362
 
                repository = a_bzrdir.open_repository()
 
362
                repository = a_controldir.open_repository()
363
363
            except NoRepositoryPresent:
364
364
                lockable = None
365
365
                repository = None
376
376
    if lockable is not None:
377
377
        lockable.lock_read()
378
378
    try:
379
 
        show_component_info(a_bzrdir, repository, branch, tree, verbose,
 
379
        show_component_info(a_controldir, repository, branch, tree, verbose,
380
380
                            outfile)
381
381
    finally:
382
382
        if lockable is not None: