tweakdefaults: make hg resolve require --re-merge flag to re-merge
Pulkit suggested it in https://phab.mercurial-scm.org/D4379, and a
discussion with Octobus people reminded me that people still use the
error-prone default behavior of `hg resolve`.
Differential Revision: https://phab.mercurial-scm.org/D6610
unshelve: rename _dounshelve() to dounshelve()
This is a follow-up patch to
3de4f17f4824.
Differential Revision: https://phab.mercurial-scm.org/D6605
rust: remove Deref in favor of explicit methods
Differential Revision: https://phab.mercurial-scm.org/D6593
rust: simplify overly complicated expression
Differential Revision: https://phab.mercurial-scm.org/D6592
rust: run rfmt on all hg-core/hg-cpython code
Differential Revision: https://phab.mercurial-scm.org/D6591