/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 breezy/generate_ids.py

  • Committer: Martin
  • Date: 2018-11-16 19:09:31 UTC
  • mfrom: (7175 work)
  • mto: This revision was merged to the branch mainline in revision 7177.
  • Revision ID: gzlist@googlemail.com-20181116190931-rmh7pk2an1zuecby
Merge trunk to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/generate_ids.py
60
60
    global _gen_file_id_suffix, _gen_file_id_serial
61
61
    if _gen_file_id_suffix is None:
62
62
        _gen_file_id_suffix = ("-%s-%s-" % (
63
 
                osutils.compact_date(time.time()), osutils.rand_chars(16))
 
63
            osutils.compact_date(time.time()), osutils.rand_chars(16))
64
64
            ).encode("ascii")
65
65
    _gen_file_id_serial += 1
66
66
    return b"%s%d" % (_gen_file_id_suffix, _gen_file_id_serial)