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

  • Committer: Robert Collins
  • Date: 2009-07-29 04:57:50 UTC
  • mto: This revision was merged to the branch mainline in revision 4649.
  • Revision ID: robertc@robertcollins.net-20090729045750-qp1iw48rp7jyrfh2
Change the way iter_changes treats specific files to prevent InconsistentDeltas.

This is the internal core code that handles specific file operations like ``bzr st
FILENAME`` or ``bzr commit FILENAME``, and has been changed to include the
parent directories if they have altered, and when a directory stops being
a directory its children are always included.  This fixes a number of
causes for ``InconsistentDelta`` errors, and permits faster commit of
specific paths. (Robert Collins, #347649)

Show diffs side-by-side

added added

removed removed

Lines of Context:
32
32
 
33
33
import re
34
34
 
35
 
from bzrlib import osutils
36
35
from bzrlib.iterablefile import IterableFile
37
36
 
38
37
# XXX: some redundancy is allowing to write stanzas in isolation as well as
378
377
        _read_stanza_unicode,
379
378
        _valid_tag,
380
379
        )
381
 
except ImportError, e:
382
 
    osutils.failed_to_load_extension(e)
 
380
except ImportError:
383
381
    from bzrlib._rio_py import (
384
382
       _read_stanza_utf8,
385
383
       _read_stanza_unicode,