/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/_dirstate_helpers_c.pyx

  • Committer: Martin Pool
  • Date: 2009-03-13 07:54:48 UTC
  • mfrom: (4144 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4189.
  • Revision ID: mbp@sourcefrog.net-20090313075448-jlz1t7baz7gzipqn
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_dirstate_helpers_c.pyx
841
841
    packed_stat = _pack_stat(stat_value)
842
842
    details = PyList_GetItem_void_void(PyTuple_GetItem_void_void(<void *>entry, 1), 0)
843
843
    saved_minikind = PyString_AsString_obj(<PyObject *>PyTuple_GetItem_void_void(details, 0))[0]
 
844
    if minikind == c'd' and saved_minikind == c't':
 
845
        minikind = c't'
844
846
    saved_link_or_sha1 = PyTuple_GetItem_void_object(details, 1)
845
847
    saved_file_size = PyTuple_GetItem_void_object(details, 2)
846
848
    saved_executable = PyTuple_GetItem_void_object(details, 3)
1256
1258
            path = self.pathjoin(entry[0][0], entry[0][1])
1257
1259
            # parent id is the entry for the path in the target tree
1258
1260
            # 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]
 
1261
            parent_entry = self.state._get_entry(self.target_index,
 
1262
                                                 path_utf8=entry[0][0])
 
1263
            if parent_entry is None:
 
1264
                raise errors.DirstateCorrupt(self.state,
 
1265
                    "We could not find the parent entry in index %d"
 
1266
                    " for the entry: %s"
 
1267
                    % (self.target_index, entry[0]))
 
1268
            parent_id = parent_entry[0][2]
1261
1269
            if parent_id == entry[0][2]:
1262
1270
                parent_id = None
1263
1271
            if path_info is not None: