← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/generate_ids.py

  • Committer: Brad Crittenden
  • Date: 2007-02-26 20:56:10 UTC
  • mfrom: (2300 +trunk)
  • mto: (2293.1.5 bzr.dev)
  • mto: This revision was merged to the branch mainline in revision 2311.
  • Revision ID: brad.crittenden@canonical.com-20070226205610-44oatbxrjjz3ajwy
merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/generate_ids.py
80
80
    #    filesystems
81
81
    # 4) Removing starting '.' characters to prevent the file ids from
82
82
    #    being considered hidden.
83
 
    ascii_word_only = _file_id_chars_re.sub('', name.lower())
 
83
    ascii_word_only = str(_file_id_chars_re.sub('', name.lower()))
84
84
    short_no_dots = ascii_word_only.lstrip('.')[:20]
85
85
    return short_no_dots + _next_id_suffix()
86
86
 
114
114
    if timestamp is None:
115
115
        timestamp = time.time()
116
116
 
117
 
    return '-'.join((user_or_email,
118
 
                    osutils.compact_date(timestamp),
119
 
                    unique_chunk))
 
117
    rev_id = u'-'.join((user_or_email,
 
118
                        osutils.compact_date(timestamp),
 
119
                        unique_chunk))
 
120
    return rev_id.encode('utf8')