← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: John Arbash Meinel
  • Date: 2006-11-02 22:48:49 UTC
  • mto: This revision was merged to the branch mainline in revision 2132.
  • Revision ID: john@arbash-meinel.com-20061102224849-9683d741ce3fbe38
Update file and revision id generators.
Move id generation to its own file, deprecate the old functions, 
make gen_revision_id() not require an email address in the
username, and use rand_chars() instead of hexlify(rand_bytes())

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
39
39
import bzrlib
40
40
from bzrlib import (
41
41
    errors,
 
42
    generate_ids,
42
43
    osutils,
43
44
    symbol_versioning,
44
45
    )
1086
1087
 
1087
1088
        if len(parts) == 0:
1088
1089
            if file_id is None:
1089
 
                file_id = bzrlib.workingtree.gen_root_id()
 
1090
                file_id = generate_ids.gen_root_id()
1090
1091
            self.root = InventoryDirectory(file_id, '', None)
1091
1092
            self._byid = {self.root.file_id: self.root}
1092
1093
            return
1283
1284
    :param file_id: the file_id to use. if None, one will be created.
1284
1285
    """
1285
1286
    if file_id is None:
1286
 
        file_id = bzrlib.workingtree.gen_file_id(name)
 
1287
        file_id = generate_ids.gen_file_id(name)
1287
1288
 
1288
1289
    norm_name, can_access = osutils.normalized_filename(name)
1289
1290
    if norm_name != name: