~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/generate_ids.py

  • Committer: Martin Pool
  • Date: 2007-02-21 05:34:56 UTC
  • mfrom: (2296 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2309.
  • Revision ID: mbp@sourcefrog.net-20070221053456-vyr6o0ehqnbetrvb
merge trunk, in particular new Branch6 changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
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')