/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/workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-13 05:55:15 UTC
  • mfrom: (2348.1.2 mz.symlinks)
  • Revision ID: pqm@pqm.ubuntu.com-20070313055515-823e15af73d49270
(marienz,r=john,r=mbp) fix error committing merge with symlinks in dirstate

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
362
362
                    # add this entry to the parent map.
363
363
                    parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
364
364
                elif kind == 'tree-reference':
365
 
                    assert self._repo_supports_tree_reference
 
365
                    assert self._repo_supports_tree_reference, \
 
366
                        "repository of %r " \
 
367
                        "doesn't support tree references " \
 
368
                        "required by entry %r" \
 
369
                        % (self, name)
366
370
                    inv_entry.reference_revision = link_or_sha1 or None
367
 
                else:
368
 
                    assert 'unknown kind'
 
371
                elif kind != 'symlink':
 
372
                    raise AssertionError("unknown kind %r" % kind)
369
373
                # These checks cost us around 40ms on a 55k entry tree
370
374
                assert file_id not in inv_byid, ('file_id %s already in'
371
375
                    ' inventory as %s' % (file_id, inv_byid[file_id]))
1400
1404
                    parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
1401
1405
                elif kind == 'symlink':
1402
1406
                    inv_entry.executable = False
1403
 
                    inv_entry.text_size = size
 
1407
                    inv_entry.text_size = None
1404
1408
                    inv_entry.symlink_target = utf8_decode(fingerprint)[0]
1405
1409
                elif kind == 'tree-reference':
1406
1410
                    inv_entry.reference_revision = fingerprint or None