comparison mercurial/subrepoutil.py @ 42591:bcb4b5c5964b

copies: move short-circuiting of dirstate copies out of _forwardcopies() I'd like to move the filtering of copies we do after chaining to the end of all chaining (in a single place in pathcopies()). One problem that came up when trying that was that we allow things like `hg cp -f <file> <existing file>` so the user can later amend that in. Filtering at the end would mean that we remove those copies. That would break `hg st -C`. This patch therefore moves the short-circuiting of dirstate copies into pathcopies() so we can more easily handle the dirstate-only case differently. I initially thought this might change some behavior when the user does `hg status --rev 'wdir()' --rev .` during an uncommitted merge, since _backwardrenames() would reverse the copies in that case. However, I couldn't come up with a test case where it made a difference. Differential Revision: https://phab.mercurial-scm.org/D6600
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 28 Jun 2019 09:01:45 -0700
parents f6540aba8e3e
children 2372284d9457
comparison
equal deleted inserted replaced
42590:ab416b5d9b91 42591:bcb4b5c5964b