Mercurial > hg
diff mercurial/copies.py @ 38046:ee7b6fa52d9d
narrow: filter copies in core
Differential Revision: https://phab.mercurial-scm.org/D3576
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 17 May 2018 15:33:28 -0700 |
| parents | d7114f883505 |
| children | b5891bf8ab13 |
line wrap: on
line diff
--- a/mercurial/copies.py Thu May 17 15:25:52 2018 -0700 +++ b/mercurial/copies.py Thu May 17 15:33:28 2018 -0700 @@ -254,6 +254,11 @@ repo.ui.debug("%s:\n %s\n" % (header % 'local', "\n ".join(u1))) if 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 def _makegetfctx(ctx):