~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

Committer: Robert Collins
Date: 2005-09-19 06:05:19 UTC
mfrom: (974.1.92)
mto: (1185.41.1 bzr.sftp) (1092.3.4) (1417.1.4) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores) (1393.1.21)
mto: This revision was merged to the branch mainline in revision 1390.
Revision ID: robertc@robertcollins.net-20050919060519-f582f62146b0b458

merge merge tweaks from aaron, which includes latest .dev

files modified:
TODO

bzrlib/__init__.py

bzrlib/branch.py

bzrlib/builtins.py

bzrlib/changeset.py

bzrlib/commands.py

bzrlib/graph.py

bzrlib/merge.py

bzrlib/revision.py

bzrlib/revisionspec.py

bzrlib/selftest/__init__.py

bzrlib/selftest/blackbox.py

bzrlib/selftest/test_merge_core.py

bzrlib/selftest/test_revision_info.py

bzrlib/selftest/testgraph.py

bzrlib/selftest/testmerge.py

bzrlib/trace.py

testsweet.py

Show diffs side-by-side

added added

removed removed

bzrlib/commands.py

638

bzrlib.trace.log_startup(argv)

639

bzrlib.ui.ui_factory = bzrlib.ui.TextUIFactory()

640

641

return run_bzr_catch_errors(argv[1:])

642

643

644

def run_bzr_catch_errors(argv):

641

645

try:

642

646

try:

643

647

try:

644

return run_bzr(argv[1:])

648

return run_bzr(argv)

645

649

finally:

646

650

# do this here inside the exception wrappers to catch EPIPE

647

651

sys.stdout.flush()

Older »