← 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: Canonical.com Patch Queue Manager
  • Date: 2011-05-05 18:05:06 UTC
  • mfrom: (5802.4.1 rules)
  • Revision ID: pqm@pqm.ubuntu.com-20110505180506-ddz84ffyd1kzt6r1
(mbp) add RuleSearcher.get_single_value() (Martin Pool)

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
950
944
        link_or_sha1 = self._read_link(abspath, saved_link_or_sha1)
951
945
        if self._cutoff_time is None:
952
946
            self._sha_cutoff_time()
958
952
            entry[1][0] = ('l', '', stat_value.st_size,
959
953
                           False, DirState.NULLSTAT)
960
954
    if worth_saving:
961
 
        # Note, even though _mark_modified will only set
962
 
        # IN_MEMORY_HASH_MODIFIED, it still isn't worth 
963
 
        self._mark_modified([entry])
 
955
        self._dirblock_state = DirState.IN_MEMORY_MODIFIED
964
956
    return link_or_sha1
965
957
 
966
958
 
1793
1785
                advance_entry = -1
1794
1786
                advance_path = -1
1795
1787
                result = None
1796
 
                changed = None
1797
1788
                path_handled = 0
1798
1789
                if current_entry is None:
1799
1790
                    # unversioned -  the check for path_handled when the path