| Alphare | |
| pulkit |
| hg-reviewers |
The next patch will need this new indentation, having it done explicitly
beforehand makes that next patch clearer.
| 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 (76 lines) |
| pick_minor(); | pick_minor(); | ||||
| } else { | } else { | ||||
| pick_major(); | pick_major(); | ||||
| } | } | ||||
| } else if src_major.rev == src_minor.rev { | } else if src_major.rev == src_minor.rev { | ||||
| // We cannot get copy information for both p1 and p2 in the | // We cannot get copy information for both p1 and p2 in the | ||||
| // same rev. So this is the same value. | // same rev. So this is the same value. | ||||
| unreachable!(); | unreachable!(); | ||||
| } else if src_major.path.is_none() | } else { | ||||
| if src_major.path.is_none() | |||||
| && changes.salvaged.contains(dest) | && changes.salvaged.contains(dest) | ||||
| { | { | ||||
| // If the file is "deleted" in the major side but was | // If the file is "deleted" in the major side but was | ||||
| // salvaged by the merge, we keep the minor side alive | // salvaged by the merge, we keep the minor side alive | ||||
| pick_minor(); | pick_minor(); | ||||
| } else if src_minor.path.is_none() | } else if src_minor.path.is_none() | ||||
| && changes.salvaged.contains(dest) | && changes.salvaged.contains(dest) | ||||
| { | { | ||||
| // If the file is "deleted" in the minor side but was | // If the file is "deleted" in the minor side but was | ||||
| // salvaged by the merge, unconditionnaly preserve the | // salvaged by the merge, unconditionnaly preserve the | ||||
| // major side. | // major side. | ||||
| pick_major(); | pick_major(); | ||||
| } else if changes.merged.contains(dest) { | } else if changes.merged.contains(dest) { | ||||
| // If the file was actively merged, copy information from | // If the file was actively merged, copy information | ||||
| // each side might conflict. The major side will win such | // from each side might conflict. The major side will | ||||
| // conflict. | // win such conflict. | ||||
| pick_major(); | pick_major(); | ||||
| } else if oracle.is_ancestor(src_major.rev, src_minor.rev) { | } else if oracle.is_ancestor(src_major.rev, src_minor.rev) | ||||
| // If the minor side is strictly newer than the major side, | { | ||||
| // it should be kept. | // If the minor side is strictly newer than the major | ||||
| // side, it should be kept. | |||||
| pick_minor(); | pick_minor(); | ||||
| } else if src_major.path.is_some() { | } else if src_major.path.is_some() { | ||||
| // without any special case, the "major" value win other | // without any special case, the "major" value win | ||||
| // the "minor" one. | // other the "minor" one. | ||||
| pick_major(); | pick_major(); | ||||
| } else if oracle.is_ancestor(src_minor.rev, src_major.rev) { | } else if oracle.is_ancestor(src_minor.rev, src_major.rev) | ||||
| // the "major" rev is a direct ancestors of "minor", any | { | ||||
| // different value should overwrite | // the "major" rev is a direct ancestors of "minor", | ||||
| // any different value should | |||||
| // overwrite | |||||
| pick_major(); | pick_major(); | ||||
| } else { | } else { | ||||
| // major version is None (so the file was deleted on that | // major version is None (so the file was deleted on | ||||
| // branch) and that branch is independant (neither minor | // that branch) and that branch is independant (neither | ||||
| // nor major is an ancestors of the other one.) We preserve | // minor nor major is an ancestors of the other one.) | ||||
| // the new information about the new file. | // We preserve the new | ||||
| // information about the new file. | |||||
| pick_minor(); | pick_minor(); | ||||
| } | } | ||||
| } | } | ||||
| } | |||||
| }; | }; | ||||
| } | } | ||||
| let updates; | let updates; | ||||
| let mut result; | let mut result; | ||||
| if override_major.is_empty() { | if override_major.is_empty() { | ||||
| result = major | result = major | ||||
| } else if override_minor.is_empty() { | } else if override_minor.is_empty() { | ||||