diff tests/test-up-local-change.t @ 44162:baf3fe2977cc

copies: move early return in mergecopies() earlier

It wasn't obvious that the early return happened only when there are
no copies. That is the case, however, because if `fullcopy` is empty,
then so is `copies1` and `copies2`, and then so is `inversecopies1`
and `inversecopies2`, and then so is `allsources`, and then so is
`copy`, `diverge` and `renamedelete`.

By moving the early return earlier, we also avoid calculating the set
of added files from the base to each side.

Differential Revision: https://phab.mercurial-scm.org/D7975

--- a/tests/test-up-local-change.t	Fri Jan 24 07:00:45 2020 -0800
+++ b/tests/test-up-local-change.t	Wed Jan 22 15:20:12 2020 -0800
@@ -40,8 +40,6 @@
   summary:     1
   
   $ hg --debug up
-    unmatched files in other:
-     b
   resolving manifests
    branchmerge: False, force: False, partial: False
    ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb
@@ -91,8 +89,6 @@
   summary:     1
   
   $ hg --debug up
-    unmatched files in other:
-     b
   resolving manifests
    branchmerge: False, force: False, partial: False
    ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb