copies: move `merged` testing sooner
previously `is_merged` was an expensive callback. Now that all this data is
pre-computed, this is is a simple membership testing.
So it is probably cheaper than the membership testing.
Differential Revision: https://phab.mercurial-scm.org/D9141
--- a/mercurial/copies.py Thu Oct 01 09:42:39 2020 +0200
+++ b/mercurial/copies.py Thu Oct 01 09:45:00 2020 +0200
@@ -397,9 +397,9 @@
and dest in changes.salvaged
):
minor[dest] = value
- elif not isancestor(new_tt, other_tt):
+ elif changes is not None and dest in changes.merged:
minor[dest] = value
- elif changes is not None and dest in changes.merged:
+ elif not isancestor(new_tt, other_tt):
minor[dest] = value