← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
271
271
        # bogus. So set the attribute, so we can find the correct encoding later.
272
272
        self.outf.encoding = output_encoding
273
273
 
274
 
    @deprecated_method(zero_eight)
275
 
    def run_argv(self, argv):
276
 
        """Parse command line and run.
277
 
        
278
 
        See run_argv_aliases for the 0.8 and beyond api.
279
 
        """
280
 
        return self.run_argv_aliases(argv)
281
 
 
282
274
    def run_argv_aliases(self, argv, alias_argv=None):
283
275
        """Parse the command line and run with extra aliases in alias_argv."""
284
276
        if argv is None:
596
588
    # 'command not found' error later.
597
589
 
598
590
    cmd_obj = get_cmd_object(cmd, plugins_override=not opt_builtin)
599
 
    if not getattr(cmd_obj.run_argv, 'is_deprecated', False):
600
 
        run = cmd_obj.run_argv
601
 
        run_argv = [argv]
602
 
    else:
603
 
        run = cmd_obj.run_argv_aliases
604
 
        run_argv = [argv, alias_argv]
 
591
    run = cmd_obj.run_argv_aliases
 
592
    run_argv = [argv, alias_argv]
605
593
 
606
594
    try:
607
595
        if opt_lsprof: