| hg-reviewers |
I'll add another callers in the next patch.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/copies.py (18 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # combine copies from dirstate if necessary | # combine copies from dirstate if necessary | ||||
| copies = _chain(cm, _dirstatecopies(b._repo, match)) | copies = _chain(cm, _dirstatecopies(b._repo, match)) | ||||
| else: | else: | ||||
| copies = _committedforwardcopies(a, b, base, match) | copies = _committedforwardcopies(a, b, base, match) | ||||
| return copies | return copies | ||||
| def _backwardrenames(a, b, match): | def _backwardrenames(a, b, match): | ||||
| """find renames from a to b""" | |||||
| if a._repo.ui.config(b'experimental', b'copytrace') == b'off': | if a._repo.ui.config(b'experimental', b'copytrace') == b'off': | ||||
| return {} | return {} | ||||
| # Even though we're not taking copies into account, 1:n rename situations | |||||
| # can still exist (e.g. hg cp a b; hg mv a c). In those cases we | |||||
| # arbitrarily pick one of the renames. | |||||
| # We don't want to pass in "match" here, since that would filter | # We don't want to pass in "match" here, since that would filter | ||||
| # the destination by it. Since we're reversing the copies, we want | # the destination by it. Since we're reversing the copies, we want | ||||
| # to filter the source instead. | # to filter the source instead. | ||||
| f = _forwardcopies(b, a) | copies = _forwardcopies(b, a) | ||||
| return _reverse_renames(copies, a, match) | |||||
| def _reverse_renames(copies, dst, match): | |||||
| """given copies to context 'dst', finds renames from that context""" | |||||
| # Even though we're not taking copies into account, 1:n rename situations | |||||
| # can still exist (e.g. hg cp a b; hg mv a c). In those cases we | |||||
| # arbitrarily pick one of the renames. | |||||
| r = {} | r = {} | ||||
| for k, v in sorted(pycompat.iteritems(f)): | for k, v in sorted(pycompat.iteritems(copies)): | ||||
| if match and not match(v): | if match and not match(v): | ||||
| continue | continue | ||||
| # remove copies | # remove copies | ||||
| if v in a: | if v in dst: | ||||
| continue | continue | ||||
| r[v] = k | r[v] = k | ||||
| return r | return r | ||||
| def pathcopies(x, y, match=None): | def pathcopies(x, y, match=None): | ||||
| """find {dst@y: src@x} copy mapping for directed compare""" | """find {dst@y: src@x} copy mapping for directed compare""" | ||||
| repo = x._repo | repo = x._repo | ||||