Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 16 Dec 2020 11:06:58 +0100] rev 46581
copies-rust: record "overwritten" information from both side on delete
With this change, we can ensure every (`dest`, `rev`) points to the same value,
making a lots of comparison simpler.
Differential Revision: https://phab.mercurial-scm.org/D9652
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 16 Dec 2020 10:59:00 +0100] rev 46580
copies-rust: refactor the "deletion" case
We rearrange the code to single out the case where information need to be
overwritten on both side of the merge. This open the way to better dealing with
this case.
Differential Revision: https://phab.mercurial-scm.org/D9651
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 16 Dec 2020 10:46:08 +0100] rev 46579
copies-rust: process copy information of both parent at the same time
This avoid a double iteration and this open the way to a better handing of
deletion. That better handling of deletion is the core reason we are doing this
refactoring.
Differential Revision: https://phab.mercurial-scm.org/D9650
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 21 Dec 2020 10:24:16 +0100] rev 46578
copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()`
Instead of filtering the relevant parent inside de ChangedFiles method, we now
yield all copies information and let the caller do the filtering. Soon, the
filtering will be replaced by dispatching.
Differential Revision: https://phab.mercurial-scm.org/D9649
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 16 Dec 2020 10:01:34 +0100] rev 46577
copies-rust: extract the processing of a single copy information
This will make it easy to process copy from both p1 and p2 in the same
`add_from_changes` call.
Differential Revision: https://phab.mercurial-scm.org/D9648
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 16 Dec 2020 09:42:04 +0100] rev 46576
copies-rust: use matching to select the final copies information
This is a bit more idiomatic and this prepare a future refactoring where
InternalCopies from both parent would be updated at the same time.
Differential Revision: https://phab.mercurial-scm.org/D9647
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 16 Dec 2020 09:30:25 +0100] rev 46575
copies-rust: get the parents' copies earlier
This remove some conditional nesting and prepare for future work were we will
unify the handling of copies from p1 and p2.
Differential Revision: https://phab.mercurial-scm.org/D9646
Pulkit Goyal <7895pulkit@gmail.com> [Tue, 09 Mar 2021 11:19:11 +0530] rev 46574
Added signature for changeset d5d9177c0045
Pulkit Goyal <7895pulkit@gmail.com> [Tue, 09 Mar 2021 11:19:01 +0530] rev 46573
Added tag 5.7.1 for changeset d5d9177c0045
Matt Harbison <matt_harbison@yahoo.com> [Mon, 08 Mar 2021 16:55:39 -0500] rev 46572
localrepo: fix conversion of exceptions to strings flagged by pytype
This is the same as e571fec5b606. I assume the 3 similar uses of `bytestr` in
`__getitem__()` are OK (even though pytype also flags them), because there is
apparently test coverage for 2 of the 3 cases.
Differential Revision: https://phab.mercurial-scm.org/D10131