/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 bzrlib/dirstate.py

  • Committer: Alexander Belchenko
  • Date: 2007-10-04 05:50:44 UTC
  • mfrom: (2881 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2884.
  • Revision ID: bialix@ukr.net-20071004055044-pb88kgkfayawro8n
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
365
365
        # find the location in the block.
366
366
        # check its not there
367
367
        # add it.
368
 
        #------- copied from inventory.make_entry
 
368
        #------- copied from inventory.ensure_normalized_name - keep synced.
369
369
        # --- normalized_filename wants a unicode basename only, so get one.
370
370
        dirname, basename = osutils.split(path)
371
371
        # we dont import normalized_filename directly because we want to be
1470
1470
        kind = inv_entry.kind
1471
1471
        minikind = DirState._kind_to_minikind[kind]
1472
1472
        tree_data = inv_entry.revision
1473
 
        assert len(tree_data) > 0, 'empty revision for the inv_entry.'
 
1473
        assert tree_data, 'empty revision for the inv_entry %s.' % \
 
1474
            inv_entry.file_id
1474
1475
        if kind == 'directory':
1475
1476
            fingerprint = ''
1476
1477
            size = 0