| baymax |
| hg-reviewers |
Fixes wireproto v2 to not send the raw data with flags=0
| No Linters Available |
| No Unit Test Coverage |
There seems to have been no activities on this Diff for the past 3 Months.
By policy, we are automatically moving it out of the need-review state.
Please, move it back to need-review without hesitation if this diff should still be discussed.
:baymax:need-review-idle:
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/bundle2.py (19 lines) | |||
| M | mercurial/changelog.py (88 lines) | |||
| M | mercurial/configitems.py (2 lines) | |||
| M | mercurial/exchange.py (5 lines) | |||
| M | mercurial/wireprotov2server.py (2 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| c6c30c56bd62 | b4b6ff83ed9c | Joerg Sonnenberger | Jul 4 2020, 6:01 PM |
| b'nbchanges', b'%d' % cg.extras[b'clcount'], mandatory=False | b'nbchanges', b'%d' % cg.extras[b'clcount'], mandatory=False | ||||
| ) | ) | ||||
| if opts.get(b'phases') and repo.revs( | if opts.get(b'phases') and repo.revs( | ||||
| b'%ln and secret()', outgoing.missingheads | b'%ln and secret()', outgoing.missingheads | ||||
| ): | ): | ||||
| part.addparam( | part.addparam( | ||||
| b'targetphase', b'%d' % phases.secret, mandatory=False | b'targetphase', b'%d' % phases.secret, mandatory=False | ||||
| ) | ) | ||||
| if b'exp-sidedata-flag' in repo.requirements: | |||||
| part.addparam(b'exp-sidedata', b'1') | |||||
| if opts.get(b'streamv2', False): | if opts.get(b'streamv2', False): | ||||
| addpartbundlestream2(bundler, repo, stream=True) | addpartbundlestream2(bundler, repo, stream=True) | ||||
| if opts.get(b'tagsfnodescache', True): | if opts.get(b'tagsfnodescache', True): | ||||
| addparttagsfnodescache(repo, bundler, outgoing) | addparttagsfnodescache(repo, bundler, outgoing) | ||||
| if opts.get(b'revbranchcache', True): | if opts.get(b'revbranchcache', True): | ||||
| result = 1 + changedheads | result = 1 + changedheads | ||||
| elif changedheads < 0: | elif changedheads < 0: | ||||
| result = -1 + changedheads | result = -1 + changedheads | ||||
| return result | return result | ||||
| @parthandler( | @parthandler( | ||||
| b'changegroup', | b'changegroup', | ||||
| ( | (b'version', b'nbchanges', b'treemanifest', b'targetphase',), | ||||
| b'version', | |||||
| b'nbchanges', | |||||
| b'exp-sidedata', | |||||
| b'treemanifest', | |||||
| b'targetphase', | |||||
| ), | |||||
| ) | ) | ||||
| def handlechangegroup(op, inpart): | def handlechangegroup(op, inpart): | ||||
| """apply a changegroup part on the repo | """apply a changegroup part on the repo | ||||
| This is a very early implementation that will massive rework before being | This is a very early implementation that will massive rework before being | ||||
| inflicted to any end-user. | inflicted to any end-user. | ||||
| """ | """ | ||||
| from . import localrepo | from . import localrepo | ||||
| ) | ) | ||||
| ) | ) | ||||
| 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() | op.repo._writerequirements() | ||||
| bundlesidedata = bool(b'exp-sidedata' in inpart.params) | |||||
| reposidedata = bool(b'exp-sidedata-flag' in op.repo.requirements) | |||||
| if reposidedata and not bundlesidedata: | |||||
| msg = b"repository is using sidedata but the bundle source do not" | |||||
| hint = b'this is currently unsupported' | |||||
| raise error.Abort(msg, hint=hint) | |||||
| extrakwargs = {} | extrakwargs = {} | ||||
| targetphase = inpart.params.get(b'targetphase') | targetphase = inpart.params.get(b'targetphase') | ||||
| if targetphase is not None: | if targetphase is not None: | ||||
| extrakwargs['targetphase'] = int(targetphase) | extrakwargs['targetphase'] = int(targetphase) | ||||
| ret = _processchangegroup( | ret = _processchangegroup( | ||||
| op, | op, | ||||
| cg, | cg, | ||||
| tr, | tr, | ||||
| b'narrow_widen', | b'narrow_widen', | ||||
| changelog=False, | changelog=False, | ||||
| ) | ) | ||||
| part = bundler.newpart(b'changegroup', data=cgdata) | part = bundler.newpart(b'changegroup', data=cgdata) | ||||
| part.addparam(b'version', cgversion) | part.addparam(b'version', cgversion) | ||||
| if b'treemanifest' in repo.requirements: | if b'treemanifest' in repo.requirements: | ||||
| part.addparam(b'treemanifest', b'1') | part.addparam(b'treemanifest', b'1') | ||||
| if b'exp-sidedata-flag' in repo.requirements: | |||||
| part.addparam(b'exp-sidedata', b'1') | |||||
| return bundler | return bundler | ||||
| return metadata.decodecopies(self.files, rawcopies) | return metadata.decodecopies(self.files, rawcopies) | ||||
| @property | @property | ||||
| def description(self): | def description(self): | ||||
| return encoding.tolocal(self._text[self._offsets[3] + 2 :]) | return encoding.tolocal(self._text[self._offsets[3] + 2 :]) | ||||
| class changelog(revlog.revlog): | class changelog(revlog.revlog): | ||||
| def _addrevision( | |||||
| self, | |||||
| node, | |||||
| rawtext, | |||||
| transaction, | |||||
| link, | |||||
| p1, | |||||
| p2, | |||||
| flags, | |||||
| cachedelta, | |||||
| ifh, | |||||
| dfh, | |||||
| alwayscache=False, | |||||
| deltacomputer=None, | |||||
| ): | |||||
| assert flags & revlog.REVIDX_SIDEDATA | |||||
| return revlog.revlog._addrevision( | |||||
| self, | |||||
| node, | |||||
| rawtext, | |||||
| transaction, | |||||
| link, | |||||
| p1, | |||||
| p2, | |||||
| flags, | |||||
| cachedelta, | |||||
| ifh, | |||||
| dfh, | |||||
| alwayscache=alwayscache, | |||||
| deltacomputer=deltacomputer, | |||||
| ) | |||||
| def addgroup(self, deltas, linkmapper, transaction, addrevisioncb=None): | |||||
| from .revlogutils import sidedata as _sidedata, flagutil | |||||
| from . import mdiff | |||||
| def deltascb(): | |||||
| for data in deltas: | |||||
| node, p1, p2, linknode, deltabase, delta, flags = data | |||||
| if deltabase == nullid: | |||||
| delta = mdiff.patch(b'', delta) | |||||
| else: | |||||
| delta = mdiff.patch(self._revisiondata(deltabase)[0], delta) | |||||
| if flags & revlog.REVIDX_SIDEDATA: | |||||
| delta, validatehash, sidedata = flagutil.processflagsread( | |||||
| self, delta, flags | |||||
| ) | |||||
| if validatehash: | |||||
| self.checkhash(delta, node, p1=p1, p2=p2) | |||||
| else: | |||||
| sidedata = {} | |||||
| sidedata.update( | |||||
| { | |||||
| _sidedata.SD_TEST1: b'test-key', | |||||
| _sidedata.SD_TEST2: b'test-node', | |||||
| } | |||||
| ) | |||||
| flags |= revlog.REVIDX_SIDEDATA | |||||
| data, validatehash = flagutil.processflagswrite( | |||||
| self, delta, flags, sidedata=sidedata | |||||
| ) | |||||
| if validatehash: | |||||
| self.checkhash(data, node, p1=p1, p2=p2) | |||||
| yield ( | |||||
| node, | |||||
| p1, | |||||
| p2, | |||||
| linknode, | |||||
| nullid, | |||||
| mdiff.trivialdiffheader(len(data)) + data, | |||||
| flags, | |||||
| ) | |||||
| return revlog.revlog.addgroup( | |||||
| self, | |||||
| deltascb(), | |||||
| linkmapper, | |||||
| transaction, | |||||
| addrevisioncb=addrevisioncb, | |||||
| ) | |||||
| def __init__(self, opener, trypending=False): | def __init__(self, opener, trypending=False): | ||||
| """Load a changelog revlog using an opener. | """Load a changelog revlog using an opener. | ||||
| If ``trypending`` is true, we attempt to load the index from a | If ``trypending`` is true, we attempt to load the index from a | ||||
| ``00changelog.i.a`` file instead of the default ``00changelog.i``. | ``00changelog.i.a`` file instead of the default ``00changelog.i``. | ||||
| The ``00changelog.i.a`` file contains index (and possibly inline | The ``00changelog.i.a`` file contains index (and possibly inline | ||||
| revision) data for a transaction that hasn't been finalized yet. | revision) data for a transaction that hasn't been finalized yet. | ||||
| It exists in a separate file to facilitate readers (such as | It exists in a separate file to facilitate readers (such as | ||||
| if p2copies: | if p2copies: | ||||
| sidedata[sidedatamod.SD_P2COPIES] = p2copies | sidedata[sidedatamod.SD_P2COPIES] = p2copies | ||||
| if filesadded: | if filesadded: | ||||
| sidedata[sidedatamod.SD_FILESADDED] = filesadded | sidedata[sidedatamod.SD_FILESADDED] = filesadded | ||||
| if filesremoved: | if filesremoved: | ||||
| sidedata[sidedatamod.SD_FILESREMOVED] = filesremoved | sidedata[sidedatamod.SD_FILESREMOVED] = filesremoved | ||||
| if not sidedata: | if not sidedata: | ||||
| sidedata = None | sidedata = None | ||||
| if sidedata is None: | |||||
| sidedata = {} | |||||
| from .revlogutils import sidedata as _sidedata | |||||
| sidedata.update( | |||||
| {_sidedata.SD_TEST1: b'test-key', _sidedata.SD_TEST2: b'test-node',} | |||||
| ) | |||||
| if extra: | if extra: | ||||
| extra = encodeextra(extra) | extra = encodeextra(extra) | ||||
| parseddate = b"%s %s" % (parseddate, extra) | parseddate = b"%s %s" % (parseddate, extra) | ||||
| l = [hex(manifest), user, parseddate] + sortedfiles + [b"", desc] | l = [hex(manifest), user, parseddate] + sortedfiles + [b"", desc] | ||||
| text = b"\n".join(l) | text = b"\n".join(l) | ||||
| return self.addrevision( | return self.addrevision( | ||||
| text, transaction, len(self), p1, p2, sidedata=sidedata | text, transaction, len(self), p1, p2, sidedata=sidedata | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'format', | b'format', | ||||
| b'exp-use-copies-side-data-changeset', | b'exp-use-copies-side-data-changeset', | ||||
| default=False, | default=False, | ||||
| experimental=True, | experimental=True, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'format', b'exp-use-side-data', default=False, experimental=True, | b'format', b'exp-use-side-data', default=True, experimental=True, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'format', b'internal-phase', default=False, experimental=True, | b'format', b'internal-phase', default=False, experimental=True, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'fsmonitor', b'warn_when_unused', default=True, | b'fsmonitor', b'warn_when_unused', default=True, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| cgstream = changegroup.makestream( | cgstream = changegroup.makestream( | ||||
| pushop.repo, pushop.outgoing, version, b'push' | pushop.repo, pushop.outgoing, version, b'push' | ||||
| ) | ) | ||||
| cgpart = bundler.newpart(b'changegroup', data=cgstream) | cgpart = bundler.newpart(b'changegroup', data=cgstream) | ||||
| if cgversions: | if cgversions: | ||||
| cgpart.addparam(b'version', version) | cgpart.addparam(b'version', version) | ||||
| if b'treemanifest' in pushop.repo.requirements: | if b'treemanifest' in pushop.repo.requirements: | ||||
| cgpart.addparam(b'treemanifest', b'1') | cgpart.addparam(b'treemanifest', b'1') | ||||
| if b'exp-sidedata-flag' in pushop.repo.requirements: | |||||
| cgpart.addparam(b'exp-sidedata', b'1') | |||||
| def handlereply(op): | def handlereply(op): | ||||
| """extract addchangegroup returns from server reply""" | """extract addchangegroup returns from server reply""" | ||||
| cgreplies = op.records.getreplies(cgpart.id) | cgreplies = op.records.getreplies(cgpart.id) | ||||
| assert len(cgreplies[b'changegroup']) == 1 | assert len(cgreplies[b'changegroup']) == 1 | ||||
| pushop.cgresult = cgreplies[b'changegroup'][0][b'return'] | pushop.cgresult = cgreplies[b'changegroup'][0][b'return'] | ||||
| return handlereply | return handlereply | ||||
| if cgversions: | if cgversions: | ||||
| part.addparam(b'version', version) | part.addparam(b'version', version) | ||||
| part.addparam(b'nbchanges', b'%d' % len(outgoing.missing), mandatory=False) | part.addparam(b'nbchanges', b'%d' % len(outgoing.missing), mandatory=False) | ||||
| if b'treemanifest' in repo.requirements: | if b'treemanifest' in repo.requirements: | ||||
| part.addparam(b'treemanifest', b'1') | part.addparam(b'treemanifest', b'1') | ||||
| if b'exp-sidedata-flag' in repo.requirements: | |||||
| part.addparam(b'exp-sidedata', b'1') | |||||
| if ( | if ( | ||||
| kwargs.get('narrow', False) | kwargs.get('narrow', False) | ||||
| and kwargs.get('narrow_acl', False) | and kwargs.get('narrow_acl', False) | ||||
| and (include or exclude) | and (include or exclude) | ||||
| ): | ): | ||||
| # this is mandatory because otherwise ACL clients won't work | # this is mandatory because otherwise ACL clients won't work | ||||
| narrowspecpart = bundler.newpart(b'Narrow:responsespec') | narrowspecpart = bundler.newpart(b'Narrow:responsespec') | ||||
| narrowspecpart.data = b'%s\0%s' % ( | narrowspecpart.data = b'%s\0%s' % ( | ||||
| if b'bookmarks' in fields and node in nodebookmarks: | if b'bookmarks' in fields and node in nodebookmarks: | ||||
| d[b'bookmarks'] = sorted(nodebookmarks[node]) | d[b'bookmarks'] = sorted(nodebookmarks[node]) | ||||
| del nodebookmarks[node] | del nodebookmarks[node] | ||||
| followingmeta = [] | followingmeta = [] | ||||
| followingdata = [] | followingdata = [] | ||||
| if b'revision' in fields: | if b'revision' in fields: | ||||
| revisiondata = cl.rawdata(node) | revisiondata = cl._revisiondata(node)[0] | ||||
| followingmeta.append((b'revision', len(revisiondata))) | followingmeta.append((b'revision', len(revisiondata))) | ||||
| followingdata.append(revisiondata) | followingdata.append(revisiondata) | ||||
| # TODO make it possible for extensions to wrap a function or register | # TODO make it possible for extensions to wrap a function or register | ||||
| # a handler to service custom fields. | # a handler to service custom fields. | ||||
| if followingmeta: | if followingmeta: | ||||
| d[b'fieldsfollowing'] = followingmeta | d[b'fieldsfollowing'] = followingmeta | ||||