← 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
34
34
import errno
35
35
 
36
36
import bzrlib
37
 
from bzrlib.errors import (BzrError, 
 
37
from bzrlib.errors import (BzrError,
38
38
                           BzrCheckError,
39
39
                           BzrCommandError,
40
40
                           BzrOptionError,
568
568
        i += 1
569
569
 
570
570
    argv = argv_copy
571
 
    if (not argv) or (argv[0] == '--help'):
572
 
        from bzrlib.help import help
573
 
        if len(argv) > 1:
574
 
            help(argv[1])
575
 
        else:
576
 
            help()
 
571
    if (not argv):
 
572
        from bzrlib.builtins import cmd_help
 
573
        cmd_help().run_argv([])
577
574
        return 0
578
575
 
579
576
    if argv[0] == '--version':