/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: 2009-07-15 23:13:57 UTC
  • mfrom: (4536.2.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090715231357-3abvg8h62kjh3zak
(robertc) Fix bugs 187207,
        282402 - small but annoying bugs in commit. (Robert Collins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1195
1195
                # just forget the whole block.
1196
1196
                entry_index = 0
1197
1197
                while entry_index < len(block[1]):
1198
 
                    # Mark this file id as having been removed
1199
1198
                    entry = block[1][entry_index]
1200
 
                    ids_to_unversion.discard(entry[0][2])
1201
 
                    if (entry[1][0][0] in 'ar' # don't remove absent or renamed
1202
 
                                               # entries
1203
 
                        or not state._make_absent(entry)):
 
1199
                    if entry[1][0][0] in 'ar':
 
1200
                        # don't remove absent or renamed entries
1204
1201
                        entry_index += 1
 
1202
                    else:
 
1203
                        # Mark this file id as having been removed
 
1204
                        ids_to_unversion.discard(entry[0][2])
 
1205
                        if not state._make_absent(entry):
 
1206
                            # The block has not shrunk.
 
1207
                            entry_index += 1
1205
1208
                # go to the next block. (At the moment we dont delete empty
1206
1209
                # dirblocks)
1207
1210
                block_index += 1