| pulkit |
| hg-reviewers |
This is not done for the dirstate-tree feature, since it lacks iter_mut.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| length += copy.len() + 1; | length += copy.len() + 1; | ||||
| } | } | ||||
| length | length | ||||
| }) | }) | ||||
| .sum(); | .sum(); | ||||
| let expected_size = expected_size + PARENT_SIZE * 2; | let expected_size = expected_size + PARENT_SIZE * 2; | ||||
| let mut packed = Vec::with_capacity(expected_size); | let mut packed = Vec::with_capacity(expected_size); | ||||
| let mut new_state_map = vec![]; | |||||
| packed.extend(&parents.p1); | packed.extend(&parents.p1); | ||||
| packed.extend(&parents.p2); | packed.extend(&parents.p2); | ||||
| for (filename, entry) in state_map.iter() { | for (filename, entry) in state_map.iter_mut() { | ||||
| let new_filename = filename.to_owned(); | let new_filename = filename.to_owned(); | ||||
| let mut new_mtime: i32 = entry.mtime; | let mut new_mtime: i32 = entry.mtime; | ||||
| if entry.state == EntryState::Normal && entry.mtime == now { | if entry.state == EntryState::Normal && entry.mtime == now { | ||||
| // The file was last modified "simultaneously" with the current | // The file was last modified "simultaneously" with the current | ||||
| // write to dirstate (i.e. within the same second for file- | // write to dirstate (i.e. within the same second for file- | ||||
| // systems with a granularity of 1 sec). This commonly happens | // systems with a granularity of 1 sec). This commonly happens | ||||
| // for at least a couple of files on 'update'. | // for at least a couple of files on 'update'. | ||||
| // The user could change the file without changing its size | // The user could change the file without changing its size | ||||
| // within the same second. Invalidate the file's mtime in | // within the same second. Invalidate the file's mtime in | ||||
| // dirstate, forcing future 'status' calls to compare the | // dirstate, forcing future 'status' calls to compare the | ||||
| // contents of the file if the size is the same. This prevents | // contents of the file if the size is the same. This prevents | ||||
| // mistakenly treating such files as clean. | // mistakenly treating such files as clean. | ||||
| new_mtime = -1; | new_mtime = -1; | ||||
| new_state_map.push(( | *entry = DirstateEntry { | ||||
| filename.to_owned(), | |||||
| DirstateEntry { | |||||
| mtime: new_mtime, | mtime: new_mtime, | ||||
| ..*entry | ..*entry | ||||
| }, | }; | ||||
| )); | |||||
| } | } | ||||
| let mut new_filename = new_filename.into_vec(); | let mut new_filename = new_filename.into_vec(); | ||||
| if let Some(copy) = copy_map.get(filename) { | if let Some(copy) = copy_map.get(filename) { | ||||
| new_filename.push(b'\0'); | new_filename.push(b'\0'); | ||||
| new_filename.extend(copy.bytes()); | new_filename.extend(copy.bytes()); | ||||
| } | } | ||||
| packed.write_u8(entry.state.into())?; | packed.write_u8(entry.state.into())?; | ||||
| packed.write_i32::<BigEndian>(entry.mode)?; | packed.write_i32::<BigEndian>(entry.mode)?; | ||||
| packed.write_i32::<BigEndian>(entry.size)?; | packed.write_i32::<BigEndian>(entry.size)?; | ||||
| packed.write_i32::<BigEndian>(new_mtime)?; | packed.write_i32::<BigEndian>(new_mtime)?; | ||||
| packed.write_i32::<BigEndian>(new_filename.len() as i32)?; | packed.write_i32::<BigEndian>(new_filename.len() as i32)?; | ||||
| packed.extend(new_filename) | packed.extend(new_filename) | ||||
| } | } | ||||
| if packed.len() != expected_size { | if packed.len() != expected_size { | ||||
| return Err(DirstatePackError::BadSize(expected_size, packed.len())); | return Err(DirstatePackError::BadSize(expected_size, packed.len())); | ||||
| } | } | ||||
| state_map.extend(new_state_map); | |||||
| Ok(packed) | Ok(packed) | ||||
| } | } | ||||
| /// `now` is the duration in seconds since the Unix epoch | /// `now` is the duration in seconds since the Unix epoch | ||||
| #[cfg(feature = "dirstate-tree")] | #[cfg(feature = "dirstate-tree")] | ||||
| pub fn pack_dirstate( | pub fn pack_dirstate( | ||||
| state_map: &mut StateMap, | state_map: &mut StateMap, | ||||
| copy_map: &CopyMap, | copy_map: &CopyMap, | ||||
| parents: DirstateParents, | parents: DirstateParents, | ||||