~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

Committer: Martin Pool
Date: 2005-12-01 04:35:14 UTC
mfrom: (1185.50.3 jam-integration)
mto: (1185.74.1 bzr.dev (Main development branch)) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1505.1.20 bzr-bound-branch) (1685.1.1 bzr-encoding)
mto: This revision was merged to the branch mainline in revision 1518.
Revision ID: mbp@sourcefrog.net-20051201043514-e77b2696e370b75d

[merge] John, sftp and others

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 »