← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: John Arbash Meinel
  • Date: 2007-10-17 16:44:05 UTC
  • mto: This revision was merged to the branch mainline in revision 2918.
  • Revision ID: john@arbash-meinel.com-20071017164405-fzauwbvx9wbwbtt5
Revert the changes to CommitBuilder.record_entry_contents.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
313
313
        # ancestors, we write a new node.
314
314
        if len(heads) != 1:
315
315
            store = True
316
 
        parent_entry = None
317
316
        if not store:
318
317
            # There is a single head, look it up for comparison
319
318
            parent_entry = parent_candiate_entries[heads[0]]
328
327
            if kind != parent_entry.kind:
329
328
                store = True
330
329
        if kind == 'file':
331
 
            if content_summary[2] is None:
332
 
                if parent_entry is not None:
333
 
                    executable = parent_entry.executable
334
 
                else:
335
 
                    executable = False
336
 
                content_summary = (content_summary[0], content_summary[1],
337
 
                                   executable,
338
 
                                   ) + content_summary[3:]
 
330
            assert content_summary[2] is not None, \
 
331
                "Files must not have executable = None"
339
332
            if not store:
340
333
                if (# if the file length changed we have to store:
341
334
                    parent_entry.text_size != content_summary[1] or