~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

Committer: John Arbash Meinel
Date: 2005-11-30 17:11:52 UTC
mfrom: (1185.50.1 jam-integration)
mto: (1185.50.19 bzr-jam-integration)
mto: This revision was merged to the branch mainline in revision 1532.
Revision ID: john@arbash-meinel.com-20051130171152-95fc4cd6adf2aa8c

[merge] jam-integration

files added:
bzrlib/tests/test_ui.py

bzrlib/ui

bzrlib/ui/text.py

files renamed:
bzrlib/ui.py => bzrlib/ui/__init__.py

files modified:
NEWS

bzrlib/__init__.py

bzrlib/builtins.py

bzrlib/commands.py

bzrlib/osutils.py

bzrlib/tests/__init__.py

bzrlib/tests/stub_sftp.py

bzrlib/tests/test_http.py

bzrlib/tests/test_sftp.py

bzrlib/tests/test_transport.py

bzrlib/trace.py

bzrlib/transport/http.py

bzrlib/transport/sftp.py

Show diffs side-by-side

added added

removed removed

bzrlib/commands.py

543

544

def main(argv):

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

Older »