~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
543
543
 
544
544
def main(argv):
545
545
    import bzrlib.ui
 
546
    from bzrlib.ui.text import TextUIFactory
546
547
    ## bzrlib.trace.enable_default_logging()
547
548
    bzrlib.trace.log_startup(argv)
548
 
    bzrlib.ui.ui_factory = bzrlib.ui.TextUIFactory()
 
549
    bzrlib.ui.ui_factory = TextUIFactory()
549
550
    ret = run_bzr_catch_errors(argv[1:])
550
551
    mutter("return code %d", ret)
551
552
    return ret