Show More
@@ -151,6 +151,7 b' def _handlechangespec_2(op, inpart):' | |||||
151 | op.repo.requirements.add(repository.NARROW_REQUIREMENT) |
|
151 | op.repo.requirements.add(repository.NARROW_REQUIREMENT) | |
152 | op.repo._writerequirements() |
|
152 | op.repo._writerequirements() | |
153 | op.repo.setnarrowpats(includepats, excludepats) |
|
153 | op.repo.setnarrowpats(includepats, excludepats) | |
|
154 | narrowspec.copytoworkingcopy(op.repo) | |||
154 |
|
155 | |||
155 | @bundle2.parthandler(_CHANGESPECPART) |
|
156 | @bundle2.parthandler(_CHANGESPECPART) | |
156 | def _handlechangespec(op, inpart): |
|
157 | def _handlechangespec(op, inpart): |
@@ -245,6 +245,7 b' def _narrow(ui, repo, remote, commoninc,' | |||||
245 | # Update narrowspec before removing revlogs, so repo won't be |
|
245 | # Update narrowspec before removing revlogs, so repo won't be | |
246 | # corrupt in case of crash |
|
246 | # corrupt in case of crash | |
247 | repo.setnarrowpats(newincludes, newexcludes) |
|
247 | repo.setnarrowpats(newincludes, newexcludes) | |
|
248 | narrowspec.copytoworkingcopy(repo) | |||
248 |
|
249 | |||
249 | for f in todelete: |
|
250 | for f in todelete: | |
250 | ui.status(_('deleting %s\n') % f) |
|
251 | ui.status(_('deleting %s\n') % f) | |
@@ -316,6 +317,7 b' def _widen(ui, repo, remote, commoninc, ' | |||||
316 | transactiongetter=tgetter) |
|
317 | transactiongetter=tgetter) | |
317 |
|
318 | |||
318 | repo.setnewnarrowpats() |
|
319 | repo.setnewnarrowpats() | |
|
320 | narrowspec.copytoworkingcopy(repo) | |||
319 | actions = merge.emptyactions() |
|
321 | actions = merge.emptyactions() | |
320 | addgaction = actions['g'].append |
|
322 | addgaction = actions['g'].append | |
321 |
|
323 |
@@ -737,6 +737,7 b' def clone(ui, peeropts, source, dest=Non' | |||||
737 | if narrow: |
|
737 | if narrow: | |
738 | with local.wlock(), local.lock(): |
|
738 | with local.wlock(), local.lock(): | |
739 | local.setnarrowpats(storeincludepats, storeexcludepats) |
|
739 | local.setnarrowpats(storeincludepats, storeexcludepats) | |
|
740 | narrowspec.copytoworkingcopy(local) | |||
740 |
|
741 | |||
741 | u = util.url(abspath) |
|
742 | u = util.url(abspath) | |
742 | defaulturl = bytes(u) |
|
743 | defaulturl = bytes(u) |
@@ -1259,7 +1259,6 b' class localrepository(object):' | |||||
1259 |
|
1259 | |||
1260 | def setnarrowpats(self, newincludes, newexcludes): |
|
1260 | def setnarrowpats(self, newincludes, newexcludes): | |
1261 | narrowspec.save(self, newincludes, newexcludes) |
|
1261 | narrowspec.save(self, newincludes, newexcludes) | |
1262 | narrowspec.copytoworkingcopy(self) |
|
|||
1263 | self.invalidate(clearfilecache=True) |
|
1262 | self.invalidate(clearfilecache=True) | |
1264 |
|
1263 | |||
1265 | def __getitem__(self, changeid): |
|
1264 | def __getitem__(self, changeid): |
@@ -71,6 +71,7 b' have this method available in narrowhg p' | |||||
71 | > if not repo.currenttransaction(): |
|
71 | > if not repo.currenttransaction(): | |
72 | > ui.develwarn(b'expandnarrowspec called outside of transaction!') |
|
72 | > ui.develwarn(b'expandnarrowspec called outside of transaction!') | |
73 | > repo.setnarrowpats(includes, excludes) |
|
73 | > repo.setnarrowpats(includes, excludes) | |
|
74 | > narrowspec.copytoworkingcopy(repo) | |||
74 | > newmatcher = narrowspec.match(repo.root, includes, excludes) |
|
75 | > newmatcher = narrowspec.match(repo.root, includes, excludes) | |
75 | > added = matchmod.differencematcher(newmatcher, currentmatcher) |
|
76 | > added = matchmod.differencematcher(newmatcher, currentmatcher) | |
76 | > for f in repo[b'.'].manifest().walk(added): |
|
77 | > for f in repo[b'.'].manifest().walk(added): |
General Comments 0
You need to be logged in to leave comments.
Login now