← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-21 20:32:16 UTC
  • mfrom: (5809.1.2 pwit1)
  • mto: This revision was merged to the branch mainline in revision 5821.
  • Revision ID: jelmer@samba.org-20110421203216-r04j4x5vugrup6u9
Merge per-wt-inventory-tests-pt1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
3205
3205
    # If we have gotten this far, that means that we need to actually
3206
3206
    # process this entry.
3207
3207
    link_or_sha1 = None
 
3208
    worth_saving = True
3208
3209
    if minikind == 'f':
3209
3210
        executable = state._is_executable(stat_value.st_mode,
3210
3211
                                         saved_executable)
3226
3227
        else:
3227
3228
            entry[1][0] = ('f', '', stat_value.st_size,
3228
3229
                           executable, DirState.NULLSTAT)
 
3230
            worth_saving = False
3229
3231
    elif minikind == 'd':
3230
3232
        link_or_sha1 = None
3231
3233
        entry[1][0] = ('d', '', 0, False, packed_stat)
3237
3239
                state._get_block_entry_index(entry[0][0], entry[0][1], 0)
3238
3240
            state._ensure_block(block_index, entry_index,
3239
3241
                               osutils.pathjoin(entry[0][0], entry[0][1]))
 
3242
        else:
 
3243
            worth_saving = False
3240
3244
    elif minikind == 'l':
3241
3245
        link_or_sha1 = state._read_link(abspath, saved_link_or_sha1)
3242
3246
        if state._cutoff_time is None:
3248
3252
        else:
3249
3253
            entry[1][0] = ('l', '', stat_value.st_size,
3250
3254
                           False, DirState.NULLSTAT)
3251
 
    state._dirblock_state = DirState.IN_MEMORY_MODIFIED
 
3255
    if worth_saving:
 
3256
        state._dirblock_state = DirState.IN_MEMORY_MODIFIED
3252
3257
    return link_or_sha1
3253
3258
 
3254
3259