← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_dirstate_helpers_c.pyx

  • Committer: Ian Clatworthy
  • Date: 2009-06-09 01:52:10 UTC
  • mto: (4427.1.2 integration)
  • mto: This revision was merged to the branch mainline in revision 4431.
  • Revision ID: ian.clatworthy@canonical.com-20090609015210-82yzboxtvreic3xg
fix pyrex version of _process_entry as well

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_dirstate_helpers_c.pyx
1140
1140
                    if source_minikind != c'f':
1141
1141
                        content_change = 1
1142
1142
                    else:
1143
 
                        # If the size is the same, check the sha:
1144
 
                        if target_details[2] == source_details[2]:
1145
 
                            if link_or_sha1 is None:
1146
 
                                # Stat cache miss:
1147
 
                                statvalue, link_or_sha1 = \
1148
 
                                    self.state._sha1_provider.stat_and_sha1(
1149
 
                                    path_info[4])
1150
 
                                self.state._observed_sha1(entry, link_or_sha1,
1151
 
                                    statvalue)
1152
 
                            content_change = (link_or_sha1 != source_details[1])
1153
 
                        else:
1154
 
                            # Size changed, so must be different
1155
 
                            content_change = 1
 
1143
                        # Check the sha. We can't just rely on the size as
 
1144
                        # content filtering may mean differ sizes actually
 
1145
                        # map to the same content
 
1146
                        if link_or_sha1 is None:
 
1147
                            # Stat cache miss:
 
1148
                            statvalue, link_or_sha1 = \
 
1149
                                self.state._sha1_provider.stat_and_sha1(
 
1150
                                path_info[4])
 
1151
                            self.state._observed_sha1(entry, link_or_sha1,
 
1152
                                statvalue)
 
1153
                        content_change = (link_or_sha1 != source_details[1])
1156
1154
                    # Target details is updated at update_entry time
1157
1155
                    if self.use_filesystem_for_exec:
1158
1156
                        # We don't need S_ISREG here, because we are sure