| durin42 | |
| martinvonz |
| hg-reviewers |
In upcoming patches, to implement Share Safe plan we will be introducing
requires file in store. We need to route all callers to a single function
to check for a share-safe requirement and if present, write requirements to
.hg/store/requires instead.
After this patch, callers directly calling scmutil.writerequires() are only
those where we don't have the repo object, for example when initializing
the repository object itself.
| No Linters Available |
| No Unit Test Coverage |
"callers directly calling scmutil.writerequires() are once
where" Do you mean "only" ?
The patch seems to go in the right direction, but the function seems rarely needed enough that is probably worth not making it a method. Could we update the function to take a repo (instead of vs) and act accordingly ?
In D8631#129003, @marmoute wrote:"callers directly calling scmutil.writerequires() are once
where" Do you mean "only" ?
Yes.
The patch seems to go in the right direction, but the function seems rarely needed enough that is probably worth not making it a method. Could we update the function to take a repo (instead of vs) and act accordingly ?
There are some places where we don't have a repo object. So those we route to scmutil.writerequires which accepts a vfs. Did you mean updating scmutil.writerequires or updating the new method I added?
In D8631#129129, @pulkit wrote:In D8631#129003, @marmoute wrote:"callers directly calling scmutil.writerequires() are once
where" Do you mean "only" ?Yes.
The patch seems to go in the right direction, but the function seems rarely needed enough that is probably worth not making it a method. Could we update the function to take a repo (instead of vs) and act accordingly ?
There are some places where we don't have a repo object. So those we route to scmutil.writerequires which accepts a vfs. Did you mean updating scmutil.writerequires or updating the new method I added?
what I mean is "not having a new method on repo"
In D8631#129134, @marmoute wrote:In D8631#129129, @pulkit wrote:In D8631#129003, @marmoute wrote:"callers directly calling scmutil.writerequires() are once
where" Do you mean "only" ?Yes.
The patch seems to go in the right direction, but the function seems rarely needed enough that is probably worth not making it a method. Could we update the function to take a repo (instead of vs) and act accordingly ?
There are some places where we don't have a repo object. So those we route to scmutil.writerequires which accepts a vfs. Did you mean updating scmutil.writerequires or updating the new method I added?
what I mean is "not having a new method on repo"
I tried that. It looks a bit ugly because that function will then call repo._writerequires().
In D8631#129152, @pulkit wrote:In D8631#129134, @marmoute wrote:In D8631#129129, @pulkit wrote:In D8631#129003, @marmoute wrote:"callers directly calling scmutil.writerequires() are once
where" Do you mean "only" ?Yes.
The patch seems to go in the right direction, but the function seems rarely needed enough that is probably worth not making it a method. Could we update the function to take a repo (instead of vs) and act accordingly ?
There are some places where we don't have a repo object. So those we route to scmutil.writerequires which accepts a vfs. Did you mean updating scmutil.writerequires or updating the new method I added?
what I mean is "not having a new method on repo"
I tried that. It looks a bit ugly because that function will then call repo._writerequires().
I don't get it, why do we need to have a repo method at all ?
In D8631#129153, @marmoute wrote:In D8631#129152, @pulkit wrote:In D8631#129134, @marmoute wrote:In D8631#129129, @pulkit wrote:In D8631#129003, @marmoute wrote:"callers directly calling scmutil.writerequires() are once
where" Do you mean "only" ?Yes.
The patch seems to go in the right direction, but the function seems rarely needed enough that is probably worth not making it a method. Could we update the function to take a repo (instead of vs) and act accordingly ?
There are some places where we don't have a repo object. So those we route to scmutil.writerequires which accepts a vfs. Did you mean updating scmutil.writerequires or updating the new method I added?
what I mean is "not having a new method on repo"
I tried that. It looks a bit ugly because that function will then call repo._writerequires().
I don't get it, why do we need to have a repo method at all ?
The patch was updated to not have a method on repo.
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/largefiles/lfcommands.py (2 lines) | |||
| M | hgext/largefiles/reposetup.py (2 lines) | |||
| M | hgext/lfs/__init__.py (2 lines) | |||
| M | hgext/lfs/wrapper.py (2 lines) | |||
| M | hgext/narrow/narrowbundle2.py (5 lines) | |||
| M | hgext/remotefilelog/__init__.py (2 lines) | |||
| M | mercurial/bundle2.py (3 lines) | |||
| M | mercurial/hg.py (2 lines) | |||
| M | mercurial/localrepo.py (3 lines) | |||
| M | mercurial/scmutil.py (7 lines) | |||
| M | mercurial/sparse.py (6 lines) | |||
| M | mercurial/streamclone.py (5 lines) | |||
| M | mercurial/upgrade.py (6 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 65238fd5eee2 | 4a503c1b664a | Pulkit Goyal | Apr 14 2020, 7:13 AM |
| rdst.wvfs.removedirs(rdst.wvfs.dirname(f)) | rdst.wvfs.removedirs(rdst.wvfs.dirname(f)) | ||||
| except OSError: | except OSError: | ||||
| pass | pass | ||||
| # If there were any files converted to largefiles, add largefiles | # If there were any files converted to largefiles, add largefiles | ||||
| # to the destination repository's requirements. | # to the destination repository's requirements. | ||||
| if lfiles: | if lfiles: | ||||
| rdst.requirements.add(b'largefiles') | rdst.requirements.add(b'largefiles') | ||||
| rdst._writerequirements() | scmutil.writereporequirements(rdst) | ||||
| else: | else: | ||||
| class lfsource(filemap.filemap_source): | class lfsource(filemap.filemap_source): | ||||
| def __init__(self, ui, source): | def __init__(self, ui, source): | ||||
| super(lfsource, self).__init__(ui, source, None) | super(lfsource, self).__init__(ui, source, None) | ||||
| self.filemapper.rename[lfutil.shortname] = b'.' | self.filemapper.rename[lfutil.shortname] = b'.' | ||||
| def getfile(self, name, rev): | def getfile(self, name, rev): | ||||
| repo.prepushoutgoinghooks.add(b"largefiles", prepushoutgoinghook) | repo.prepushoutgoinghooks.add(b"largefiles", prepushoutgoinghook) | ||||
| def checkrequireslfiles(ui, repo, **kwargs): | def checkrequireslfiles(ui, repo, **kwargs): | ||||
| if b'largefiles' not in repo.requirements and any( | if b'largefiles' not in repo.requirements and any( | ||||
| lfutil.shortname + b'/' in f[0] for f in repo.store.datafiles() | lfutil.shortname + b'/' in f[0] for f in repo.store.datafiles() | ||||
| ): | ): | ||||
| repo.requirements.add(b'largefiles') | repo.requirements.add(b'largefiles') | ||||
| repo._writerequirements() | scmutil.writereporequirements(repo) | ||||
| ui.setconfig( | ui.setconfig( | ||||
| b'hooks', b'changegroup.lfiles', checkrequireslfiles, b'largefiles' | b'hooks', b'changegroup.lfiles', checkrequireslfiles, b'largefiles' | ||||
| ) | ) | ||||
| ui.setconfig(b'hooks', b'commit.lfiles', checkrequireslfiles, b'largefiles') | ui.setconfig(b'hooks', b'commit.lfiles', checkrequireslfiles, b'largefiles') | ||||
| match = repo._storenarrowmatch | match = repo._storenarrowmatch | ||||
| for ctx in s: | for ctx in s: | ||||
| # TODO: is there a way to just walk the files in the commit? | # TODO: is there a way to just walk the files in the commit? | ||||
| if any( | if any( | ||||
| ctx[f].islfs() for f in ctx.files() if f in ctx and match(f) | ctx[f].islfs() for f in ctx.files() if f in ctx and match(f) | ||||
| ): | ): | ||||
| repo.requirements.add(b'lfs') | repo.requirements.add(b'lfs') | ||||
| repo.features.add(repository.REPO_FEATURE_LFS) | repo.features.add(repository.REPO_FEATURE_LFS) | ||||
| repo._writerequirements() | scmutil.writereporequirements(repo) | ||||
| repo.prepushoutgoinghooks.add(b'lfs', wrapper.prepush) | repo.prepushoutgoinghooks.add(b'lfs', wrapper.prepush) | ||||
| break | break | ||||
| ui.setconfig(b'hooks', b'commit.lfs', checkrequireslfs, b'lfs') | ui.setconfig(b'hooks', b'commit.lfs', checkrequireslfs, b'lfs') | ||||
| ui.setconfig( | ui.setconfig( | ||||
| b'hooks', b'pretxnchangegroup.lfs', checkrequireslfs, b'lfs' | b'hooks', b'pretxnchangegroup.lfs', checkrequireslfs, b'lfs' | ||||
| ) | ) | ||||
| else: | else: | ||||
| if b'lfs' not in self.repo.requirements: | if b'lfs' not in self.repo.requirements: | ||||
| ctx = self.repo[node] | ctx = self.repo[node] | ||||
| # The file list may contain removed files, so check for | # The file list may contain removed files, so check for | ||||
| # membership before assuming it is in the context. | # membership before assuming it is in the context. | ||||
| if any(f in ctx and ctx[f].islfs() for f, n in files): | if any(f in ctx and ctx[f].islfs() for f, n in files): | ||||
| self.repo.requirements.add(b'lfs') | self.repo.requirements.add(b'lfs') | ||||
| self.repo._writerequirements() | scmutil.writereporequirements(self.repo) | ||||
| return node | return node | ||||
| sink.__class__ = lfssink | sink.__class__ = lfssink | ||||
| return sink | return sink | ||||
| from mercurial import ( | from mercurial import ( | ||||
| bundle2, | bundle2, | ||||
| changegroup, | changegroup, | ||||
| error, | error, | ||||
| exchange, | exchange, | ||||
| localrepo, | localrepo, | ||||
| narrowspec, | narrowspec, | ||||
| repair, | repair, | ||||
| scmutil, | |||||
| util, | util, | ||||
| wireprototypes, | wireprototypes, | ||||
| ) | ) | ||||
| from mercurial.interfaces import repository | from mercurial.interfaces import repository | ||||
| from mercurial.utils import stringutil | from mercurial.utils import stringutil | ||||
| _NARROWACL_SECTION = b'narrowacl' | _NARROWACL_SECTION = b'narrowacl' | ||||
| _CHANGESPECPART = b'narrow:changespec' | _CHANGESPECPART = b'narrow:changespec' | ||||
| # Refer to issue5952 and 6019 | # Refer to issue5952 and 6019 | ||||
| includepats = set(inpart.params.get(_SPECPART_INCLUDE, b'').splitlines()) | includepats = set(inpart.params.get(_SPECPART_INCLUDE, b'').splitlines()) | ||||
| excludepats = set(inpart.params.get(_SPECPART_EXCLUDE, b'').splitlines()) | excludepats = set(inpart.params.get(_SPECPART_EXCLUDE, b'').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() | scmutil.writereporequirements(op.repo) | ||||
| op.repo.setnarrowpats(includepats, excludepats) | op.repo.setnarrowpats(includepats, excludepats) | ||||
| narrowspec.copytoworkingcopy(op.repo) | narrowspec.copytoworkingcopy(op.repo) | ||||
| @bundle2.parthandler(_RESSPECS) | @bundle2.parthandler(_RESSPECS) | ||||
| def _handlenarrowspecs(op, inpart): | def _handlenarrowspecs(op, inpart): | ||||
| data = inpart.read() | data = inpart.read() | ||||
| inc, exc = data.split(b'\0') | inc, exc = data.split(b'\0') | ||||
| includepats = set(inc.splitlines()) | includepats = set(inc.splitlines()) | ||||
| excludepats = set(exc.splitlines()) | excludepats = set(exc.splitlines()) | ||||
| narrowspec.validatepatterns(includepats) | narrowspec.validatepatterns(includepats) | ||||
| narrowspec.validatepatterns(excludepats) | narrowspec.validatepatterns(excludepats) | ||||
| if repository.NARROW_REQUIREMENT not in op.repo.requirements: | if repository.NARROW_REQUIREMENT not in op.repo.requirements: | ||||
| op.repo.requirements.add(repository.NARROW_REQUIREMENT) | op.repo.requirements.add(repository.NARROW_REQUIREMENT) | ||||
| op.repo._writerequirements() | scmutil.writereporequirements(op.repo) | ||||
| op.repo.setnarrowpats(includepats, excludepats) | op.repo.setnarrowpats(includepats, excludepats) | ||||
| narrowspec.copytoworkingcopy(op.repo) | 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 | ||||
| # setupclient fixed the class on the repo itself | # setupclient fixed the class on the repo itself | ||||
| # but we also need to fix it on the repoview | # but we also need to fix it on the repoview | ||||
| if isinstance(self, repoview.repoview): | if isinstance(self, repoview.repoview): | ||||
| self.__class__.__bases__ = ( | self.__class__.__bases__ = ( | ||||
| self.__class__.__bases__[0], | self.__class__.__bases__[0], | ||||
| self.unfiltered().__class__, | self.unfiltered().__class__, | ||||
| ) | ) | ||||
| self.requirements.add(constants.SHALLOWREPO_REQUIREMENT) | self.requirements.add(constants.SHALLOWREPO_REQUIREMENT) | ||||
| self._writerequirements() | scmutil.writereporequirements(self) | ||||
| # Since setupclient hadn't been called, exchange.pull was not | # Since setupclient hadn't been called, exchange.pull was not | ||||
| # wrapped. So we need to manually invoke our version of it. | # wrapped. So we need to manually invoke our version of it. | ||||
| return exchangepull(orig, self, *args, **kwargs) | return exchangepull(orig, self, *args, **kwargs) | ||||
| else: | else: | ||||
| return orig(self, *args, **kwargs) | return orig(self, *args, **kwargs) | ||||
| extensions.wrapfunction(exchange, b'pull', pull_shallow) | extensions.wrapfunction(exchange, b'pull', pull_shallow) | ||||
| changegroup, | changegroup, | ||||
| encoding, | encoding, | ||||
| error, | error, | ||||
| node as nodemod, | node as nodemod, | ||||
| obsolete, | obsolete, | ||||
| phases, | phases, | ||||
| pushkey, | pushkey, | ||||
| pycompat, | pycompat, | ||||
| scmutil, | |||||
| streamclone, | streamclone, | ||||
| tags, | tags, | ||||
| url, | url, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from .utils import stringutil | from .utils import stringutil | ||||
| urlerr = util.urlerr | urlerr = util.urlerr | ||||
| b"bundle contains tree manifests, but local repo is " | b"bundle contains tree manifests, but local repo is " | ||||
| b"non-empty and does not use tree manifests" | b"non-empty and does not use tree manifests" | ||||
| ) | ) | ||||
| ) | ) | ||||
| op.repo.requirements.add(b'treemanifest') | op.repo.requirements.add(b'treemanifest') | ||||
| op.repo.svfs.options = localrepo.resolvestorevfsoptions( | op.repo.svfs.options = localrepo.resolvestorevfsoptions( | ||||
| op.repo.ui, op.repo.requirements, op.repo.features | op.repo.ui, op.repo.requirements, op.repo.features | ||||
| ) | ) | ||||
| op.repo._writerequirements() | scmutil.writereporequirements(op.repo) | ||||
| bundlesidedata = bool(b'exp-sidedata' in inpart.params) | bundlesidedata = bool(b'exp-sidedata' in inpart.params) | ||||
| reposidedata = bool(b'exp-sidedata-flag' in op.repo.requirements) | reposidedata = bool(b'exp-sidedata-flag' in op.repo.requirements) | ||||
| if reposidedata and not bundlesidedata: | if reposidedata and not bundlesidedata: | ||||
| msg = b"repository is using sidedata but the bundle source do not" | msg = b"repository is using sidedata but the bundle source do not" | ||||
| hint = b'this is currently unsupported' | hint = b'this is currently unsupported' | ||||
| raise error.Abort(msg, hint=hint) | raise error.Abort(msg, hint=hint) | ||||
| destlock = copystore(ui, repo, repo.path) | destlock = copystore(ui, repo, repo.path) | ||||
| with destlock or util.nullcontextmanager(): | with destlock or util.nullcontextmanager(): | ||||
| sharefile = repo.vfs.join(b'sharedpath') | sharefile = repo.vfs.join(b'sharedpath') | ||||
| util.rename(sharefile, sharefile + b'.old') | util.rename(sharefile, sharefile + b'.old') | ||||
| repo.requirements.discard(b'shared') | repo.requirements.discard(b'shared') | ||||
| repo.requirements.discard(b'relshared') | repo.requirements.discard(b'relshared') | ||||
| repo._writerequirements() | scmutil.writereporequirements(repo) | ||||
| # Removing share changes some fundamental properties of the repo instance. | # Removing share changes some fundamental properties of the repo instance. | ||||
| # So we instantiate a new repo object and operate on it rather than | # So we instantiate a new repo object and operate on it rather than | ||||
| # try to keep the existing repo usable. | # try to keep the existing repo usable. | ||||
| newrepo = repository(repo.baseui, repo.root, create=False) | newrepo = repository(repo.baseui, repo.root, create=False) | ||||
| # TODO: figure out how to access subrepos that exist, but were previously | # TODO: figure out how to access subrepos that exist, but were previously | ||||
| # removed from .hgsub | # removed from .hgsub | ||||
| if self.ui.configbool(b'experimental', b'bundle2-advertise'): | if self.ui.configbool(b'experimental', b'bundle2-advertise'): | ||||
| caps = set(caps) | caps = set(caps) | ||||
| capsblob = bundle2.encodecaps( | capsblob = bundle2.encodecaps( | ||||
| bundle2.getrepocaps(self, role=b'client') | bundle2.getrepocaps(self, role=b'client') | ||||
| ) | ) | ||||
| caps.add(b'bundle2=' + urlreq.quote(capsblob)) | caps.add(b'bundle2=' + urlreq.quote(capsblob)) | ||||
| return caps | return caps | ||||
| def _writerequirements(self): | |||||
| scmutil.writerequires(self.vfs, self.requirements) | |||||
| # Don't cache auditor/nofsauditor, or you'll end up with reference cycle: | # Don't cache auditor/nofsauditor, or you'll end up with reference cycle: | ||||
| # self -> auditor -> self._checknested -> self | # self -> auditor -> self._checknested -> self | ||||
| @property | @property | ||||
| def auditor(self): | def auditor(self): | ||||
| # This is only used by context.workingctx.match in order to | # This is only used by context.workingctx.match in order to | ||||
| # detect files in subrepos. | # detect files in subrepos. | ||||
| return pathutil.pathauditor(self.root, callback=self._checknested) | return pathutil.pathauditor(self.root, callback=self._checknested) | ||||
| # Adjust the dirstate copies | # Adjust the dirstate copies | ||||
| for dst, src in pycompat.iteritems(copies): | for dst, src in pycompat.iteritems(copies): | ||||
| if src not in newctx or dst in newctx or ds[dst] != b'a': | if src not in newctx or dst in newctx or ds[dst] != b'a': | ||||
| src = None | src = None | ||||
| ds.copy(src, dst) | ds.copy(src, dst) | ||||
| repo._quick_access_changeid_invalidate() | repo._quick_access_changeid_invalidate() | ||||
| def writereporequirements(repo, requirements=None): | |||||
| """ writes requirements for the repo to .hg/requires """ | |||||
| if requirements: | |||||
| repo.requirements = requirements | |||||
| writerequires(repo.vfs, repo.requirements) | |||||
| def writerequires(opener, requirements): | def writerequires(opener, requirements): | ||||
| with opener(b'requires', b'w', atomictemp=True) as fp: | with opener(b'requires', b'w', atomictemp=True) as fp: | ||||
| for r in sorted(requirements): | for r in sorted(requirements): | ||||
| fp.write(b"%s\n" % r) | fp.write(b"%s\n" % r) | ||||
| class filecachesubentry(object): | class filecachesubentry(object): | ||||
| def __init__(self, path, stat): | def __init__(self, path, stat): | ||||
| # because that will invalidate the matcher cache and force a | # because that will invalidate the matcher cache and force a | ||||
| # re-read. We ideally want to update the cached matcher on the | # re-read. We ideally want to update the cached matcher on the | ||||
| # repo instance then flush the new config to disk once wdir is | # repo instance then flush the new config to disk once wdir is | ||||
| # updated. But this requires massive rework to matcher() and its | # updated. But this requires massive rework to matcher() and its | ||||
| # consumers. | # consumers. | ||||
| if b'exp-sparse' in oldrequires and removing: | if b'exp-sparse' in oldrequires and removing: | ||||
| repo.requirements.discard(b'exp-sparse') | repo.requirements.discard(b'exp-sparse') | ||||
| scmutil.writerequires(repo.vfs, repo.requirements) | scmutil.writereporequirements(repo) | ||||
| elif b'exp-sparse' not in oldrequires: | elif b'exp-sparse' not in oldrequires: | ||||
| repo.requirements.add(b'exp-sparse') | repo.requirements.add(b'exp-sparse') | ||||
| scmutil.writerequires(repo.vfs, repo.requirements) | scmutil.writereporequirements(repo) | ||||
| try: | try: | ||||
| writeconfig(repo, includes, excludes, profiles) | writeconfig(repo, includes, excludes, profiles) | ||||
| return refreshwdir(repo, oldstatus, oldmatch, force=force) | return refreshwdir(repo, oldstatus, oldmatch, force=force) | ||||
| except Exception: | except Exception: | ||||
| if repo.requirements != oldrequires: | if repo.requirements != oldrequires: | ||||
| repo.requirements.clear() | repo.requirements.clear() | ||||
| repo.requirements |= oldrequires | repo.requirements |= oldrequires | ||||
| scmutil.writerequires(repo.vfs, repo.requirements) | scmutil.writereporequirements(repo) | ||||
| writeconfig(repo, oldincludes, oldexcludes, oldprofiles) | writeconfig(repo, oldincludes, oldexcludes, oldprofiles) | ||||
| raise | raise | ||||
| def clearrules(repo, force=False): | def clearrules(repo, force=False): | ||||
| """Clears include/exclude rules from the sparse config. | """Clears include/exclude rules from the sparse config. | ||||
| The remaining sparse config only has profiles, if defined. The working | The remaining sparse config only has profiles, if defined. The working | ||||
| from .pycompat import open | from .pycompat import open | ||||
| from .interfaces import repository | from .interfaces import repository | ||||
| from . import ( | from . import ( | ||||
| cacheutil, | cacheutil, | ||||
| error, | error, | ||||
| narrowspec, | narrowspec, | ||||
| phases, | phases, | ||||
| pycompat, | pycompat, | ||||
| scmutil, | |||||
| store, | store, | ||||
| util, | util, | ||||
| ) | ) | ||||
| def canperformstreamclone(pullop, bundle2=False): | def canperformstreamclone(pullop, bundle2=False): | ||||
| """Whether it is possible to perform a streaming clone as part of pull. | """Whether it is possible to perform a streaming clone as part of pull. | ||||
| # new format-related remote requirements | # new format-related remote requirements | ||||
| # requirements from the streamed-in repository | # requirements from the streamed-in repository | ||||
| repo.requirements = requirements | ( | repo.requirements = requirements | ( | ||||
| repo.requirements - repo.supportedformats | repo.requirements - repo.supportedformats | ||||
| ) | ) | ||||
| repo.svfs.options = localrepo.resolvestorevfsoptions( | repo.svfs.options = localrepo.resolvestorevfsoptions( | ||||
| repo.ui, repo.requirements, repo.features | repo.ui, repo.requirements, repo.features | ||||
| ) | ) | ||||
| repo._writerequirements() | scmutil.writereporequirements(repo) | ||||
| if rbranchmap: | if rbranchmap: | ||||
| repo._branchcaches.replace(repo, rbranchmap) | repo._branchcaches.replace(repo, rbranchmap) | ||||
| repo.invalidate() | repo.invalidate() | ||||
| def allowservergeneration(repo): | def allowservergeneration(repo): | ||||
| # new format-related remote requirements | # new format-related remote requirements | ||||
| # requirements from the streamed-in repository | # requirements from the streamed-in repository | ||||
| repo.requirements = set(requirements) | ( | repo.requirements = set(requirements) | ( | ||||
| repo.requirements - repo.supportedformats | repo.requirements - repo.supportedformats | ||||
| ) | ) | ||||
| repo.svfs.options = localrepo.resolvestorevfsoptions( | repo.svfs.options = localrepo.resolvestorevfsoptions( | ||||
| repo.ui, repo.requirements, repo.features | repo.ui, repo.requirements, repo.features | ||||
| ) | ) | ||||
| repo._writerequirements() | scmutil.writereporequirements(repo) | ||||
| # better than allowing a client to continue while the repository is in | # better than allowing a client to continue while the repository is in | ||||
| # an inconsistent state. | # an inconsistent state. | ||||
| ui.status( | ui.status( | ||||
| _( | _( | ||||
| b'marking source repository as being upgraded; clients will be ' | b'marking source repository as being upgraded; clients will be ' | ||||
| b'unable to read from repository\n' | b'unable to read from repository\n' | ||||
| ) | ) | ||||
| ) | ) | ||||
| scmutil.writerequires( | scmutil.writereporequirements( | ||||
| srcrepo.vfs, srcrepo.requirements | {b'upgradeinprogress'} | srcrepo, srcrepo.requirements | {b'upgradeinprogress'} | ||||
| ) | ) | ||||
| ui.status(_(b'starting in-place swap of repository data\n')) | ui.status(_(b'starting in-place swap of repository data\n')) | ||||
| ui.status(_(b'replaced files will be backed up at %s\n') % backuppath) | ui.status(_(b'replaced files will be backed up at %s\n') % backuppath) | ||||
| # Now swap in the new store directory. Doing it as a rename should make | # Now swap in the new store directory. Doing it as a rename should make | ||||
| # the operation nearly instantaneous and atomic (at least in well-behaved | # the operation nearly instantaneous and atomic (at least in well-behaved | ||||
| # environments). | # environments). | ||||
| # We first write the requirements file. Any new requirements will lock | # We first write the requirements file. Any new requirements will lock | ||||
| # out legacy clients. | # out legacy clients. | ||||
| ui.status( | ui.status( | ||||
| _( | _( | ||||
| b'finalizing requirements file and making repository readable ' | b'finalizing requirements file and making repository readable ' | ||||
| b'again\n' | b'again\n' | ||||
| ) | ) | ||||
| ) | ) | ||||
| scmutil.writerequires(srcrepo.vfs, requirements) | scmutil.writereporequirements(srcrepo, requirements) | ||||
| # The lock file from the old store won't be removed because nothing has a | # The lock file from the old store won't be removed because nothing has a | ||||
| # reference to its new location. So clean it up manually. Alternatively, we | # reference to its new location. So clean it up manually. Alternatively, we | ||||
| # could update srcrepo.svfs and other variables to point to the new | # could update srcrepo.svfs and other variables to point to the new | ||||
| # location. This is simpler. | # location. This is simpler. | ||||
| backupvfs.unlink(b'store/lock') | backupvfs.unlink(b'store/lock') | ||||
| return backuppath | return backuppath | ||||