This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9495

copies-rust: use the `entry` API for copy information too
ClosedPublic

Authored by marmoute on Dec 2 2020, 11:02 AM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0a721fc457bf: copies-rust: use the `entry` API for copy information too
Summary

The code end up being complicated, but it split out the case were we add a new
entry from the case were we overwrite one. And that is the goal here, being able
to easily track value overwrite.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Dec 2 2020, 11:02 AM
baymax updated this revision to Diff 23959.Dec 2 2020, 1:19 PM
Alphare accepted this revision.Dec 14 2020, 4:48 AM
marmoute updated this revision to Diff 24218.Dec 14 2020, 6:17 AM
baymax updated this revision to Diff 24239.Dec 14 2020, 7:48 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.Dec 17 2020, 6:15 AM
This revision is now accepted and ready to land.Dec 17 2020, 6:15 AM
baymax updated this revision to Diff 24356.Dec 17 2020, 3:47 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/copy_tracing.rs (20 lines)

Diff 24426

rust/hg-core/src/copy_tracing.rs

use crate::utils::hg_path::HgPath; use crate::utils::hg_path::HgPath;
use crate::utils::hg_path::HgPathBuf; use crate::utils::hg_path::HgPathBuf;
use crate::Revision; use crate::Revision;
use crate::NULL_REVISION; use crate::NULL_REVISION;
use im_rc::ordmap::DiffItem; use im_rc::ordmap::DiffItem;
use im_rc::ordmap::Entry;
use im_rc::ordmap::OrdMap; use im_rc::ordmap::OrdMap;
use std::cmp::Ordering; use std::cmp::Ordering;
use std::collections::HashMap; use std::collections::HashMap;
use std::convert::TryInto; use std::convert::TryInto;
pub type PathCopies = HashMap<HgPathBuf, HgPathBuf>; pub type PathCopies = HashMap<HgPathBuf, HgPathBuf>;
} }
} else { } else {
entry = Some(source.to_owned()); entry = Some(source.to_owned());
} }
// Each new entry is introduced by the children, we // Each new entry is introduced by the children, we
// record this information as we will need it to take // record this information as we will need it to take
// the right decision when merging conflicting copy // the right decision when merging conflicting copy
// information. See merge_copies_dict for details. // information. See merge_copies_dict for details.
match copies.entry(dest) {
Entry::Vacant(slot) => {
let ttpc = TimeStampedPathCopy { let ttpc = TimeStampedPathCopy {
rev: current_rev, rev: current_rev,
path: entry, path: entry,
}; };
copies.insert(dest.to_owned(), ttpc); slot.insert(ttpc);
}
Entry::Occupied(mut slot) => {
let mut ttpc = slot.get_mut();
ttpc.rev = current_rev;
ttpc.path = entry;
}
}
} }
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);