← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Vincent Ladeuil
  • Date: 2011-02-08 13:56:49 UTC
  • mfrom: (5609.2.12 2.3)
  • mto: This revision was merged to the branch mainline in revision 5652.
  • Revision ID: v.ladeuil+lp@free.fr-20110208135649-5w2ifp3o040h83f3
Merge 2.3 into trunk including fixes for bug #715058 and bug #713258

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
691
691
            return self.run(**all_cmd_args)
692
692
        finally:
693
693
            # reset it, so that other commands run in the same process won't
694
 
            # inherit state
 
694
            # inherit state. Before we reset it, log any activity, so that it
 
695
            # gets properly tracked.
 
696
            ui.ui_factory.log_transport_activity(
 
697
                display=('bytes' in debug.debug_flags))
695
698
            trace.set_verbosity_level(0)
696
699
 
697
700
    def _setup_run(self):
1202
1205
    argv = _specified_or_unicode_argv(argv)
1203
1206
    _register_builtin_commands()
1204
1207
    ret = run_bzr_catch_errors(argv)
1205
 
    bzrlib.ui.ui_factory.log_transport_activity(
1206
 
        display=('bytes' in debug.debug_flags))
1207
1208
    trace.mutter("return code %d", ret)
1208
1209
    return ret
1209
1210