← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

(jelmer) Actually fetch revisions when branching into existing bzrdir.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
1081
1081
            argv_copy.append(a)
1082
1082
        i += 1
1083
1083
 
1084
 
    bzrlib.global_state.cmdline_overrides._from_cmdline(override_config)
 
1084
    if bzrlib.global_state is None:
 
1085
        # FIXME: Workaround for users that imported bzrlib but didn't call
 
1086
        # bzrlib.initialize -- vila 2012-01-19
 
1087
        cmdline_overrides = config.CommandLineStore()
 
1088
    else:
 
1089
        cmdline_overrides = bzrlib.global_state.cmdline_overrides
 
1090
    cmdline_overrides._from_cmdline(override_config)
1085
1091
 
1086
1092
    debug.set_debug_flags_from_config()
1087
1093
 
1141
1147
            trace.debug_memory('Process status after command:', short=False)
1142
1148
        option._verbosity_level = saved_verbosity_level
1143
1149
        # Reset the overrides 
1144
 
        bzrlib.global_state.cmdline_overrides._reset()
 
1150
        cmdline_overrides._reset()
1145
1151
 
1146
1152
 
1147
1153
def display_command(func):