← 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: Canonical.com Patch Queue Manager
  • Date: 2009-02-13 22:05:25 UTC
  • mfrom: (4005.1.3 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090213220525-f4o6y76g5mjtxb7k
Merge 1.12 final back into bzr.dev (and the 1.11 tip revision)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_dirstate_helpers_c.pyx
1256
1256
            path = self.pathjoin(entry[0][0], entry[0][1])
1257
1257
            # parent id is the entry for the path in the target tree
1258
1258
            # TODO: these are the same for an entire directory: cache em.
1259
 
            parent_id = self.state._get_entry(self.target_index,
1260
 
                                         path_utf8=entry[0][0])[0][2]
 
1259
            parent_entry = self.state._get_entry(self.target_index,
 
1260
                                                 path_utf8=entry[0][0])
 
1261
            if parent_entry is None:
 
1262
                raise errors.DirstateCorrupt(self.state,
 
1263
                    "We could not find the parent entry in index %d"
 
1264
                    " for the entry: %s"
 
1265
                    % (self.target_index, entry[0]))
 
1266
            parent_id = parent_entry[0][2]
1261
1267
            if parent_id == entry[0][2]:
1262
1268
                parent_id = None
1263
1269
            if path_info is not None: