~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/version.py

  • Committer: John Arbash Meinel
  • Date: 2008-10-30 00:55:00 UTC
  • mto: (3815.2.5 prepare-1.9)
  • mto: This revision was merged to the branch mainline in revision 3811.
  • Revision ID: john@arbash-meinel.com-20081030005500-r5cej1cxflqhs3io
Switch so that we are using a simple timestamp as the first action.

Show diffs side-by-side

added added

removed removed

Lines of Context:
72
72
    if show_config:
73
73
        config_dir = os.path.normpath(config.config_dir())  # use native slashes
74
74
        if not isinstance(config_dir, unicode):
75
 
            config_dir = config_dir.decode(bzrlib.user_encoding)
 
75
            config_dir = config_dir.decode(osutils.get_user_encoding())
76
76
        to_file.write("  Bazaar configuration: %s\n" % (config_dir,))
77
77
        to_file.write("  Bazaar log file: ")
78
78
        to_file.write(trace._bzr_log_filename + '\n')