← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_dirstate_helpers_py.py

  • Committer: Vincent Ladeuil
  • Date: 2008-09-11 19:36:38 UTC
  • mfrom: (3703 +trunk)
  • mto: (3705.1.1 trunk2)
  • mto: This revision was merged to the branch mainline in revision 3708.
  • Revision ID: v.ladeuil+lp@free.fr-20080911193638-wtjyc1kcmacc6t1f
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_dirstate_helpers_py.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
 
21
21
# We cannot import the dirstate module, because it loads this module
22
22
# All we really need is the IN_MEMORY_MODIFIED constant
 
23
from bzrlib import errors
23
24
from bzrlib.dirstate import DirState
24
25
 
25
26
 
201
202
    # Remove the last blank entry
202
203
    trailing = fields.pop()
203
204
    if trailing != '':
204
 
        raise AssertionError("dirstate file has trailing garbage: %r"
205
 
            % (trailing,))
 
205
        raise errors.DirstateCorrupt(state,
 
206
            'trailing garbage: %r' % (trailing,))
206
207
    # consider turning fields into a tuple.
207
208
 
208
209
    # skip the first field which is the trailing null from the header.
220
221
    field_count = len(fields)
221
222
    # this checks our adjustment, and also catches file too short.
222
223
    if field_count - cur != expected_field_count:
223
 
        raise AssertionError(
 
224
        raise errors.DirstateCorrupt(state,
224
225
            'field count incorrect %s != %s, entry_size=%s, '\
225
226
            'num_entries=%s fields=%r' % (
226
227
            field_count - cur, expected_field_count, entry_size,