/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Jelmer Vernooij
  • Date: 2007-09-16 19:29:00 UTC
  • mfrom: (2823 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2824.
  • Revision ID: jelmer@samba.org-20070916192900-fph1i2wsytberyyl
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
449
449
 
450
450
        output_encoding = osutils.get_terminal_encoding()
451
451
 
452
 
        # use 'replace' so that we don't abort if trying to write out
453
 
        # in e.g. the default C locale.
454
 
        self.outf = codecs.getwriter(output_encoding)(sys.stdout, errors=self.encoding_type)
 
452
        self.outf = codecs.getwriter(output_encoding)(sys.stdout,
 
453
                        errors=self.encoding_type)
455
454
        # For whatever reason codecs.getwriter() does not advertise its encoding
456
455
        # it just returns the encoding of the wrapped file, which is completely
457
456
        # bogus. So set the attribute, so we can find the correct encoding later.
722
721
        return 0
723
722
 
724
723
    if argv[0] == '--version':
725
 
        from bzrlib.version import show_version
726
 
        show_version()
 
724
        from bzrlib.builtins import cmd_version
 
725
        cmd_version().run_argv_aliases([])
727
726
        return 0
728
727
        
729
728
    if not opt_no_plugins:
797
796
 
798
797
 
799
798
def run_bzr_catch_errors(argv):
 
799
    # Note: The except clause logic below should be kept in sync with the
 
800
    # profile() routine in lsprof.py.
800
801
    try:
801
802
        return run_bzr(argv)
802
803
    except (KeyboardInterrupt, Exception), e: