Mercurial > hg
comparison 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
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 22 Jan 2020 15:20:12 -0800 |
parents | 341bddf88ac5 |
children | c4f14db3da1d |
comparison
equal
deleted
inserted
replaced
44161:d7622fdec3b5 | 44162:baf3fe2977cc |
---|---|
38 user: test | 38 user: test |
39 date: Thu Jan 01 00:00:00 1970 +0000 | 39 date: Thu Jan 01 00:00:00 1970 +0000 |
40 summary: 1 | 40 summary: 1 |
41 | 41 |
42 $ hg --debug up | 42 $ hg --debug up |
43 unmatched files in other: | |
44 b | |
45 resolving manifests | 43 resolving manifests |
46 branchmerge: False, force: False, partial: False | 44 branchmerge: False, force: False, partial: False |
47 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb | 45 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
48 preserving a for resolve of a | 46 preserving a for resolve of a |
49 b: remote created -> g | 47 b: remote created -> g |
89 user: test | 87 user: test |
90 date: Thu Jan 01 00:00:00 1970 +0000 | 88 date: Thu Jan 01 00:00:00 1970 +0000 |
91 summary: 1 | 89 summary: 1 |
92 | 90 |
93 $ hg --debug up | 91 $ hg --debug up |
94 unmatched files in other: | |
95 b | |
96 resolving manifests | 92 resolving manifests |
97 branchmerge: False, force: False, partial: False | 93 branchmerge: False, force: False, partial: False |
98 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb | 94 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
99 preserving a for resolve of a | 95 preserving a for resolve of a |
100 b: remote created -> g | 96 b: remote created -> g |