Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 38045:18e6ea9ba81d | 38046:ee7b6fa52d9d |
|---|---|
| 252 header += ' (from %s)' % baselabel | 252 header += ' (from %s)' % baselabel |
| 253 if u1: | 253 if u1: |
| 254 repo.ui.debug("%s:\n %s\n" % (header % 'local', "\n ".join(u1))) | 254 repo.ui.debug("%s:\n %s\n" % (header % 'local', "\n ".join(u1))) |
| 255 if u2: | 255 if u2: |
| 256 repo.ui.debug("%s:\n %s\n" % (header % 'other', "\n ".join(u2))) | 256 repo.ui.debug("%s:\n %s\n" % (header % 'other', "\n ".join(u2))) |
| 257 | |
| 258 narrowmatch = repo.narrowmatch() | |
| 259 if not narrowmatch.always(): | |
| 260 u1 = [f for f in u1 if narrowmatch(f)] | |
| 261 u2 = [f for f in u2 if narrowmatch(f)] | |
| 257 return u1, u2 | 262 return u1, u2 |
| 258 | 263 |
| 259 def _makegetfctx(ctx): | 264 def _makegetfctx(ctx): |
| 260 """return a 'getfctx' function suitable for _checkcopies usage | 265 """return a 'getfctx' function suitable for _checkcopies usage |
| 261 | 266 |