| indygreg | |
| marmoute |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/changegroup.py (9 lines) | |||
| M | mercurial/revlog.py (3 lines) | |||
| M | mercurial/revlogutils/sidedata.py (22 lines) | |||
| M | mercurial/utils/storageutil.py (19 lines) |
| ): | ): | ||||
| """Calculate deltas for a set of revisions. | """Calculate deltas for a set of revisions. | ||||
| Is a generator of ``revisiondelta`` instances. | Is a generator of ``revisiondelta`` instances. | ||||
| If topic is not None, progress detail will be generated using this | If topic is not None, progress detail will be generated using this | ||||
| topic name (e.g. changesets, manifests, etc). | topic name (e.g. changesets, manifests, etc). | ||||
| See `storageutil.emitrevisions` for the doc on `sidedata_helpers`. | See `revlogutil.sidedata.get_sidedata_helpers` for the doc on | ||||
| `sidedata_helpers`. | |||||
| """ | """ | ||||
| if not nodes: | if not nodes: | ||||
| return | return | ||||
| cl = repo.changelog | cl = repo.changelog | ||||
| if ischangelog: | if ischangelog: | ||||
| # `hg log` shows changesets in storage order. To preserve order | # `hg log` shows changesets in storage order. To preserve order | ||||
| Returns a 2-tuple of a dict containing state and an iterable of | Returns a 2-tuple of a dict containing state and an iterable of | ||||
| byte chunks. The state will not be fully populated until the | byte chunks. The state will not be fully populated until the | ||||
| chunk stream has been fully consumed. | chunk stream has been fully consumed. | ||||
| if generate is False, the state will be fully populated and no chunk | if generate is False, the state will be fully populated and no chunk | ||||
| stream will be yielded | stream will be yielded | ||||
| See `storageutil.emitrevisions` for the doc on `sidedata_helpers`. | See `revlogutil.sidedata.get_sidedata_helpers` for the doc on | ||||
| `sidedata_helpers`. | |||||
| """ | """ | ||||
| clrevorder = {} | clrevorder = {} | ||||
| manifests = {} | manifests = {} | ||||
| mfl = self._repo.manifestlog | mfl = self._repo.manifestlog | ||||
| changedfiles = set() | changedfiles = set() | ||||
| clrevtomanifestrev = {} | clrevtomanifestrev = {} | ||||
| state = { | state = { | ||||
| clrevtolocalrev, | clrevtolocalrev, | ||||
| sidedata_helpers=None, | sidedata_helpers=None, | ||||
| ): | ): | ||||
| """Returns an iterator of changegroup chunks containing manifests. | """Returns an iterator of changegroup chunks containing manifests. | ||||
| `source` is unused here, but is used by extensions like remotefilelog to | `source` is unused here, but is used by extensions like remotefilelog to | ||||
| change what is sent based in pulls vs pushes, etc. | change what is sent based in pulls vs pushes, etc. | ||||
| See `storageutil.emitrevisions` for the doc on `sidedata_helpers`. | See `revlogutil.sidedata.get_sidedata_helpers` for the doc on | ||||
| `sidedata_helpers`. | |||||
| """ | """ | ||||
| repo = self._repo | repo = self._repo | ||||
| mfl = repo.manifestlog | mfl = repo.manifestlog | ||||
| tmfnodes = {b'': manifests} | tmfnodes = {b'': manifests} | ||||
| # Callback for the manifest, used to collect linkrevs for filelog | # Callback for the manifest, used to collect linkrevs for filelog | ||||
| # revisions. | # revisions. | ||||
| # Returns the linkrev node (collected in lookupcl). | # Returns the linkrev node (collected in lookupcl). | ||||
| are converting a non-generaldelta revlog to a generaldelta revlog, | are converting a non-generaldelta revlog to a generaldelta revlog, | ||||
| deltas will be recomputed if the delta's parent isn't a parent of the | deltas will be recomputed if the delta's parent isn't a parent of the | ||||
| revision. | revision. | ||||
| In addition to the delta policy, the ``forcedeltabothparents`` | In addition to the delta policy, the ``forcedeltabothparents`` | ||||
| argument controls whether to force compute deltas against both parents | argument controls whether to force compute deltas against both parents | ||||
| for merges. By default, the current default is used. | for merges. By default, the current default is used. | ||||
| See `storageutil.emitrevisions` for the doc on `sidedata_helpers`. | See `revlogutil.sidedata.get_sidedata_helpers` for the doc on | ||||
| `sidedata_helpers`. | |||||
| """ | """ | ||||
| if deltareuse not in self.DELTAREUSEALL: | if deltareuse not in self.DELTAREUSEALL: | ||||
| raise ValueError( | raise ValueError( | ||||
| _(b'value for deltareuse invalid: %s') % deltareuse | _(b'value for deltareuse invalid: %s') % deltareuse | ||||
| ) | ) | ||||
| if len(destrevlog): | if len(destrevlog): | ||||
| raise ValueError(_(b'destination revlog is not empty')) | raise ValueError(_(b'destination revlog is not empty')) | ||||
| if storeddigest != readdigest: | if storeddigest != readdigest: | ||||
| raise error.SidedataHashError(key, storeddigest, readdigest) | raise error.SidedataHashError(key, storeddigest, readdigest) | ||||
| sidedata[key] = entrytext | sidedata[key] = entrytext | ||||
| dataoffset = nextdataoffset | dataoffset = nextdataoffset | ||||
| return sidedata | return sidedata | ||||
| def get_sidedata_helpers(repo, remote_sd_categories, pull=False): | def get_sidedata_helpers(repo, remote_sd_categories, pull=False): | ||||
| """ | |||||
| Returns a dictionary mapping revlog types to tuples of | |||||
| `(repo, computers, removers)`: | |||||
| * `repo` is used as an argument for computers | |||||
| * `computers` is a list of `(category, (keys, computer, flags)` that | |||||
| compute the missing sidedata categories that were asked: | |||||
| * `category` is the sidedata category | |||||
| * `keys` are the sidedata keys to be affected | |||||
| * `flags` is a bitmask (an integer) of flags to remove when | |||||
| removing the category. | |||||
| * `computer` is the function `(repo, store, rev, sidedata)` that | |||||
| returns a tuple of | |||||
| `(new sidedata dict, (flags to add, flags to remove))`. | |||||
| For example, it will return `({}, (0, 1 << 15))` to return no | |||||
| sidedata, with no flags to add and one flag to remove. | |||||
| * `removers` will remove the keys corresponding to the categories | |||||
| that are present, but not needed. | |||||
| If both `computers` and `removers` are empty, sidedata will simply not | |||||
| be transformed. | |||||
| """ | |||||
| # Computers for computing sidedata on-the-fly | # Computers for computing sidedata on-the-fly | ||||
| sd_computers = collections.defaultdict(list) | sd_computers = collections.defaultdict(list) | ||||
| # Computers for categories to remove from sidedata | # Computers for categories to remove from sidedata | ||||
| sd_removers = collections.defaultdict(list) | sd_removers = collections.defaultdict(list) | ||||
| to_generate = remote_sd_categories - repo._wanted_sidedata | to_generate = remote_sd_categories - repo._wanted_sidedata | ||||
| to_remove = repo._wanted_sidedata - remote_sd_categories | to_remove = repo._wanted_sidedata - remote_sd_categories | ||||
| if pull: | if pull: | ||||
| to_generate, to_remove = to_remove, to_generate | to_generate, to_remove = to_remove, to_generate | ||||
| return sidedata_helpers | return sidedata_helpers | ||||
| def run_sidedata_helpers(store, sidedata_helpers, sidedata, rev): | def run_sidedata_helpers(store, sidedata_helpers, sidedata, rev): | ||||
| """Returns the sidedata for the given revision after running through | """Returns the sidedata for the given revision after running through | ||||
| the given helpers. | the given helpers. | ||||
| - `store`: the revlog this applies to (changelog, manifest, or filelog | - `store`: the revlog this applies to (changelog, manifest, or filelog | ||||
| instance) | instance) | ||||
| - `sidedata_helpers`: see `storageutil.emitrevisions` | - `sidedata_helpers`: see `get_sidedata_helpers` | ||||
| - `sidedata`: previous sidedata at the given rev, if any | - `sidedata`: previous sidedata at the given rev, if any | ||||
| - `rev`: affected rev of `store` | - `rev`: affected rev of `store` | ||||
| """ | """ | ||||
| repo, sd_computers, sd_removers = sidedata_helpers | repo, sd_computers, sd_removers = sidedata_helpers | ||||
| kind = store.revlog_kind | kind = store.revlog_kind | ||||
| flags_to_add = 0 | flags_to_add = 0 | ||||
| flags_to_remove = 0 | flags_to_remove = 0 | ||||
| for _keys, sd_computer, _flags in sd_computers.get(kind, []): | for _keys, sd_computer, _flags in sd_computers.get(kind, []): | ||||
| Whether to send fulltext revisions instead of deltas, if allowed. | Whether to send fulltext revisions instead of deltas, if allowed. | ||||
| ``nodesorder`` | ``nodesorder`` | ||||
| ``revisiondata`` | ``revisiondata`` | ||||
| ``assumehaveparentrevisions`` | ``assumehaveparentrevisions`` | ||||
| ``sidedata_helpers`` (optional) | ``sidedata_helpers`` (optional) | ||||
| If not None, means that sidedata should be included. | If not None, means that sidedata should be included. | ||||
| A dictionary of revlog type to tuples of `(repo, computers, removers)`: | See `revlogutil.sidedata.get_sidedata_helpers`. | ||||
| * `repo` is used as an argument for computers | |||||
| * `computers` is a list of `(category, (keys, computer, flags)` that | |||||
| compute the missing sidedata categories that were asked: | |||||
| * `category` is the sidedata category | |||||
| * `keys` are the sidedata keys to be affected | |||||
| * `flags` is a bitmask (an integer) of flags to remove when | |||||
| removing the category. | |||||
| * `computer` is the function `(repo, store, rev, sidedata)` that | |||||
| returns a tuple of | |||||
| `(new sidedata dict, (flags to add, flags to remove))`. | |||||
| For example, it will return `({}, (0, 1 << 15))` to return no | |||||
| sidedata, with no flags to add and one flag to remove. | |||||
| * `removers` will remove the keys corresponding to the categories | |||||
| that are present, but not needed. | |||||
| If both `computers` and `removers` are empty, sidedata are simply not | |||||
| transformed. | |||||
| Revlog types are `changelog`, `manifest` or `filelog`. | |||||
| """ | """ | ||||
| fnode = store.node | fnode = store.node | ||||
| frev = store.rev | frev = store.rev | ||||
| if nodesorder == b'nodes': | if nodesorder == b'nodes': | ||||
| revs = [frev(n) for n in nodes] | revs = [frev(n) for n in nodes] | ||||
| elif nodesorder == b'linear': | elif nodesorder == b'linear': | ||||