equal
deleted
inserted
replaced
292 { |
292 { |
293 OwningDirstateMap::new_empty(data_mmap) |
293 OwningDirstateMap::new_empty(data_mmap) |
294 } else { |
294 } else { |
295 OwningDirstateMap::new_empty(Vec::new()) |
295 OwningDirstateMap::new_empty(Vec::new()) |
296 }; |
296 }; |
297 let (on_disk, placeholder) = map.get_mut_pair(); |
297 let (on_disk, placeholder) = map.get_pair_mut(); |
298 *placeholder = DirstateMap::new_v2(on_disk, data_size, metadata)?; |
298 *placeholder = DirstateMap::new_v2(on_disk, data_size, metadata)?; |
299 Ok(map) |
299 Ok(map) |
300 } else { |
300 } else { |
301 let mut map = OwningDirstateMap::new_empty(dirstate_file_contents); |
301 let mut map = OwningDirstateMap::new_empty(dirstate_file_contents); |
302 let (on_disk, placeholder) = map.get_mut_pair(); |
302 let (on_disk, placeholder) = map.get_pair_mut(); |
303 let (inner, parents) = DirstateMap::new_v1(on_disk)?; |
303 let (inner, parents) = DirstateMap::new_v1(on_disk)?; |
304 self.dirstate_parents |
304 self.dirstate_parents |
305 .set(Some(parents.unwrap_or(DirstateParents::NULL))); |
305 .set(Some(parents.unwrap_or(DirstateParents::NULL))); |
306 *placeholder = inner; |
306 *placeholder = inner; |
307 Ok(map) |
307 Ok(map) |