| Alphare | |
| pulkit |
| hg-reviewers |
This is more efficient, more idiomatic and more compact.
The main motivation for this change is to cleanup that area before start to do
"overwrite" tracking. Such tracking will ultimately help to avoid costly
is_ancestors call when merging changeset.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/hg-core/src/copy_tracing.rs (11 lines) |
| } | } | ||||
| Action::Removed(deleted_path) => { | Action::Removed(deleted_path) => { | ||||
| // We must drop copy information for removed file. | // We must drop copy information for removed file. | ||||
| // | // | ||||
| // We need to explicitly record them as dropped to | // We need to explicitly record them as dropped to | ||||
| // propagate this information when merging two | // propagate this information when merging two | ||||
| // TimeStampedPathCopies object. | // TimeStampedPathCopies object. | ||||
| let deleted = path_map.tokenize(deleted_path); | let deleted = path_map.tokenize(deleted_path); | ||||
| if copies.contains_key(&deleted) { | copies.entry(deleted).and_modify(|old| { | ||||
| let ttpc = TimeStampedPathCopy { | old.rev = current_rev; | ||||
| rev: current_rev, | old.path = None; | ||||
| path: None, | }); | ||||
| }; | |||||
| copies.insert(deleted, ttpc); | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| copies | copies | ||||
| } | } | ||||
| /// merge two copies-mapping together, minor and major | /// merge two copies-mapping together, minor and major | ||||
| /// | /// | ||||