← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

  • Committer: Martin Pool
  • Date: 2010-09-15 10:40:51 UTC
  • mfrom: (5425 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5426.
  • Revision ID: mbp@sourcefrog.net-20100915104051-pkjmuc2bc27buysp
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
2876
2876
            # converted to relocated.
2877
2877
            if path_utf8 is None:
2878
2878
                raise AssertionError('no path')
2879
 
            existing_keys = id_index[key[2]]
 
2879
            existing_keys = id_index.get(key[2], ())
2880
2880
            if key not in existing_keys:
2881
2881
                raise AssertionError('We found the entry in the blocks, but'
2882
2882
                    ' the key is not in the id_index.'
2883
2883
                    ' key: %s, existing_keys: %s' % (key, existing_keys))
2884
 
            for entry_key in id_index[key[2]]:
 
2884
            for entry_key in existing_keys:
2885
2885
                # TODO:PROFILING: It might be faster to just update
2886
2886
                # rather than checking if we need to, and then overwrite
2887
2887
                # the one we are located at.