Show More
@@ -149,10 +149,8 b' def _handlechangespec_2(op, inpart):' | |||
|
149 | 149 | # bundle2 parameters instead. |
|
150 | 150 | if data: |
|
151 | 151 | inc, exc = data.split('\0') |
|
152 | if inc: | |
|
153 |
|
|
|
154 | if exc: | |
|
155 | excludepats |= set(exc.splitlines()) | |
|
152 | includepats |= set(inc.splitlines()) | |
|
153 | excludepats |= set(exc.splitlines()) | |
|
156 | 154 | narrowspec.validatepatterns(includepats) |
|
157 | 155 | narrowspec.validatepatterns(excludepats) |
|
158 | 156 |
@@ -2214,14 +2214,8 b' def _getbundlechangegrouppart(bundler, r' | |||
|
2214 | 2214 | if (kwargs.get(r'narrow', False) and kwargs.get(r'narrow_acl', False) |
|
2215 | 2215 | and (include or exclude)): |
|
2216 | 2216 | narrowspecpart = bundler.newpart('narrow:spec') |
|
2217 | data = '' | |
|
2218 | if include: | |
|
2219 | data += '\n'.join(include) | |
|
2220 | data += '\0' | |
|
2221 | if exclude: | |
|
2222 | data += '\n'.join(exclude) | |
|
2223 | ||
|
2224 | narrowspecpart.data = data | |
|
2217 | narrowspecpart.data = '%s\0%s' % ('\n'.join(include), | |
|
2218 | '\n'.join(exclude)) | |
|
2225 | 2219 | |
|
2226 | 2220 | @getbundle2partsgenerator('bookmarks') |
|
2227 | 2221 | def _getbundlebookmarkpart(bundler, repo, source, bundlecaps=None, |
General Comments 0
You need to be logged in to leave comments.
Login now