Mercurial > hg
comparison mercurial/exchange.py @ 40352:dd816e5391f6
py3: add a r'' prefix in mercurial/exchange.py
# skip-blame because just r'' prefix
This fixes test-narrow-acl.t on py3 which was broken by one of the
earlier patches.
Differential Revision: https://phab.mercurial-scm.org/D5149
| author | Pulkit Goyal <pulkit@yandex-team.ru> |
|---|---|
| date | Thu, 18 Oct 2018 14:41:14 +0300 |
| parents | 2c5835b4246b |
| children | 440f5b65be57 |
comparison
equal
deleted
inserted
replaced
| 40351:b1eb19301c94 | 40352:dd816e5391f6 |
|---|---|
| 2168 mandatory=False) | 2168 mandatory=False) |
| 2169 | 2169 |
| 2170 if 'treemanifest' in repo.requirements: | 2170 if 'treemanifest' in repo.requirements: |
| 2171 part.addparam('treemanifest', '1') | 2171 part.addparam('treemanifest', '1') |
| 2172 | 2172 |
| 2173 if (kwargs.get(r'narrow', False) and kwargs.get('narrow_acl', False) | 2173 if (kwargs.get(r'narrow', False) and kwargs.get(r'narrow_acl', False) |
| 2174 and (include or exclude)): | 2174 and (include or exclude)): |
| 2175 narrowspecpart = bundler.newpart('narrow:spec') | 2175 narrowspecpart = bundler.newpart('narrow:spec') |
| 2176 if include: | 2176 if include: |
| 2177 narrowspecpart.addparam( | 2177 narrowspecpart.addparam( |
| 2178 'include', '\n'.join(include), mandatory=True) | 2178 'include', '\n'.join(include), mandatory=True) |