← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-19 12:08:42 UTC
  • mfrom: (6437.3.8 2.5)
  • mto: (6437.3.14 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120119120842-xlq5ru2cqfcurnk9
Merge lp:bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
1071
1071
            argv_copy.append(a)
1072
1072
        i += 1
1073
1073
 
1074
 
    bzrlib.global_state.cmdline_overrides._from_cmdline(override_config)
 
1074
    if bzrlib.global_state is None:
 
1075
        # FIXME: Workaround for users that imported bzrlib but didn't call
 
1076
        # bzrlib.initialize -- vila 2012-01-19
 
1077
        cmdline_overrides = config.CommandLineStore()
 
1078
    else:
 
1079
        cmdline_overrides = bzrlib.global_state.cmdline_overrides
 
1080
    cmdline_overrides._from_cmdline(override_config)
1075
1081
 
1076
1082
    debug.set_debug_flags_from_config()
1077
1083
 
1131
1137
            trace.debug_memory('Process status after command:', short=False)
1132
1138
        option._verbosity_level = saved_verbosity_level
1133
1139
        # Reset the overrides 
1134
 
        bzrlib.global_state.cmdline_overrides._reset()
 
1140
        cmdline_overrides._reset()
1135
1141
 
1136
1142
 
1137
1143
def display_command(func):