##// END OF EJS Templates
rust-repo: don't use on-disk dirstate parents in v1...
Raphaël Gomès -
r52940:e1fe336c default
parent child Browse files
Show More
@@ -450,11 +450,14 impl Repo {
450 debug_wait_for_file_or_print(self.config(), "dirstate.pre-read-file");
450 debug_wait_for_file_or_print(self.config(), "dirstate.pre-read-file");
451 let identity = self.dirstate_identity()?;
451 let identity = self.dirstate_identity()?;
452 let dirstate_file_contents = self.dirstate_file_contents()?;
452 let dirstate_file_contents = self.dirstate_file_contents()?;
453 let parents = self.dirstate_parents()?;
453 if dirstate_file_contents.is_empty() {
454 if dirstate_file_contents.is_empty() {
454 self.dirstate_parents.set(DirstateParents::NULL);
455 self.dirstate_parents.set(parents);
455 Ok(OwningDirstateMap::new_empty(Vec::new(), identity))
456 Ok(OwningDirstateMap::new_empty(Vec::new(), identity))
456 } else {
457 } else {
457 let (map, parents) =
458 // Ignore the dirstate on-disk parents, they may have been set in
459 // the repo before
460 let (map, _) =
458 OwningDirstateMap::new_v1(dirstate_file_contents, identity)?;
461 OwningDirstateMap::new_v1(dirstate_file_contents, identity)?;
459 self.dirstate_parents.set(parents);
462 self.dirstate_parents.set(parents);
460 Ok(map)
463 Ok(map)
General Comments 0
You need to be logged in to leave comments. Login now