| durin42 |
| hg-reviewers |
The copies overrides seems to have been a little complicated just by
not being in core. When moved to core, it becomes trivial (at least I
think these overrides have the same effect).
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| D | M | hgext/narrow/narrowcopies.py (34 lines) | ||
| M | mercurial/copies.py (8 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Martin von Zweigbergk | Sep 28 2018, 3:56 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # narrowcopies.py - extensions to mercurial copies module to support narrow | |||||
| # clones | |||||
| # | |||||
| # Copyright 2017 Google, Inc. | |||||
| # | |||||
| # This software may be used and distributed according to the terms of the | |||||
| # GNU General Public License version 2 or any later version. | |||||
| from __future__ import absolute_import | |||||
| from mercurial import ( | |||||
| copies, | |||||
| extensions, | |||||
| ) | |||||
| def setup(repo): | |||||
| def _computeforwardmissing(orig, a, b, match=None): | |||||
| missing = orig(a, b, match) | |||||
| narrowmatch = repo.narrowmatch() | |||||
| if narrowmatch.always(): | |||||
| return missing | |||||
| missing = [f for f in missing if narrowmatch(f)] | |||||
| return missing | |||||
| def _checkcopies(orig, srcctx, dstctx, f, base, tca, remotebase, limit, | |||||
| data): | |||||
| narrowmatch = repo.narrowmatch() | |||||
| if not narrowmatch(f): | |||||
| return | |||||
| orig(srcctx, dstctx, f, base, tca, remotebase, limit, data) | |||||
| extensions.wrapfunction(copies, '_computeforwardmissing', | |||||
| _computeforwardmissing) | |||||
| extensions.wrapfunction(copies, '_checkcopies', _checkcopies) | |||||
| header = " unmatched files in %s" | header = " unmatched files in %s" | ||||
| if baselabel: | if baselabel: | ||||
| header += ' (from %s)' % baselabel | header += ' (from %s)' % baselabel | ||||
| if u1: | if u1: | ||||
| repo.ui.debug("%s:\n %s\n" % (header % 'local', "\n ".join(u1))) | repo.ui.debug("%s:\n %s\n" % (header % 'local', "\n ".join(u1))) | ||||
| if u2: | if u2: | ||||
| repo.ui.debug("%s:\n %s\n" % (header % 'other', "\n ".join(u2))) | repo.ui.debug("%s:\n %s\n" % (header % 'other', "\n ".join(u2))) | ||||
| narrowmatch = repo.narrowmatch() | |||||
| if not narrowmatch.always(): | |||||
| u1 = [f for f in u1 if narrowmatch(f)] | |||||
| u2 = [f for f in u2 if narrowmatch(f)] | |||||
| return u1, u2 | return u1, u2 | ||||
| def _makegetfctx(ctx): | def _makegetfctx(ctx): | ||||
| """return a 'getfctx' function suitable for _checkcopies usage | """return a 'getfctx' function suitable for _checkcopies usage | ||||
| We have to re-setup the function building 'filectx' for each | We have to re-setup the function building 'filectx' for each | ||||
| '_checkcopies' to ensure the linkrev adjustment is properly setup for | '_checkcopies' to ensure the linkrev adjustment is properly setup for | ||||
| each. Linkrev adjustment is important to avoid bug in rename | each. Linkrev adjustment is important to avoid bug in rename | ||||
| data2 = {'copy': {}, | data2 = {'copy': {}, | ||||
| 'fullcopy': {}, | 'fullcopy': {}, | ||||
| 'incomplete': {}, | 'incomplete': {}, | ||||
| 'diverge': diverge, | 'diverge': diverge, | ||||
| 'incompletediverge': incompletediverge, | 'incompletediverge': incompletediverge, | ||||
| } | } | ||||
| # find interesting file sets from manifests | # find interesting file sets from manifests | ||||
| addedinm1 = m1.filesnotin(mb) | addedinm1 = m1.filesnotin(mb, repo.narrowmatch()) | ||||
| addedinm2 = m2.filesnotin(mb) | addedinm2 = m2.filesnotin(mb, repo.narrowmatch()) | ||||
| bothnew = sorted(addedinm1 & addedinm2) | bothnew = sorted(addedinm1 & addedinm2) | ||||
| if tca == base: | if tca == base: | ||||
| # unmatched file from base | # unmatched file from base | ||||
| u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2) | u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2) | ||||
| u1u, u2u = u1r, u2r | u1u, u2u = u1r, u2r | ||||
| else: | else: | ||||
| # unmatched file from base (DAG rotation in the graft case) | # unmatched file from base (DAG rotation in the graft case) | ||||
| u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2, | u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2, | ||||