← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/check.py

  • Committer: mbp at sourcefrog
  • Date: 2005-04-06 14:06:32 UTC
  • Revision ID: mbp@sourcefrog.net-20050406140632-b44f572e110216f266a43b71
pychecker fixups

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/check.py
23
23
import sys
24
24
from sets import Set
25
25
 
26
 
import bzrlib
27
26
from trace import mutter
28
27
from errors import bailout
29
28
import osutils
74
73
        for file_id in inv:
75
74
            if file_id in seen_ids:
76
75
                bailout('duplicated file_id {%s} in inventory for revision {%s}'
77
 
                        % (file_id, revid))
 
76
                        % (file_id, rid))
78
77
            seen_ids.add(file_id)
79
78
 
80
79
        i = 0
89
88
            if ie.parent_id != None:
90
89
                if ie.parent_id not in seen_ids:
91
90
                    bailout('missing parent {%s} in inventory for revision {%s}'
92
 
                            % (ie.parent_id, revid))
 
91
                            % (ie.parent_id, rid))
93
92
 
94
93
            if ie.kind == 'file':
95
94
                if ie.text_id in checked_texts:
109
108
            elif ie.kind == 'directory':
110
109
                if ie.text_sha1 != None or ie.text_size != None or ie.text_id != None:
111
110
                    bailout('directory {%s} has text in revision {%s}'
112
 
                            % (file_id, revid))
 
111
                            % (file_id, rid))
113
112
 
114
113
        p('revision %d/%d file paths' % (revno, revcount))
115
114
        for path, ie in inv.iter_entries():