← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_dirstate_helpers_pyx.pyx

  • Committer: Vincent Ladeuil
  • Date: 2011-05-17 21:49:18 UTC
  • mfrom: (5743.12.8 config-options)
  • mto: This revision was merged to the branch mainline in revision 5945.
  • Revision ID: v.ladeuil+lp@free.fr-20110517214918-9w7osyp0i8if0kk0
Merge config-options into config-editor-option

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_dirstate_helpers_pyx.pyx
941
941
            # re-writing a dirstate for just this
942
942
            worth_saving = 0
943
943
    elif minikind == c'l':
 
944
        if saved_minikind == c'l':
 
945
            # If the object hasn't changed kind, it isn't worth saving the
 
946
            # dirstate just for a symlink. The default is 'fast symlinks' which
 
947
            # save the target in the inode entry, rather than separately. So to
 
948
            # stat, we've already read everything off disk.
 
949
            worth_saving = 0
944
950
        link_or_sha1 = self._read_link(abspath, saved_link_or_sha1)
945
951
        if self._cutoff_time is None:
946
952
            self._sha_cutoff_time()
952
958
            entry[1][0] = ('l', '', stat_value.st_size,
953
959
                           False, DirState.NULLSTAT)
954
960
    if worth_saving:
955
 
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
 
961
        # Note, even though _mark_modified will only set
 
962
        # IN_MEMORY_HASH_MODIFIED, it still isn't worth 
 
963
        self._mark_modified([entry])
956
964
    return link_or_sha1
957
965
 
958
966