| durin42 |
| hg-reviewers |
I think it was a mistake to write the working copy's narrowspec every
time the store narrowspec is written. This starts separating those
actions.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/narrowbundle2.py (1 line) | |||
| M | hgext/narrow/narrowcommands.py (2 lines) | |||
| M | mercurial/hg.py (1 line) | |||
| M | mercurial/localrepo.py (1 line) | |||
| M | tests/test-narrow-expanddirstate.t (1 line) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| excludepats = set(inpart.params.get(_SPECPART_EXCLUDE, '').splitlines()) | excludepats = set(inpart.params.get(_SPECPART_EXCLUDE, '').splitlines()) | ||||
| narrowspec.validatepatterns(includepats) | narrowspec.validatepatterns(includepats) | ||||
| narrowspec.validatepatterns(excludepats) | narrowspec.validatepatterns(excludepats) | ||||
| if not repository.NARROW_REQUIREMENT in op.repo.requirements: | if not repository.NARROW_REQUIREMENT in op.repo.requirements: | ||||
| op.repo.requirements.add(repository.NARROW_REQUIREMENT) | op.repo.requirements.add(repository.NARROW_REQUIREMENT) | ||||
| op.repo._writerequirements() | op.repo._writerequirements() | ||||
| op.repo.setnarrowpats(includepats, excludepats) | op.repo.setnarrowpats(includepats, excludepats) | ||||
| narrowspec.copytoworkingcopy(op.repo) | |||||
| @bundle2.parthandler(_CHANGESPECPART) | @bundle2.parthandler(_CHANGESPECPART) | ||||
| def _handlechangespec(op, inpart): | def _handlechangespec(op, inpart): | ||||
| repo = op.repo | repo = op.repo | ||||
| cl = repo.changelog | cl = repo.changelog | ||||
| # changesets which need to be stripped entirely. either they're no longer | # changesets which need to be stripped entirely. either they're no longer | ||||
| # needed in the new narrow spec, or the server is sending a replacement | # needed in the new narrow spec, or the server is sending a replacement | ||||
| todelete.append(f) | todelete.append(f) | ||||
| repo.destroying() | repo.destroying() | ||||
| with repo.transaction("narrowing"): | with repo.transaction("narrowing"): | ||||
| # Update narrowspec before removing revlogs, so repo won't be | # Update narrowspec before removing revlogs, so repo won't be | ||||
| # corrupt in case of crash | # corrupt in case of crash | ||||
| repo.setnarrowpats(newincludes, newexcludes) | repo.setnarrowpats(newincludes, newexcludes) | ||||
| narrowspec.copytoworkingcopy(repo) | |||||
| for f in todelete: | for f in todelete: | ||||
| ui.status(_('deleting %s\n') % f) | ui.status(_('deleting %s\n') % f) | ||||
| util.unlinkpath(repo.svfs.join(f)) | util.unlinkpath(repo.svfs.join(f)) | ||||
| repo.store.markremoved(f) | repo.store.markremoved(f) | ||||
| _narrowcleanupwdir(repo, oldincludes, oldexcludes, newincludes, | _narrowcleanupwdir(repo, oldincludes, oldexcludes, newincludes, | ||||
| newexcludes, oldmatch, newmatch) | newexcludes, oldmatch, newmatch) | ||||
| with repo.transaction('widening') as tr,\ | with repo.transaction('widening') as tr,\ | ||||
| repo.ui.configoverride(overrides, 'widen'): | repo.ui.configoverride(overrides, 'widen'): | ||||
| tgetter = lambda: tr | tgetter = lambda: tr | ||||
| bundle2.processbundle(repo, bundle, | bundle2.processbundle(repo, bundle, | ||||
| transactiongetter=tgetter) | transactiongetter=tgetter) | ||||
| repo.setnewnarrowpats() | repo.setnewnarrowpats() | ||||
| narrowspec.copytoworkingcopy(repo) | |||||
| actions = merge.emptyactions() | actions = merge.emptyactions() | ||||
| addgaction = actions['g'].append | addgaction = actions['g'].append | ||||
| mf = repo['.'].manifest().matches(newmatch) | mf = repo['.'].manifest().matches(newmatch) | ||||
| for f, fn in mf.iteritems(): | for f, fn in mf.iteritems(): | ||||
| if f not in repo.dirstate: | if f not in repo.dirstate: | ||||
| addgaction((f, (mf.flags(f), False), | addgaction((f, (mf.flags(f), False), | ||||
| "add from widened narrow clone")) | "add from widened narrow clone")) | ||||
| checkout = revs[0] | checkout = revs[0] | ||||
| else: | else: | ||||
| revs = None | revs = None | ||||
| local = destpeer.local() | local = destpeer.local() | ||||
| if local: | if local: | ||||
| if narrow: | if narrow: | ||||
| with local.wlock(), local.lock(): | with local.wlock(), local.lock(): | ||||
| local.setnarrowpats(storeincludepats, storeexcludepats) | local.setnarrowpats(storeincludepats, storeexcludepats) | ||||
| narrowspec.copytoworkingcopy(local) | |||||
| u = util.url(abspath) | u = util.url(abspath) | ||||
| defaulturl = bytes(u) | defaulturl = bytes(u) | ||||
| local.ui.setconfig('paths', 'default', defaulturl, 'clone') | local.ui.setconfig('paths', 'default', defaulturl, 'clone') | ||||
| if not stream: | if not stream: | ||||
| if pull: | if pull: | ||||
| stream = False | stream = False | ||||
| else: | else: | ||||
| em = matchmod.exact(match._root, match._cwd, match.files()) | em = matchmod.exact(match._root, match._cwd, match.files()) | ||||
| nm = matchmod.unionmatcher([self._narrowmatch, em]) | nm = matchmod.unionmatcher([self._narrowmatch, em]) | ||||
| return matchmod.intersectmatchers(match, nm) | return matchmod.intersectmatchers(match, nm) | ||||
| return matchmod.intersectmatchers(match, self._narrowmatch) | return matchmod.intersectmatchers(match, self._narrowmatch) | ||||
| return self._narrowmatch | return self._narrowmatch | ||||
| def setnarrowpats(self, newincludes, newexcludes): | def setnarrowpats(self, newincludes, newexcludes): | ||||
| narrowspec.save(self, newincludes, newexcludes) | narrowspec.save(self, newincludes, newexcludes) | ||||
| narrowspec.copytoworkingcopy(self) | |||||
| self.invalidate(clearfilecache=True) | self.invalidate(clearfilecache=True) | ||||
| def __getitem__(self, changeid): | def __getitem__(self, changeid): | ||||
| if changeid is None: | if changeid is None: | ||||
| return context.workingctx(self) | return context.workingctx(self) | ||||
| if isinstance(changeid, context.basectx): | if isinstance(changeid, context.basectx): | ||||
| return changeid | return changeid | ||||
| if isinstance(changeid, slice): | if isinstance(changeid, slice): | ||||
| > import sys | > import sys | ||||
| > newincludes = set([newincludes]) | > newincludes = set([newincludes]) | ||||
| > includes, excludes = repo.narrowpats | > includes, excludes = repo.narrowpats | ||||
| > currentmatcher = narrowspec.match(repo.root, includes, excludes) | > currentmatcher = narrowspec.match(repo.root, includes, excludes) | ||||
| > includes = includes | newincludes | > includes = includes | newincludes | ||||
| > if not repo.currenttransaction(): | > if not repo.currenttransaction(): | ||||
| > ui.develwarn(b'expandnarrowspec called outside of transaction!') | > ui.develwarn(b'expandnarrowspec called outside of transaction!') | ||||
| > repo.setnarrowpats(includes, excludes) | > repo.setnarrowpats(includes, excludes) | ||||
| > narrowspec.copytoworkingcopy(repo) | |||||
| > newmatcher = narrowspec.match(repo.root, includes, excludes) | > newmatcher = narrowspec.match(repo.root, includes, excludes) | ||||
| > added = matchmod.differencematcher(newmatcher, currentmatcher) | > added = matchmod.differencematcher(newmatcher, currentmatcher) | ||||
| > for f in repo[b'.'].manifest().walk(added): | > for f in repo[b'.'].manifest().walk(added): | ||||
| > repo.dirstate.normallookup(f) | > repo.dirstate.normallookup(f) | ||||
| > | > | ||||
| > def reposetup(ui, repo): | > def reposetup(ui, repo): | ||||
| > class expandingrepo(repo.__class__): | > class expandingrepo(repo.__class__): | ||||
| > def narrowmatch(self, *args, **kwargs): | > def narrowmatch(self, *args, **kwargs): | ||||