Mercurial > public > mercurial-scm > hg-stable
annotate mercurial/revlog.py @ 53040:cdd7bf612c7b stable tip
bundle-spec: properly format boolean parameter (issue6960)
This was breaking automatic clone bundle generation. This changeset fixes it and
add a test to catch it in the future.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 11 Mar 2025 02:29:42 +0100 |
| parents | 8de68446a5bd |
| children |
| rev | line source |
|---|---|
|
8226
8b2cd04a6e97
put license and copyright info into comment blocks
Martin Geisler <mg@lazybytes.net>
parents:
8225
diff
changeset
|
1 # revlog.py - storage back-end for mercurial |
|
8b2cd04a6e97
put license and copyright info into comment blocks
Martin Geisler <mg@lazybytes.net>
parents:
8225
diff
changeset
|
2 # |
|
46819
d4ba4d51f85f
contributor: change mentions of mpm to olivia
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46807
diff
changeset
|
3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> |
|
8226
8b2cd04a6e97
put license and copyright info into comment blocks
Martin Geisler <mg@lazybytes.net>
parents:
8225
diff
changeset
|
4 # |
|
8b2cd04a6e97
put license and copyright info into comment blocks
Martin Geisler <mg@lazybytes.net>
parents:
8225
diff
changeset
|
5 # This software may be used and distributed according to the terms of the |
| 10263 | 6 # GNU General Public License version 2 or any later version. |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
7 |
|
8227
0a9542703300
turn some comments back into module docstrings
Martin Geisler <mg@lazybytes.net>
parents:
8226
diff
changeset
|
8 """Storage back-end for Mercurial. |
|
0a9542703300
turn some comments back into module docstrings
Martin Geisler <mg@lazybytes.net>
parents:
8226
diff
changeset
|
9 |
|
0a9542703300
turn some comments back into module docstrings
Martin Geisler <mg@lazybytes.net>
parents:
8226
diff
changeset
|
10 This provides efficient delta storage with O(1) retrieve and append |
|
0a9542703300
turn some comments back into module docstrings
Martin Geisler <mg@lazybytes.net>
parents:
8226
diff
changeset
|
11 and O(changes) merge between branches. |
|
0a9542703300
turn some comments back into module docstrings
Martin Geisler <mg@lazybytes.net>
parents:
8226
diff
changeset
|
12 """ |
|
0a9542703300
turn some comments back into module docstrings
Martin Geisler <mg@lazybytes.net>
parents:
8226
diff
changeset
|
13 |
|
51901
f4733654f144
typing: add `from __future__ import annotations` to most files
Matt Harbison <matt_harbison@yahoo.com>
parents:
51898
diff
changeset
|
14 from __future__ import annotations |
|
27361
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
15 |
|
46852
fbfb1d6d8459
revlog: fix error about unknown compression format in py3
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
46819
diff
changeset
|
16 import binascii |
|
25113
0ca8410ea345
util: drop alias for collections.deque
Martin von Zweigbergk <martinvonz@google.com>
parents:
24454
diff
changeset
|
17 import collections |
|
36012
4d66993bdcff
revlog: add a _datareadfp context manager for data access needs
Boris Feld <boris.feld@octobus.net>
parents:
36011
diff
changeset
|
18 import contextlib |
|
42567
4eaf7197a740
cleanup: use named constants for second arg to .seek()
Augie Fackler <augie@google.com>
parents:
42478
diff
changeset
|
19 import io |
|
27430
e240e914d226
revlog: seek to end of file before writing (issue4943)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26705
diff
changeset
|
20 import os |
|
27361
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
21 import struct |
|
51788
278af66e6595
typing: induce pytype to use the standard `attr` instead of the vendored copy
Matt Harbison <matt_harbison@yahoo.com>
parents:
51762
diff
changeset
|
22 import typing |
|
50348
f952be90b051
revlog-split: make sure the self._indexfile attribut is reset (issue6811)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50316
diff
changeset
|
23 import weakref |
|
27361
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
24 import zlib |
|
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
25 |
|
51737
df6ce326936f
typing: add a few type hints to `mercurial/revlog.py`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51650
diff
changeset
|
26 from typing import ( |
|
51868
0338fb200a30
typing: lock in new pytype gains from making revlog related classes typeable
Matt Harbison <matt_harbison@yahoo.com>
parents:
51867
diff
changeset
|
27 Iterable, |
|
0338fb200a30
typing: lock in new pytype gains from making revlog related classes typeable
Matt Harbison <matt_harbison@yahoo.com>
parents:
51867
diff
changeset
|
28 Iterator, |
|
51737
df6ce326936f
typing: add a few type hints to `mercurial/revlog.py`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51650
diff
changeset
|
29 Optional, |
|
df6ce326936f
typing: add a few type hints to `mercurial/revlog.py`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51650
diff
changeset
|
30 Tuple, |
|
df6ce326936f
typing: add a few type hints to `mercurial/revlog.py`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51650
diff
changeset
|
31 ) |
|
df6ce326936f
typing: add a few type hints to `mercurial/revlog.py`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51650
diff
changeset
|
32 |
|
27361
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
33 # import stuff from node for others to import from revlog |
|
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
34 from .node import ( |
|
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
35 bin, |
|
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
36 hex, |
|
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
37 nullrev, |
|
46793
6266d19556ad
node: introduce nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46792
diff
changeset
|
38 sha1nodeconstants, |
|
39877
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
39 short, |
|
32441
a28c76e1cea9
revlog: raise WdirUnsupported when wdirrev is passed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32431
diff
changeset
|
40 wdirrev, |
|
27361
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
41 ) |
|
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
42 from .i18n import _ |
|
39356
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
43 from .revlogutils.constants import ( |
|
47089
4c041c71ec01
revlog: introduce an explicit tracking of what the revlog is about
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47082
diff
changeset
|
44 ALL_KINDS, |
|
47277
921648d31553
changelogv2: use a dedicated version number
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47274
diff
changeset
|
45 CHANGELOGV2, |
|
47266
ff9fd7107d11
revlog: implement a "default compression" mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47265
diff
changeset
|
46 COMP_MODE_DEFAULT, |
|
47260
130c9f7ed914
revlog: add a "data compression mode" entry in the index tuple
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47257
diff
changeset
|
47 COMP_MODE_INLINE, |
|
47264
b876f0bf7366
revlog: introduce a plain compression mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47263
diff
changeset
|
48 COMP_MODE_PLAIN, |
|
49791
05db41701ece
find-delta: pass the cache-delta usage policy alongside the cache-delta
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49778
diff
changeset
|
49 DELTA_BASE_REUSE_NO, |
|
05db41701ece
find-delta: pass the cache-delta usage policy alongside the cache-delta
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49778
diff
changeset
|
50 DELTA_BASE_REUSE_TRY, |
|
48764
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
51 ENTRY_RANK, |
|
47242
4d1c893b9095
revlog: unify flag processing when loading index
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47241
diff
changeset
|
52 FEATURES_BY_VERSION, |
|
39356
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
53 FLAG_GENERALDELTA, |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
54 FLAG_INLINE_DATA, |
|
46859
c6e23fb4bfb4
revlog: move the "index header" struct inside revlog.utils.constants
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46858
diff
changeset
|
55 INDEX_HEADER, |
|
47274
6c84fc9c9a90
changelogv2: introduce a "changelogv2" feature
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47272
diff
changeset
|
56 KIND_CHANGELOG, |
|
49712
92892dff03f3
revlog: use the user facing filename as the display_id for filelogs
Matt Harbison <matt_harbison@yahoo.com>
parents:
49711
diff
changeset
|
57 KIND_FILELOG, |
|
48764
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
58 RANK_UNKNOWN, |
|
39356
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
59 REVLOGV0, |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
60 REVLOGV1, |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
61 REVLOGV1_FLAGS, |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
62 REVLOGV2, |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
63 REVLOGV2_FLAGS, |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
64 REVLOG_DEFAULT_FLAGS, |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
65 REVLOG_DEFAULT_FORMAT, |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
66 REVLOG_DEFAULT_VERSION, |
|
47241
0e9105bf54cb
revlog: unify checks for supported flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47239
diff
changeset
|
67 SUPPORTED_FLAGS, |
|
39356
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
68 ) |
|
42745
ca5ca3badd3c
flagutil: create a `mercurial.revlogutils.flagutil` module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42736
diff
changeset
|
69 from .revlogutils.flagutil import ( |
|
ca5ca3badd3c
flagutil: create a `mercurial.revlogutils.flagutil` module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42736
diff
changeset
|
70 REVIDX_DEFAULT_FLAGS, |
|
ca5ca3badd3c
flagutil: create a `mercurial.revlogutils.flagutil` module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42736
diff
changeset
|
71 REVIDX_ELLIPSIS, |
|
ca5ca3badd3c
flagutil: create a `mercurial.revlogutils.flagutil` module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42736
diff
changeset
|
72 REVIDX_EXTSTORED, |
|
ca5ca3badd3c
flagutil: create a `mercurial.revlogutils.flagutil` module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42736
diff
changeset
|
73 REVIDX_FLAGS_ORDER, |
|
45671
2d6aea053153
copies: add a HASCOPIESINFO flag to highlight rev with useful data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45054
diff
changeset
|
74 REVIDX_HASCOPIESINFO, |
|
42745
ca5ca3badd3c
flagutil: create a `mercurial.revlogutils.flagutil` module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42736
diff
changeset
|
75 REVIDX_ISCENSORED, |
|
ca5ca3badd3c
flagutil: create a `mercurial.revlogutils.flagutil` module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42736
diff
changeset
|
76 REVIDX_RAWTEXT_CHANGING_FLAGS, |
|
ca5ca3badd3c
flagutil: create a `mercurial.revlogutils.flagutil` module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42736
diff
changeset
|
77 ) |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
78 from .thirdparty import attr |
|
51788
278af66e6595
typing: induce pytype to use the standard `attr` instead of the vendored copy
Matt Harbison <matt_harbison@yahoo.com>
parents:
51762
diff
changeset
|
79 |
|
278af66e6595
typing: induce pytype to use the standard `attr` instead of the vendored copy
Matt Harbison <matt_harbison@yahoo.com>
parents:
51762
diff
changeset
|
80 # Force pytype to use the non-vendored package |
|
278af66e6595
typing: induce pytype to use the standard `attr` instead of the vendored copy
Matt Harbison <matt_harbison@yahoo.com>
parents:
51762
diff
changeset
|
81 if typing.TYPE_CHECKING: |
|
278af66e6595
typing: induce pytype to use the standard `attr` instead of the vendored copy
Matt Harbison <matt_harbison@yahoo.com>
parents:
51762
diff
changeset
|
82 # noinspection PyPackageRequirements |
|
278af66e6595
typing: induce pytype to use the standard `attr` instead of the vendored copy
Matt Harbison <matt_harbison@yahoo.com>
parents:
51762
diff
changeset
|
83 import attr |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
84 from .pure.parsers import BaseIndexObject |
|
51788
278af66e6595
typing: induce pytype to use the standard `attr` instead of the vendored copy
Matt Harbison <matt_harbison@yahoo.com>
parents:
51762
diff
changeset
|
85 |
|
27361
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
86 from . import ( |
|
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
87 ancestor, |
|
39867
5a9ab91e0a45
revlog: new API to emit revision data
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39850
diff
changeset
|
88 dagop, |
|
27361
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
89 error, |
|
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
90 mdiff, |
|
32411
df448de7cf3b
parsers: switch to policy importer
Yuya Nishihara <yuya@tcha.org>
parents:
32355
diff
changeset
|
91 policy, |
|
31580
a8e55d6f1d67
revlog: use pycompat.maplist to eagerly evaluate map on Python 3
Augie Fackler <augie@google.com>
parents:
31511
diff
changeset
|
92 pycompat, |
|
47400
ac60a1366a49
revlog: move `offset_type` to `revlogutils`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47399
diff
changeset
|
93 revlogutils, |
|
27361
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
94 templatefilters, |
|
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
95 util, |
|
51862
71fb6e0a7a35
typing: add type hints to the `opener` attributes and arguments of revlog
Matt Harbison <matt_harbison@yahoo.com>
parents:
51788
diff
changeset
|
96 vfs as vfsmod, |
|
27361
29f50344fa83
revlog: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27251
diff
changeset
|
97 ) |
|
42823
268662aac075
interfaces: create a new folder for interfaces and move repository.py in it
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
42808
diff
changeset
|
98 from .interfaces import ( |
|
268662aac075
interfaces: create a new folder for interfaces and move repository.py in it
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
42808
diff
changeset
|
99 repository, |
|
268662aac075
interfaces: create a new folder for interfaces and move repository.py in it
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
42808
diff
changeset
|
100 ) |
|
39357
655b5b465953
revlog: split functionality related to deltas computation in a new module
Boris Feld <boris.feld@octobus.net>
parents:
39356
diff
changeset
|
101 from .revlogutils import ( |
|
655b5b465953
revlog: split functionality related to deltas computation in a new module
Boris Feld <boris.feld@octobus.net>
parents:
39356
diff
changeset
|
102 deltas as deltautil, |
|
47245
616b8f412676
revlogv2: introduce a very basic docket file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47242
diff
changeset
|
103 docket as docketutil, |
|
42746
05c80f9ef100
flagutil: move the `flagprocessors` mapping in the new module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42745
diff
changeset
|
104 flagutil, |
|
44035
ab595920de0e
revlogutils: move the NodeMap class in a dedicated nodemap module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44017
diff
changeset
|
105 nodemap as nodemaputil, |
|
47431
e0a314bcbc9d
revlog: Extract low-level random-access file read caching logic
Simon Sapin <simon.sapin@octobus.net>
parents:
47420
diff
changeset
|
106 randomaccessfile, |
|
47079
724db234b790
revlog: code for `revlogv0` in its own module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47078
diff
changeset
|
107 revlogv0, |
|
47470
bc8536e09a20
revlog: rewrite `censors.py` to `rewrite.py`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47469
diff
changeset
|
108 rewrite, |
|
43037
142deb539ccf
sidedata: register the flag processors if the repository allows for it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43034
diff
changeset
|
109 sidedata as sidedatautil, |
|
39357
655b5b465953
revlog: split functionality related to deltas computation in a new module
Boris Feld <boris.feld@octobus.net>
parents:
39356
diff
changeset
|
110 ) |
|
37087
f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
36768
diff
changeset
|
111 from .utils import ( |
|
39882
f8eb71f9e3bd
storageutil: new module for storage primitives (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39877
diff
changeset
|
112 storageutil, |
|
37087
f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
36768
diff
changeset
|
113 stringutil, |
|
f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
36768
diff
changeset
|
114 ) |
|
36
da28286bf6b7
Add smart node lookup by substring or by rev number
mpm@selenic.com
parents:
26
diff
changeset
|
115 |
|
39356
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
116 # blanked usage of all the name to prevent pyflakes constraints |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
117 # We need these name available in the module for extensions. |
|
47098
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
118 |
|
39356
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
119 REVLOGV0 |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
120 REVLOGV1 |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
121 REVLOGV2 |
|
48772
1bb62821f080
revlog: register changelogv2 C implementation in parsers
pacien <pacien.trangirard@pacien.net>
parents:
48768
diff
changeset
|
122 CHANGELOGV2 |
|
39356
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
123 FLAG_INLINE_DATA |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
124 FLAG_GENERALDELTA |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
125 REVLOG_DEFAULT_FLAGS |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
126 REVLOG_DEFAULT_FORMAT |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
127 REVLOG_DEFAULT_VERSION |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
128 REVLOGV1_FLAGS |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
129 REVLOGV2_FLAGS |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
130 REVIDX_ISCENSORED |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
131 REVIDX_ELLIPSIS |
|
45671
2d6aea053153
copies: add a HASCOPIESINFO flag to highlight rev with useful data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45054
diff
changeset
|
132 REVIDX_HASCOPIESINFO |
|
39356
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
133 REVIDX_EXTSTORED |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
134 REVIDX_DEFAULT_FLAGS |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
135 REVIDX_FLAGS_ORDER |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
136 REVIDX_RAWTEXT_CHANGING_FLAGS |
|
729082bb9938
revlog: split constants into a new `revlogutils.constants` module
Boris Feld <boris.feld@octobus.net>
parents:
39260
diff
changeset
|
137 |
|
43554
9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
Augie Fackler <augie@google.com>
parents:
43492
diff
changeset
|
138 parsers = policy.importmod('parsers') |
|
52563
98dcbe752dfe
rust-pyo3: plugging in the ancestor module
Georges Racinet <georges.racinet@cloudcrane.io>
parents:
52499
diff
changeset
|
139 rustancestor = policy.importrust('ancestor', pyo3=True) |
|
52446
4eec920bbb37
rust-pyo3: plugging in the dagop module
Georges Racinet <georges.racinet@cloudcrane.io>
parents:
52304
diff
changeset
|
140 rustdagop = policy.importrust('dagop', pyo3=True) |
|
52851
e52dc683bf6b
rust-pyo3: switch over to the pyo3 `InnerRevlog`
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52679
diff
changeset
|
141 rustrevlog = policy.importrust('revlog', pyo3=True) |
|
32411
df448de7cf3b
parsers: switch to policy importer
Yuya Nishihara <yuya@tcha.org>
parents:
32355
diff
changeset
|
142 |
|
30817
2b279126b8f5
revlog: use compression engine APIs for decompression
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30795
diff
changeset
|
143 # Aliased for performance. |
|
2b279126b8f5
revlog: use compression engine APIs for decompression
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30795
diff
changeset
|
144 _zlibdecompress = zlib.decompress |
|
5007
3addf4531643
revlog: localize some fastpath functions
Matt Mackall <mpm@selenic.com>
parents:
5006
diff
changeset
|
145 |
|
49923
9854a9adc466
revlog: fix misleading comment about _maxinline
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49877
diff
changeset
|
146 # max size of inline data embedded into a revlog |
|
10916
9c84395a338e
add documentation for revlog._prereadsize
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10914
diff
changeset
|
147 _maxinline = 131072 |
|
10913
f2ecc5733c89
revlog: factor out _maxinline global.
Greg Ward <greg-hg@gerg.ca>
parents:
10404
diff
changeset
|
148 |
|
51394
a0d88b021a98
unbundle: faster computation of changed heads
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
51328
diff
changeset
|
149 |
|
39783
db088e133e91
revlog: define ellipsis flag processors in core
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39360
diff
changeset
|
150 # Flag processors for REVIDX_ELLIPSIS. |
|
db088e133e91
revlog: define ellipsis flag processors in core
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39360
diff
changeset
|
151 def ellipsisreadprocessor(rl, text): |
|
46722
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
152 return text, False |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
153 |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
154 |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
155 def ellipsiswriteprocessor(rl, text): |
|
39783
db088e133e91
revlog: define ellipsis flag processors in core
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39360
diff
changeset
|
156 return text, False |
|
db088e133e91
revlog: define ellipsis flag processors in core
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39360
diff
changeset
|
157 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
158 |
|
39783
db088e133e91
revlog: define ellipsis flag processors in core
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39360
diff
changeset
|
159 def ellipsisrawprocessor(rl, text): |
|
db088e133e91
revlog: define ellipsis flag processors in core
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39360
diff
changeset
|
160 return False |
|
db088e133e91
revlog: define ellipsis flag processors in core
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39360
diff
changeset
|
161 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
162 |
|
39783
db088e133e91
revlog: define ellipsis flag processors in core
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39360
diff
changeset
|
163 ellipsisprocessor = ( |
|
db088e133e91
revlog: define ellipsis flag processors in core
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39360
diff
changeset
|
164 ellipsisreadprocessor, |
|
db088e133e91
revlog: define ellipsis flag processors in core
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39360
diff
changeset
|
165 ellipsiswriteprocessor, |
|
db088e133e91
revlog: define ellipsis flag processors in core
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39360
diff
changeset
|
166 ellipsisrawprocessor, |
|
db088e133e91
revlog: define ellipsis flag processors in core
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39360
diff
changeset
|
167 ) |
|
db088e133e91
revlog: define ellipsis flag processors in core
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39360
diff
changeset
|
168 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
169 |
|
43962
7c3118b9a9db
revlog: split the content verification of a node into a separate method
Matt Harbison <matt_harbison@yahoo.com>
parents:
43799
diff
changeset
|
170 def _verify_revision(rl, skipflags, state, node): |
|
7c3118b9a9db
revlog: split the content verification of a node into a separate method
Matt Harbison <matt_harbison@yahoo.com>
parents:
43799
diff
changeset
|
171 """Verify the integrity of the given revlog ``node`` while providing a hook |
|
7c3118b9a9db
revlog: split the content verification of a node into a separate method
Matt Harbison <matt_harbison@yahoo.com>
parents:
43799
diff
changeset
|
172 point for extensions to influence the operation.""" |
|
7c3118b9a9db
revlog: split the content verification of a node into a separate method
Matt Harbison <matt_harbison@yahoo.com>
parents:
43799
diff
changeset
|
173 if skipflags: |
|
7c3118b9a9db
revlog: split the content verification of a node into a separate method
Matt Harbison <matt_harbison@yahoo.com>
parents:
43799
diff
changeset
|
174 state[b'skipread'].add(node) |
|
7c3118b9a9db
revlog: split the content verification of a node into a separate method
Matt Harbison <matt_harbison@yahoo.com>
parents:
43799
diff
changeset
|
175 else: |
|
7c3118b9a9db
revlog: split the content verification of a node into a separate method
Matt Harbison <matt_harbison@yahoo.com>
parents:
43799
diff
changeset
|
176 # Side-effect: read content and verify hash. |
|
7c3118b9a9db
revlog: split the content verification of a node into a separate method
Matt Harbison <matt_harbison@yahoo.com>
parents:
43799
diff
changeset
|
177 rl.revision(node) |
|
7c3118b9a9db
revlog: split the content verification of a node into a separate method
Matt Harbison <matt_harbison@yahoo.com>
parents:
43799
diff
changeset
|
178 |
|
7c3118b9a9db
revlog: split the content verification of a node into a separate method
Matt Harbison <matt_harbison@yahoo.com>
parents:
43799
diff
changeset
|
179 |
|
46310
fc2d5c0aed7f
persistent-nodemap: add a "warn" option to the slow-path config
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45957
diff
changeset
|
180 # True if a fast implementation for persistent-nodemap is available |
|
fc2d5c0aed7f
persistent-nodemap: add a "warn" option to the slow-path config
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45957
diff
changeset
|
181 # |
|
fc2d5c0aed7f
persistent-nodemap: add a "warn" option to the slow-path config
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45957
diff
changeset
|
182 # We also consider we have a "fast" implementation in "pure" python because |
|
fc2d5c0aed7f
persistent-nodemap: add a "warn" option to the slow-path config
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45957
diff
changeset
|
183 # people using pure don't really have performance consideration (and a |
|
fc2d5c0aed7f
persistent-nodemap: add a "warn" option to the slow-path config
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45957
diff
changeset
|
184 # wheelbarrow of other slowness source) |
|
50951
d718eddf01d9
safehasattr: drop usage in favor of hasattr
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50761
diff
changeset
|
185 HAS_FAST_PERSISTENT_NODEMAP = rustrevlog is not None or hasattr( |
|
46310
fc2d5c0aed7f
persistent-nodemap: add a "warn" option to the slow-path config
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45957
diff
changeset
|
186 parsers, 'BaseIndexObject' |
|
fc2d5c0aed7f
persistent-nodemap: add a "warn" option to the slow-path config
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45957
diff
changeset
|
187 ) |
|
fc2d5c0aed7f
persistent-nodemap: add a "warn" option to the slow-path config
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45957
diff
changeset
|
188 |
|
fc2d5c0aed7f
persistent-nodemap: add a "warn" option to the slow-path config
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45957
diff
changeset
|
189 |
|
39867
5a9ab91e0a45
revlog: new API to emit revision data
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39850
diff
changeset
|
190 @attr.s(slots=True) |
|
52499
43d2a2f66434
revlog: subclass the new `repository.irevisiondelta` Protocol class
Matt Harbison <matt_harbison@yahoo.com>
parents:
52497
diff
changeset
|
191 class revlogrevisiondelta(repository.irevisiondelta): |
|
43d2a2f66434
revlog: subclass the new `repository.irevisiondelta` Protocol class
Matt Harbison <matt_harbison@yahoo.com>
parents:
52497
diff
changeset
|
192 node = attr.ib(type=bytes) |
|
43d2a2f66434
revlog: subclass the new `repository.irevisiondelta` Protocol class
Matt Harbison <matt_harbison@yahoo.com>
parents:
52497
diff
changeset
|
193 p1node = attr.ib(type=bytes) |
|
43d2a2f66434
revlog: subclass the new `repository.irevisiondelta` Protocol class
Matt Harbison <matt_harbison@yahoo.com>
parents:
52497
diff
changeset
|
194 p2node = attr.ib(type=bytes) |
|
43d2a2f66434
revlog: subclass the new `repository.irevisiondelta` Protocol class
Matt Harbison <matt_harbison@yahoo.com>
parents:
52497
diff
changeset
|
195 basenode = attr.ib(type=bytes) |
|
43d2a2f66434
revlog: subclass the new `repository.irevisiondelta` Protocol class
Matt Harbison <matt_harbison@yahoo.com>
parents:
52497
diff
changeset
|
196 flags = attr.ib(type=int) |
|
43d2a2f66434
revlog: subclass the new `repository.irevisiondelta` Protocol class
Matt Harbison <matt_harbison@yahoo.com>
parents:
52497
diff
changeset
|
197 baserevisionsize = attr.ib(type=Optional[int]) |
|
43d2a2f66434
revlog: subclass the new `repository.irevisiondelta` Protocol class
Matt Harbison <matt_harbison@yahoo.com>
parents:
52497
diff
changeset
|
198 revision = attr.ib(type=Optional[bytes]) |
|
43d2a2f66434
revlog: subclass the new `repository.irevisiondelta` Protocol class
Matt Harbison <matt_harbison@yahoo.com>
parents:
52497
diff
changeset
|
199 delta = attr.ib(type=Optional[bytes]) |
|
43d2a2f66434
revlog: subclass the new `repository.irevisiondelta` Protocol class
Matt Harbison <matt_harbison@yahoo.com>
parents:
52497
diff
changeset
|
200 sidedata = attr.ib(type=Optional[bytes]) |
|
43d2a2f66434
revlog: subclass the new `repository.irevisiondelta` Protocol class
Matt Harbison <matt_harbison@yahoo.com>
parents:
52497
diff
changeset
|
201 protocol_flags = attr.ib(type=int) |
|
43d2a2f66434
revlog: subclass the new `repository.irevisiondelta` Protocol class
Matt Harbison <matt_harbison@yahoo.com>
parents:
52497
diff
changeset
|
202 linknode = attr.ib(default=None, type=Optional[bytes]) |
|
39259
b41d023a412a
repository: establish API for emitting revision deltas
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39225
diff
changeset
|
203 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
204 |
|
39847
97986c9c69d3
verify: start to abstract file verification
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39836
diff
changeset
|
205 @attr.s(frozen=True) |
|
52497
4ef6dbc27a99
revlog: subclass the new `repository.iverifyproblem` Protocol class
Matt Harbison <matt_harbison@yahoo.com>
parents:
52446
diff
changeset
|
206 class revlogproblem(repository.iverifyproblem): |
|
51867
766c55492258
typing: add types to `revlog.revlogproblem`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51866
diff
changeset
|
207 warning = attr.ib(default=None, type=Optional[bytes]) |
|
766c55492258
typing: add types to `revlog.revlogproblem`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51866
diff
changeset
|
208 error = attr.ib(default=None, type=Optional[bytes]) |
|
766c55492258
typing: add types to `revlog.revlogproblem`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51866
diff
changeset
|
209 node = attr.ib(default=None, type=Optional[bytes]) |
|
39847
97986c9c69d3
verify: start to abstract file verification
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39836
diff
changeset
|
210 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
211 |
|
52896
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
212 def parse_index_v1(data, inline, uses_generaldelta): |
|
47077
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
213 # call the C implementation to parse the index data |
|
52896
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
214 index, cache = parsers.parse_index2(data, inline, uses_generaldelta) |
|
47077
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
215 return index, cache |
|
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
216 |
|
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
217 |
|
52896
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
218 def parse_index_v2(data, inline, uses_generaldelta): |
|
47077
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
219 # call the C implementation to parse the index data |
|
52896
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
220 index, cache = parsers.parse_index2( |
|
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
221 data, inline, uses_generaldelta, format=REVLOGV2 |
|
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
222 ) |
|
47077
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
223 return index, cache |
|
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
224 |
|
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
225 |
|
52896
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
226 def parse_index_cl_v2(data, inline, uses_generaldelta): |
|
47281
25ce16bf724b
changelogv2: use a dedicated on disk format for changelogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47280
diff
changeset
|
227 # call the C implementation to parse the index data |
|
52896
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
228 index, cache = parsers.parse_index2( |
|
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
229 data, inline, uses_generaldelta, format=CHANGELOGV2 |
|
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
230 ) |
|
47281
25ce16bf724b
changelogv2: use a dedicated on disk format for changelogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47280
diff
changeset
|
231 return index, cache |
|
25ce16bf724b
changelogv2: use a dedicated on disk format for changelogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47280
diff
changeset
|
232 |
|
25ce16bf724b
changelogv2: use a dedicated on disk format for changelogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47280
diff
changeset
|
233 |
|
50951
d718eddf01d9
safehasattr: drop usage in favor of hasattr
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50761
diff
changeset
|
234 if hasattr(parsers, 'parse_index_devel_nodemap'): |
|
47077
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
235 |
|
52896
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
236 def parse_index_v1_nodemap(data, inline, uses_generaldelta): |
|
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
237 index, cache = parsers.parse_index_devel_nodemap( |
|
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
238 data, inline, uses_generaldelta |
|
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
239 ) |
|
47077
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
240 return index, cache |
|
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
241 |
|
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
242 else: |
|
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
243 parse_index_v1_nodemap = None |
|
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
244 |
|
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
245 |
|
25410
eee88912db0a
revlog: raise an exception earlier if an entry is too large (issue4675)
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
25361
diff
changeset
|
246 # corresponds to uncompressed length of indexformatng (2 gigs, 4-byte |
|
eee88912db0a
revlog: raise an exception earlier if an entry is too large (issue4675)
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
25361
diff
changeset
|
247 # signed integer) |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
248 _maxentrysize = 0x7FFFFFFF |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
249 |
|
47395
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
250 FILE_TOO_SHORT_MSG = _( |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
251 b'cannot read from revlog %s;' |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
252 b' expected %d bytes from offset %d, data size is %d' |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
253 ) |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
254 |
|
49448
5fe7e9eda0f3
revlog: make _partialmatch fail fast on almost-hex inputs
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49314
diff
changeset
|
255 hexdigits = b'0123456789abcdefABCDEF' |
|
5fe7e9eda0f3
revlog: make _partialmatch fail fast on almost-hex inputs
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49314
diff
changeset
|
256 |
|
25410
eee88912db0a
revlog: raise an exception earlier if an entry is too large (issue4675)
Jordi Guti?rrez Hermoso <jordigh@octave.org>
parents:
25361
diff
changeset
|
257 |
|
51035
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
258 class _Config: |
|
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
259 def copy(self): |
|
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
260 return self.__class__(**self.__dict__) |
|
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
261 |
|
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
262 |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
263 @attr.s() |
|
51035
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
264 class FeatureConfig(_Config): |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
265 """Hold configuration values about the available revlog features""" |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
266 |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
267 # the default compression engine |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
268 compression_engine = attr.ib(default=b'zlib') |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
269 # compression engines options |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
270 compression_engine_options = attr.ib(default=attr.Factory(dict)) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
271 |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
272 # can we use censor on this revlog |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
273 censorable = attr.ib(default=False) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
274 # does this revlog use the "side data" feature |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
275 has_side_data = attr.ib(default=False) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
276 # might remove rank configuration once the computation has no impact |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
277 compute_rank = attr.ib(default=False) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
278 # parent order is supposed to be semantically irrelevant, so we |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
279 # normally resort parents to ensure that the first parent is non-null, |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
280 # if there is a non-null parent at all. |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
281 # filelog abuses the parent order as flag to mark some instances of |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
282 # meta-encoded files, so allow it to disable this behavior. |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
283 canonical_parent_order = attr.ib(default=False) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
284 # can ellipsis commit be used |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
285 enable_ellipsis = attr.ib(default=False) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
286 |
|
51035
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
287 def copy(self): |
|
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
288 new = super().copy() |
|
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
289 new.compression_engine_options = self.compression_engine_options.copy() |
|
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
290 return new |
|
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
291 |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
292 |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
293 @attr.s() |
|
51035
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
294 class DataConfig(_Config): |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
295 """Hold configuration value about how the revlog data are read""" |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
296 |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
297 # should we try to open the "pending" version of the revlog |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
298 try_pending = attr.ib(default=False) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
299 # should we try to open the "splitted" version of the revlog |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
300 try_split = attr.ib(default=False) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
301 # When True, indexfile should be opened with checkambig=True at writing, |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
302 # to avoid file stat ambiguity. |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
303 check_ambig = attr.ib(default=False) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
304 |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
305 # If true, use mmap instead of reading to deal with large index |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
306 mmap_large_index = attr.ib(default=False) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
307 # how much data is large |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
308 mmap_index_threshold = attr.ib(default=None) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
309 # How much data to read and cache into the raw revlog data cache. |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
310 chunk_cache_size = attr.ib(default=65536) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
311 |
|
51112
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
312 # The size of the uncompressed cache compared to the largest revision seen. |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
313 uncompressed_cache_factor = attr.ib(default=None) |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
314 |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
315 # The number of chunk cached |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
316 uncompressed_cache_count = attr.ib(default=None) |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
317 |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
318 # Allow sparse reading of the revlog data |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
319 with_sparse_read = attr.ib(default=False) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
320 # minimal density of a sparse read chunk |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
321 sr_density_threshold = attr.ib(default=0.50) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
322 # minimal size of data we skip when performing sparse read |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
323 sr_min_gap_size = attr.ib(default=262144) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
324 |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
325 # are delta encoded against arbitrary bases. |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
326 generaldelta = attr.ib(default=False) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
327 |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
328 |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
329 @attr.s() |
|
51035
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
330 class DeltaConfig(_Config): |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
331 """Hold configuration value about how new delta are computed |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
332 |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
333 Some attributes are duplicated from DataConfig to help havign each object |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
334 self contained. |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
335 """ |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
336 |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
337 # can delta be encoded against arbitrary bases. |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
338 general_delta = attr.ib(default=False) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
339 # Allow sparse writing of the revlog data |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
340 sparse_revlog = attr.ib(default=False) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
341 # maximum length of a delta chain |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
342 max_chain_len = attr.ib(default=None) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
343 # Maximum distance between delta chain base start and end |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
344 max_deltachain_span = attr.ib(default=-1) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
345 # If `upper_bound_comp` is not None, this is the expected maximal gain from |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
346 # compression for the data content. |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
347 upper_bound_comp = attr.ib(default=None) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
348 # Should we try a delta against both parent |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
349 delta_both_parents = attr.ib(default=True) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
350 # Test delta base candidate group by chunk of this maximal size. |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
351 candidate_group_chunk_size = attr.ib(default=0) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
352 # Should we display debug information about delta computation |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
353 debug_delta = attr.ib(default=False) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
354 # trust incoming delta by default |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
355 lazy_delta = attr.ib(default=True) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
356 # trust the base of incoming delta by default |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
357 lazy_delta_base = attr.ib(default=False) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
358 |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
359 |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
360 class _InnerRevlog: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
361 """An inner layer of the revlog object |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
362 |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
363 That layer exist to be able to delegate some operation to Rust, its |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
364 boundaries are arbitrary and based on what we can delegate to Rust. |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
365 """ |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
366 |
|
51862
71fb6e0a7a35
typing: add type hints to the `opener` attributes and arguments of revlog
Matt Harbison <matt_harbison@yahoo.com>
parents:
51788
diff
changeset
|
367 opener: vfsmod.vfs |
|
71fb6e0a7a35
typing: add type hints to the `opener` attributes and arguments of revlog
Matt Harbison <matt_harbison@yahoo.com>
parents:
51788
diff
changeset
|
368 |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
369 def __init__( |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
370 self, |
|
51862
71fb6e0a7a35
typing: add type hints to the `opener` attributes and arguments of revlog
Matt Harbison <matt_harbison@yahoo.com>
parents:
51788
diff
changeset
|
371 opener: vfsmod.vfs, |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
372 index, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
373 index_file, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
374 data_file, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
375 sidedata_file, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
376 inline, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
377 data_config, |
|
51097
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
378 delta_config, |
|
51095
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
379 feature_config, |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
380 chunk_cache, |
|
51095
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
381 default_compression_header, |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
382 ): |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
383 self.opener = opener |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
384 self.index: BaseIndexObject = index |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
385 |
|
51203
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
386 self.index_file = index_file |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
387 self.data_file = data_file |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
388 self.sidedata_file = sidedata_file |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
389 self.inline = inline |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
390 self.data_config = data_config |
|
51097
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
391 self.delta_config = delta_config |
|
51095
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
392 self.feature_config = feature_config |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
393 |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
394 # used during diverted write. |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
395 self._orig_index_file = None |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
396 |
|
51095
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
397 self._default_compression_header = default_compression_header |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
398 |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
399 # index |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
400 |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
401 # 3-tuple of file handles being used for active writing. |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
402 self._writinghandles = None |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
403 |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
404 self._segmentfile = randomaccessfile.randomaccessfile( |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
405 self.opener, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
406 (self.index_file if self.inline else self.data_file), |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
407 self.data_config.chunk_cache_size, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
408 chunk_cache, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
409 ) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
410 self._segmentfile_sidedata = randomaccessfile.randomaccessfile( |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
411 self.opener, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
412 self.sidedata_file, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
413 self.data_config.chunk_cache_size, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
414 ) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
415 |
|
51095
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
416 # revlog header -> revlog compressor |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
417 self._decompressors = {} |
|
51100
8ec2de9c6770
revlog: move the_revisioncache on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51099
diff
changeset
|
418 # 3-tuple of (node, rev, text) for a raw revision. |
|
8ec2de9c6770
revlog: move the_revisioncache on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51099
diff
changeset
|
419 self._revisioncache = None |
|
51095
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
420 |
|
51112
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
421 # cache some uncompressed chunks |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
422 # rev → uncompressed_chunk |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
423 # |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
424 # the max cost is dynamically updated to be proportionnal to the |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
425 # size of revision we actually encounter. |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
426 self._uncompressed_chunk_cache = None |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
427 if self.data_config.uncompressed_cache_factor is not None: |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
428 self._uncompressed_chunk_cache = util.lrucachedict( |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
429 self.data_config.uncompressed_cache_count, |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
430 maxcost=65536, # some arbitrary initial value |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
431 ) |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
432 |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
433 self._delay_buffer = None |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
434 |
|
51097
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
435 def __len__(self): |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
436 return len(self.index) |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
437 |
|
51105
045b5f745f93
revlog: consolidate cache invalidation within the inner objet
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51103
diff
changeset
|
438 def clear_cache(self): |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
439 assert not self.is_delaying |
|
51105
045b5f745f93
revlog: consolidate cache invalidation within the inner objet
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51103
diff
changeset
|
440 self._revisioncache = None |
|
51112
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
441 if self._uncompressed_chunk_cache is not None: |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
442 self._uncompressed_chunk_cache.clear() |
|
51105
045b5f745f93
revlog: consolidate cache invalidation within the inner objet
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51103
diff
changeset
|
443 self._segmentfile.clear_cache() |
|
045b5f745f93
revlog: consolidate cache invalidation within the inner objet
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51103
diff
changeset
|
444 self._segmentfile_sidedata.clear_cache() |
|
045b5f745f93
revlog: consolidate cache invalidation within the inner objet
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51103
diff
changeset
|
445 |
|
51109
af96fbb8f739
revlog: add a `canonical_index_file` attribute on inner revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51106
diff
changeset
|
446 @property |
|
af96fbb8f739
revlog: add a `canonical_index_file` attribute on inner revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51106
diff
changeset
|
447 def canonical_index_file(self): |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
448 if self._orig_index_file is not None: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
449 return self._orig_index_file |
|
51109
af96fbb8f739
revlog: add a `canonical_index_file` attribute on inner revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51106
diff
changeset
|
450 return self.index_file |
|
af96fbb8f739
revlog: add a `canonical_index_file` attribute on inner revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51106
diff
changeset
|
451 |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
452 @property |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
453 def is_delaying(self): |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
454 """is the revlog is currently delaying the visibility of written data? |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
455 |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
456 The delaying mechanism can be either in-memory or written on disk in a |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
457 side-file.""" |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
458 return (self._delay_buffer is not None) or ( |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
459 self._orig_index_file is not None |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
460 ) |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
461 |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
462 # Derived from index values. |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
463 |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
464 def start(self, rev): |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
465 """the offset of the data chunk for this revision""" |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
466 return int(self.index[rev][0] >> 16) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
467 |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
468 def length(self, rev): |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
469 """the length of the data chunk for this revision""" |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
470 return self.index[rev][1] |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
471 |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
472 def end(self, rev): |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
473 """the end of the data chunk for this revision""" |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
474 return self.start(rev) + self.length(rev) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
475 |
|
51097
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
476 def deltaparent(self, rev): |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
477 """return deltaparent of the given revision""" |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
478 base = self.index[rev][3] |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
479 if base == rev: |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
480 return nullrev |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
481 elif self.delta_config.general_delta: |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
482 return base |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
483 else: |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
484 return rev - 1 |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
485 |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
486 def issnapshot(self, rev): |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
487 """tells whether rev is a snapshot""" |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
488 if not self.delta_config.sparse_revlog: |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
489 return self.deltaparent(rev) == nullrev |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
490 elif hasattr(self.index, 'issnapshot'): |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
491 # directly assign the method to cache the testing and access |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
492 self.issnapshot = self.index.issnapshot |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
493 return self.issnapshot(rev) |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
494 if rev == nullrev: |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
495 return True |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
496 entry = self.index[rev] |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
497 base = entry[3] |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
498 if base == rev: |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
499 return True |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
500 if base == nullrev: |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
501 return True |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
502 p1 = entry[5] |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
503 while self.length(p1) == 0: |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
504 b = self.deltaparent(p1) |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
505 if b == p1: |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
506 break |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
507 p1 = b |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
508 p2 = entry[6] |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
509 while self.length(p2) == 0: |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
510 b = self.deltaparent(p2) |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
511 if b == p2: |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
512 break |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
513 p2 = b |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
514 if base == p1 or base == p2: |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
515 return False |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
516 return self.issnapshot(base) |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
517 |
|
51099
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
518 def _deltachain(self, rev, stoprev=None): |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
519 """Obtain the delta chain for a revision. |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
520 |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
521 ``stoprev`` specifies a revision to stop at. If not specified, we |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
522 stop at the base of the chain. |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
523 |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
524 Returns a 2-tuple of (chain, stopped) where ``chain`` is a list of |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
525 revs in ascending order and ``stopped`` is a bool indicating whether |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
526 ``stoprev`` was hit. |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
527 """ |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
528 # Try C implementation. |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
529 try: |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
530 return self.index.deltachain( |
|
52896
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
531 rev, stoprev |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
532 ) # pytype: disable=attribute-error |
|
51099
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
533 except AttributeError: |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
534 pass |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
535 |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
536 chain = [] |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
537 |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
538 # Alias to prevent attribute lookup in tight loop. |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
539 index = self.index |
|
52896
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
540 generaldelta = self.delta_config.general_delta |
|
51099
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
541 |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
542 iterrev = rev |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
543 e = index[iterrev] |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
544 while iterrev != e[3] and iterrev != stoprev: |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
545 chain.append(iterrev) |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
546 if generaldelta: |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
547 iterrev = e[3] |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
548 else: |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
549 iterrev -= 1 |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
550 e = index[iterrev] |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
551 |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
552 if iterrev == stoprev: |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
553 stopped = True |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
554 else: |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
555 chain.append(iterrev) |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
556 stopped = False |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
557 |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
558 chain.reverse() |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
559 return chain, stopped |
|
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
560 |
|
51095
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
561 @util.propertycache |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
562 def _compressor(self): |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
563 engine = util.compengines[self.feature_config.compression_engine] |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
564 return engine.revlogcompressor( |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
565 self.feature_config.compression_engine_options |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
566 ) |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
567 |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
568 @util.propertycache |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
569 def _decompressor(self): |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
570 """the default decompressor""" |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
571 if self._default_compression_header is None: |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
572 return None |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
573 t = self._default_compression_header |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
574 c = self._get_decompressor(t) |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
575 return c.decompress |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
576 |
|
51737
df6ce326936f
typing: add a few type hints to `mercurial/revlog.py`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51650
diff
changeset
|
577 def _get_decompressor(self, t: bytes): |
|
51095
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
578 try: |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
579 compressor = self._decompressors[t] |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
580 except KeyError: |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
581 try: |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
582 engine = util.compengines.forrevlogheader(t) |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
583 compressor = engine.revlogcompressor( |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
584 self.feature_config.compression_engine_options |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
585 ) |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
586 self._decompressors[t] = compressor |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
587 except KeyError: |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
588 raise error.RevlogError( |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
589 _(b'unknown compression type %s') % binascii.hexlify(t) |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
590 ) |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
591 return compressor |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
592 |
|
51737
df6ce326936f
typing: add a few type hints to `mercurial/revlog.py`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51650
diff
changeset
|
593 def compress(self, data: bytes) -> Tuple[bytes, bytes]: |
|
51095
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
594 """Generate a possibly-compressed representation of data.""" |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
595 if not data: |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
596 return b'', data |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
597 |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
598 compressed = self._compressor.compress(data) |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
599 |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
600 if compressed: |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
601 # The revlog compressor added the header in the returned data. |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
602 return b'', compressed |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
603 |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
604 if data[0:1] == b'\0': |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
605 return b'', data |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
606 return b'u', data |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
607 |
|
51737
df6ce326936f
typing: add a few type hints to `mercurial/revlog.py`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51650
diff
changeset
|
608 def decompress(self, data: bytes): |
|
51095
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
609 """Decompress a revlog chunk. |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
610 |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
611 The chunk is expected to begin with a header identifying the |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
612 format type so it can be routed to an appropriate decompressor. |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
613 """ |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
614 if not data: |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
615 return data |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
616 |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
617 # Revlogs are read much more frequently than they are written and many |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
618 # chunks only take microseconds to decompress, so performance is |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
619 # important here. |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
620 # |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
621 # We can make a few assumptions about revlogs: |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
622 # |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
623 # 1) the majority of chunks will be compressed (as opposed to inline |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
624 # raw data). |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
625 # 2) decompressing *any* data will likely by at least 10x slower than |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
626 # returning raw inline data. |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
627 # 3) we want to prioritize common and officially supported compression |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
628 # engines |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
629 # |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
630 # It follows that we want to optimize for "decompress compressed data |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
631 # when encoded with common and officially supported compression engines" |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
632 # case over "raw data" and "data encoded by less common or non-official |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
633 # compression engines." That is why we have the inline lookup first |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
634 # followed by the compengines lookup. |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
635 # |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
636 # According to `hg perfrevlogchunks`, this is ~0.5% faster for zlib |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
637 # compressed chunks. And this matters for changelog and manifest reads. |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
638 t = data[0:1] |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
639 |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
640 if t == b'x': |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
641 try: |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
642 return _zlibdecompress(data) |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
643 except zlib.error as e: |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
644 raise error.RevlogError( |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
645 _(b'revlog decompress error: %s') |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
646 % stringutil.forcebytestr(e) |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
647 ) |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
648 # '\0' is more common than 'u' so it goes first. |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
649 elif t == b'\0': |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
650 return data |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
651 elif t == b'u': |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
652 return util.buffer(data, 1) |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
653 |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
654 compressor = self._get_decompressor(t) |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
655 |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
656 return compressor.decompress(data) |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
657 |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
658 @contextlib.contextmanager |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
659 def reading(self): |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
660 """Context manager that keeps data and sidedata files open for reading""" |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
661 if len(self.index) == 0: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
662 yield # nothing to be read |
|
51203
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
663 elif self._delay_buffer is not None and self.inline: |
|
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
664 msg = "revlog with delayed write should not be inline" |
|
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
665 raise error.ProgrammingError(msg) |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
666 else: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
667 with self._segmentfile.reading(): |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
668 with self._segmentfile_sidedata.reading(): |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
669 yield |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
670 |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
671 @property |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
672 def is_writing(self): |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
673 """True is a writing context is open""" |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
674 return self._writinghandles is not None |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
675 |
|
51106
594f912818ab
changelog-delay: adds some check around delaying and diverting write
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51105
diff
changeset
|
676 @property |
|
594f912818ab
changelog-delay: adds some check around delaying and diverting write
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51105
diff
changeset
|
677 def is_open(self): |
|
594f912818ab
changelog-delay: adds some check around delaying and diverting write
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51105
diff
changeset
|
678 """True if any file handle is being held |
|
594f912818ab
changelog-delay: adds some check around delaying and diverting write
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51105
diff
changeset
|
679 |
|
594f912818ab
changelog-delay: adds some check around delaying and diverting write
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51105
diff
changeset
|
680 Used for assert and debug in the python code""" |
|
594f912818ab
changelog-delay: adds some check around delaying and diverting write
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51105
diff
changeset
|
681 return self._segmentfile.is_open or self._segmentfile_sidedata.is_open |
|
594f912818ab
changelog-delay: adds some check around delaying and diverting write
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51105
diff
changeset
|
682 |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
683 @contextlib.contextmanager |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
684 def writing(self, transaction, data_end=None, sidedata_end=None): |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
685 """Open the revlog files for writing |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
686 |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
687 Add content to a revlog should be done within such context. |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
688 """ |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
689 if self.is_writing: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
690 yield |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
691 else: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
692 ifh = dfh = sdfh = None |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
693 try: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
694 r = len(self.index) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
695 # opening the data file. |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
696 dsize = 0 |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
697 if r: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
698 dsize = self.end(r - 1) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
699 dfh = None |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
700 if not self.inline: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
701 try: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
702 dfh = self.opener(self.data_file, mode=b"r+") |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
703 if data_end is None: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
704 dfh.seek(0, os.SEEK_END) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
705 else: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
706 dfh.seek(data_end, os.SEEK_SET) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
707 except FileNotFoundError: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
708 dfh = self.opener(self.data_file, mode=b"w+") |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
709 transaction.add(self.data_file, dsize) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
710 if self.sidedata_file is not None: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
711 assert sidedata_end is not None |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
712 # revlog-v2 does not inline, help Pytype |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
713 assert dfh is not None |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
714 try: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
715 sdfh = self.opener(self.sidedata_file, mode=b"r+") |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
716 dfh.seek(sidedata_end, os.SEEK_SET) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
717 except FileNotFoundError: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
718 sdfh = self.opener(self.sidedata_file, mode=b"w+") |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
719 transaction.add(self.sidedata_file, sidedata_end) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
720 |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
721 # opening the index file. |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
722 isize = r * self.index.entry_size |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
723 ifh = self.__index_write_fp() |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
724 if self.inline: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
725 transaction.add(self.index_file, dsize + isize) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
726 else: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
727 transaction.add(self.index_file, isize) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
728 # exposing all file handle for writing. |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
729 self._writinghandles = (ifh, dfh, sdfh) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
730 self._segmentfile.writing_handle = ifh if self.inline else dfh |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
731 self._segmentfile_sidedata.writing_handle = sdfh |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
732 yield |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
733 finally: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
734 self._writinghandles = None |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
735 self._segmentfile.writing_handle = None |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
736 self._segmentfile_sidedata.writing_handle = None |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
737 if dfh is not None: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
738 dfh.close() |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
739 if sdfh is not None: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
740 sdfh.close() |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
741 # closing the index file last to avoid exposing referent to |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
742 # potential unflushed data content. |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
743 if ifh is not None: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
744 ifh.close() |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
745 |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
746 def __index_write_fp(self, index_end=None): |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
747 """internal method to open the index file for writing |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
748 |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
749 You should not use this directly and use `_writing` instead |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
750 """ |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
751 try: |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
752 if self._delay_buffer is None: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
753 f = self.opener( |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
754 self.index_file, |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
755 mode=b"r+", |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
756 checkambig=self.data_config.check_ambig, |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
757 ) |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
758 else: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
759 # check_ambig affect we way we open file for writing, however |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
760 # here, we do not actually open a file for writting as write |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
761 # will appened to a delay_buffer. So check_ambig is not |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
762 # meaningful and unneeded here. |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
763 f = randomaccessfile.appender( |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
764 self.opener, self.index_file, b"r+", self._delay_buffer |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
765 ) |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
766 if index_end is None: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
767 f.seek(0, os.SEEK_END) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
768 else: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
769 f.seek(index_end, os.SEEK_SET) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
770 return f |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
771 except FileNotFoundError: |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
772 if self._delay_buffer is None: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
773 return self.opener( |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
774 self.index_file, |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
775 mode=b"w+", |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
776 checkambig=self.data_config.check_ambig, |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
777 ) |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
778 else: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
779 return randomaccessfile.appender( |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
780 self.opener, self.index_file, b"w+", self._delay_buffer |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
781 ) |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
782 |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
783 def __index_new_fp(self): |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
784 """internal method to create a new index file for writing |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
785 |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
786 You should not use this unless you are upgrading from inline revlog |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
787 """ |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
788 return self.opener( |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
789 self.index_file, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
790 mode=b"w", |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
791 checkambig=self.data_config.check_ambig, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
792 ) |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
793 |
|
51094
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
794 def split_inline(self, tr, header, new_index_file_path=None): |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
795 """split the data of an inline revlog into an index and a data file""" |
|
51141
962974a5d068
revlog: add one more assert about state of thing when splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51139
diff
changeset
|
796 assert self._delay_buffer is None |
|
51094
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
797 existing_handles = False |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
798 if self._writinghandles is not None: |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
799 existing_handles = True |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
800 fp = self._writinghandles[0] |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
801 fp.flush() |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
802 fp.close() |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
803 # We can't use the cached file handle after close(). So prevent |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
804 # its usage. |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
805 self._writinghandles = None |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
806 self._segmentfile.writing_handle = None |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
807 # No need to deal with sidedata writing handle as it is only |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
808 # relevant with revlog-v2 which is never inline, not reaching |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
809 # this code |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
810 |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
811 new_dfh = self.opener(self.data_file, mode=b"w+") |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
812 new_dfh.truncate(0) # drop any potentially existing data |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
813 try: |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
814 with self.reading(): |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
815 for r in range(len(self.index)): |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
816 new_dfh.write(self.get_segment_for_revs(r, r)[1]) |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
817 new_dfh.flush() |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
818 |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
819 if new_index_file_path is not None: |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
820 self.index_file = new_index_file_path |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
821 with self.__index_new_fp() as fp: |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
822 self.inline = False |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
823 for i in range(len(self.index)): |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
824 e = self.index.entry_binary(i) |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
825 if i == 0: |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
826 packed_header = self.index.pack_header(header) |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
827 e = packed_header + e |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
828 fp.write(e) |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
829 |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
830 # If we don't use side-write, the temp file replace the real |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
831 # index when we exit the context manager |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
832 |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
833 self._segmentfile = randomaccessfile.randomaccessfile( |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
834 self.opener, |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
835 self.data_file, |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
836 self.data_config.chunk_cache_size, |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
837 ) |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
838 |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
839 if existing_handles: |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
840 # switched from inline to conventional reopen the index |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
841 ifh = self.__index_write_fp() |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
842 self._writinghandles = (ifh, new_dfh, None) |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
843 self._segmentfile.writing_handle = new_dfh |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
844 new_dfh = None |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
845 # No need to deal with sidedata writing handle as it is only |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
846 # relevant with revlog-v2 which is never inline, not reaching |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
847 # this code |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
848 finally: |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
849 if new_dfh is not None: |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
850 new_dfh.close() |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
851 return self.index_file |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
852 |
|
51091
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
853 def get_segment_for_revs(self, startrev, endrev): |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
854 """Obtain a segment of raw data corresponding to a range of revisions. |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
855 |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
856 Accepts the start and end revisions and an optional already-open |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
857 file handle to be used for reading. If the file handle is read, its |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
858 seek position will not be preserved. |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
859 |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
860 Requests for data may be satisfied by a cache. |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
861 |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
862 Returns a 2-tuple of (offset, data) for the requested range of |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
863 revisions. Offset is the integer offset from the beginning of the |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
864 revlog and data is a str or buffer of the raw byte data. |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
865 |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
866 Callers will need to call ``self.start(rev)`` and ``self.length(rev)`` |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
867 to determine where each revision's data begins and ends. |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
868 |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
869 API: we should consider making this a private part of the InnerRevlog |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
870 at some point. |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
871 """ |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
872 # Inlined self.start(startrev) & self.end(endrev) for perf reasons |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
873 # (functions are expensive). |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
874 index = self.index |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
875 istart = index[startrev] |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
876 start = int(istart[0] >> 16) |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
877 if startrev == endrev: |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
878 end = start + istart[1] |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
879 else: |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
880 iend = index[endrev] |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
881 end = int(iend[0] >> 16) + iend[1] |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
882 |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
883 if self.inline: |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
884 start += (startrev + 1) * self.index.entry_size |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
885 end += (endrev + 1) * self.index.entry_size |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
886 length = end - start |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
887 |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
888 return start, self._segmentfile.read_chunk(start, length) |
|
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
889 |
|
51096
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
890 def _chunk(self, rev): |
|
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
891 """Obtain a single decompressed chunk for a revision. |
|
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
892 |
|
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
893 Accepts an integer revision and an optional already-open file handle |
|
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
894 to be used for reading. If used, the seek position of the file will not |
|
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
895 be preserved. |
|
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
896 |
|
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
897 Returns a str holding uncompressed data for the requested revision. |
|
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
898 """ |
|
51112
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
899 if self._uncompressed_chunk_cache is not None: |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
900 uncomp = self._uncompressed_chunk_cache.get(rev) |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
901 if uncomp is not None: |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
902 return uncomp |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
903 |
|
51096
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
904 compression_mode = self.index[rev][10] |
|
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
905 data = self.get_segment_for_revs(rev, rev)[1] |
|
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
906 if compression_mode == COMP_MODE_PLAIN: |
|
51112
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
907 uncomp = data |
|
51096
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
908 elif compression_mode == COMP_MODE_DEFAULT: |
|
51112
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
909 uncomp = self._decompressor(data) |
|
51096
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
910 elif compression_mode == COMP_MODE_INLINE: |
|
51112
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
911 uncomp = self.decompress(data) |
|
51096
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
912 else: |
|
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
913 msg = b'unknown compression mode %d' |
|
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
914 msg %= compression_mode |
|
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
915 raise error.RevlogError(msg) |
|
51112
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
916 if self._uncompressed_chunk_cache is not None: |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
917 self._uncompressed_chunk_cache.insert(rev, uncomp, cost=len(uncomp)) |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
918 return uncomp |
|
51096
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
919 |
|
51098
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
920 def _chunks(self, revs, targetsize=None): |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
921 """Obtain decompressed chunks for the specified revisions. |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
922 |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
923 Accepts an iterable of numeric revisions that are assumed to be in |
|
51893
eb9dea148233
revlog: cleanup some outdated docstrings
Rapha?l Gom?s <rgomes@octobus.net>
parents:
51868
diff
changeset
|
924 ascending order. |
|
51098
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
925 |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
926 This function is similar to calling ``self._chunk()`` multiple times, |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
927 but is faster. |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
928 |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
929 Returns a list with decompressed data for each requested revision. |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
930 """ |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
931 if not revs: |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
932 return [] |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
933 start = self.start |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
934 length = self.length |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
935 inline = self.inline |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
936 iosize = self.index.entry_size |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
937 buffer = util.buffer |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
938 |
|
51112
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
939 fetched_revs = [] |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
940 fadd = fetched_revs.append |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
941 |
|
51111
c2d2e5b65def
revlog: minor refactor in the chunk gather process
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51110
diff
changeset
|
942 chunks = [] |
|
c2d2e5b65def
revlog: minor refactor in the chunk gather process
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51110
diff
changeset
|
943 ladd = chunks.append |
|
51098
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
944 |
|
51112
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
945 if self._uncompressed_chunk_cache is None: |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
946 fetched_revs = revs |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
947 else: |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
948 for rev in revs: |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
949 cached_value = self._uncompressed_chunk_cache.get(rev) |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
950 if cached_value is None: |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
951 fadd(rev) |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
952 else: |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
953 ladd((rev, cached_value)) |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
954 |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
955 if not fetched_revs: |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
956 slicedchunks = () |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
957 elif not self.data_config.with_sparse_read: |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
958 slicedchunks = (fetched_revs,) |
|
51098
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
959 else: |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
960 slicedchunks = deltautil.slicechunk( |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
961 self, |
|
51112
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
962 fetched_revs, |
|
51098
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
963 targetsize=targetsize, |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
964 ) |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
965 |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
966 for revschunk in slicedchunks: |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
967 firstrev = revschunk[0] |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
968 # Skip trailing revisions with empty diff |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
969 for lastrev in revschunk[::-1]: |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
970 if length(lastrev) != 0: |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
971 break |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
972 |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
973 try: |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
974 offset, data = self.get_segment_for_revs(firstrev, lastrev) |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
975 except OverflowError: |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
976 # issue4215 - we can't cache a run of chunks greater than |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
977 # 2G on Windows |
|
51111
c2d2e5b65def
revlog: minor refactor in the chunk gather process
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51110
diff
changeset
|
978 for rev in revschunk: |
|
c2d2e5b65def
revlog: minor refactor in the chunk gather process
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51110
diff
changeset
|
979 ladd((rev, self._chunk(rev))) |
|
51098
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
980 |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
981 decomp = self.decompress |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
982 # self._decompressor might be None, but will not be used in that case |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
983 def_decomp = self._decompressor |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
984 for rev in revschunk: |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
985 chunkstart = start(rev) |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
986 if inline: |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
987 chunkstart += (rev + 1) * iosize |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
988 chunklength = length(rev) |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
989 comp_mode = self.index[rev][10] |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
990 c = buffer(data, chunkstart - offset, chunklength) |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
991 if comp_mode == COMP_MODE_PLAIN: |
|
51111
c2d2e5b65def
revlog: minor refactor in the chunk gather process
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51110
diff
changeset
|
992 c = c |
|
51098
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
993 elif comp_mode == COMP_MODE_INLINE: |
|
51111
c2d2e5b65def
revlog: minor refactor in the chunk gather process
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51110
diff
changeset
|
994 c = decomp(c) |
|
51098
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
995 elif comp_mode == COMP_MODE_DEFAULT: |
|
51111
c2d2e5b65def
revlog: minor refactor in the chunk gather process
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51110
diff
changeset
|
996 c = def_decomp(c) |
|
51098
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
997 else: |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
998 msg = b'unknown compression mode %d' |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
999 msg %= comp_mode |
|
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
1000 raise error.RevlogError(msg) |
|
51111
c2d2e5b65def
revlog: minor refactor in the chunk gather process
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51110
diff
changeset
|
1001 ladd((rev, c)) |
|
51112
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
1002 if self._uncompressed_chunk_cache is not None: |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
1003 self._uncompressed_chunk_cache.insert(rev, c, len(c)) |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
1004 |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
1005 chunks.sort() |
|
51111
c2d2e5b65def
revlog: minor refactor in the chunk gather process
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51110
diff
changeset
|
1006 return [x[1] for x in chunks] |
|
51098
e8ad6d8de8b8
revlog: move the `_chunks` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51097
diff
changeset
|
1007 |
|
51898
8c39ba94acce
typing: explicitly set the return type of `_InnerRevLog.raw_text()`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51896
diff
changeset
|
1008 def raw_text(self, node, rev) -> bytes: |
|
51101
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1009 """return the possibly unvalidated rawtext for a revision |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1010 |
|
51894
384016e91947
revlog: simplify rawtext return value
Rapha?l Gom?s <rgomes@octobus.net>
parents:
51893
diff
changeset
|
1011 returns rawtext |
|
51101
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1012 """ |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1013 |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1014 # revision in the cache (could be useful to apply delta) |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1015 cachedrev = None |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1016 # An intermediate text to apply deltas to |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1017 basetext = None |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1018 |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1019 # Check if we have the entry in cache |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1020 # The cache entry looks like (node, rev, rawtext) |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1021 if self._revisioncache: |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1022 cachedrev = self._revisioncache[1] |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1023 |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1024 chain, stopped = self._deltachain(rev, stoprev=cachedrev) |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1025 if stopped: |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1026 basetext = self._revisioncache[2] |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1027 |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1028 # drop cache to save memory, the caller is expected to |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1029 # update self._inner._revisioncache after validating the text |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1030 self._revisioncache = None |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1031 |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1032 targetsize = None |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1033 rawsize = self.index[rev][2] |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1034 if 0 <= rawsize: |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1035 targetsize = 4 * rawsize |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1036 |
|
51112
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
1037 if self._uncompressed_chunk_cache is not None: |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
1038 # dynamically update the uncompressed_chunk_cache size to the |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
1039 # largest revision we saw in this revlog. |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
1040 factor = self.data_config.uncompressed_cache_factor |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
1041 candidate_size = rawsize * factor |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
1042 if candidate_size > self._uncompressed_chunk_cache.maxcost: |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
1043 self._uncompressed_chunk_cache.maxcost = candidate_size |
|
0250e45040f1
revlog: add a small cache of unfiltered chunk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51111
diff
changeset
|
1044 |
|
51101
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1045 bins = self._chunks(chain, targetsize=targetsize) |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1046 if basetext is None: |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1047 basetext = bytes(bins[0]) |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1048 bins = bins[1:] |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1049 |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1050 rawtext = mdiff.patches(basetext, bins) |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1051 del basetext # let us have a chance to free memory early |
|
51894
384016e91947
revlog: simplify rawtext return value
Rapha?l Gom?s <rgomes@octobus.net>
parents:
51893
diff
changeset
|
1052 return rawtext |
|
51101
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
1053 |
|
51102
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1054 def sidedata(self, rev, sidedata_end): |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1055 """Return the sidedata for a given revision number.""" |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1056 index_entry = self.index[rev] |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1057 sidedata_offset = index_entry[8] |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1058 sidedata_size = index_entry[9] |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1059 |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1060 if self.inline: |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1061 sidedata_offset += self.index.entry_size * (1 + rev) |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1062 if sidedata_size == 0: |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1063 return {} |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1064 |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1065 if sidedata_end < sidedata_offset + sidedata_size: |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1066 filename = self.sidedata_file |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1067 end = sidedata_end |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1068 offset = sidedata_offset |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1069 length = sidedata_size |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1070 m = FILE_TOO_SHORT_MSG % (filename, length, offset, end) |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1071 raise error.RevlogError(m) |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1072 |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1073 comp_segment = self._segmentfile_sidedata.read_chunk( |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1074 sidedata_offset, sidedata_size |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1075 ) |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1076 |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1077 comp = self.index[rev][11] |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1078 if comp == COMP_MODE_PLAIN: |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1079 segment = comp_segment |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1080 elif comp == COMP_MODE_DEFAULT: |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1081 segment = self._decompressor(comp_segment) |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1082 elif comp == COMP_MODE_INLINE: |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1083 segment = self.decompress(comp_segment) |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1084 else: |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1085 msg = b'unknown compression mode %d' |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1086 msg %= comp |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1087 raise error.RevlogError(msg) |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1088 |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1089 sidedata = sidedatautil.deserialize_sidedata(segment) |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1090 return sidedata |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
1091 |
|
51103
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1092 def write_entry( |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1093 self, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1094 transaction, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1095 entry, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1096 data, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1097 link, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1098 offset, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1099 sidedata, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1100 sidedata_offset, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1101 index_end, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1102 data_end, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1103 sidedata_end, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1104 ): |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1105 # Files opened in a+ mode have inconsistent behavior on various |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1106 # platforms. Windows requires that a file positioning call be made |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1107 # when the file handle transitions between reads and writes. See |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1108 # 3686fa2b8eee and the mixedfilemodewrapper in windows.py. On other |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1109 # platforms, Python or the platform itself can be buggy. Some versions |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1110 # of Solaris have been observed to not append at the end of the file |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1111 # if the file was seeked to before the end. See issue4943 for more. |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1112 # |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1113 # We work around this issue by inserting a seek() before writing. |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1114 # Note: This is likely not necessary on Python 3. However, because |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1115 # the file handle is reused for reads and may be seeked there, we need |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1116 # to be careful before changing this. |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1117 if self._writinghandles is None: |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1118 msg = b'adding revision outside `revlog._writing` context' |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1119 raise error.ProgrammingError(msg) |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1120 ifh, dfh, sdfh = self._writinghandles |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1121 if index_end is None: |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1122 ifh.seek(0, os.SEEK_END) |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1123 else: |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1124 ifh.seek(index_end, os.SEEK_SET) |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1125 if dfh: |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1126 if data_end is None: |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1127 dfh.seek(0, os.SEEK_END) |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1128 else: |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1129 dfh.seek(data_end, os.SEEK_SET) |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1130 if sdfh: |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1131 sdfh.seek(sidedata_end, os.SEEK_SET) |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1132 |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1133 curr = len(self.index) - 1 |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1134 if not self.inline: |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1135 transaction.add(self.data_file, offset) |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1136 if self.sidedata_file: |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1137 transaction.add(self.sidedata_file, sidedata_offset) |
|
51109
af96fbb8f739
revlog: add a `canonical_index_file` attribute on inner revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51106
diff
changeset
|
1138 transaction.add(self.canonical_index_file, curr * len(entry)) |
|
51103
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1139 if data[0]: |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1140 dfh.write(data[0]) |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1141 dfh.write(data[1]) |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1142 if sidedata: |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1143 sdfh.write(sidedata) |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1144 if self._delay_buffer is None: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1145 ifh.write(entry) |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1146 else: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1147 self._delay_buffer.append(entry) |
|
51203
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1148 elif self._delay_buffer is not None: |
|
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1149 msg = b'invalid delayed write on inline revlog' |
|
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1150 raise error.ProgrammingError(msg) |
|
51103
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1151 else: |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1152 offset += curr * self.index.entry_size |
|
51109
af96fbb8f739
revlog: add a `canonical_index_file` attribute on inner revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51106
diff
changeset
|
1153 transaction.add(self.canonical_index_file, offset) |
|
51103
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1154 assert not sidedata |
|
51203
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1155 ifh.write(entry) |
|
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1156 ifh.write(data[0]) |
|
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1157 ifh.write(data[1]) |
|
51103
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1158 return ( |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1159 ifh.tell(), |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1160 dfh.tell() if dfh else None, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1161 sdfh.tell() if sdfh else None, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1162 ) |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
1163 |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1164 def _divert_index(self): |
|
51506
1721d983dd6d
inline-changelog: fix pending transaction visibility when splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51505
diff
changeset
|
1165 index_file = self.index_file |
|
1721d983dd6d
inline-changelog: fix pending transaction visibility when splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51505
diff
changeset
|
1166 # when we encounter a legacy inline-changelog, split it. However it is |
|
1721d983dd6d
inline-changelog: fix pending transaction visibility when splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51505
diff
changeset
|
1167 # important to use the expected filename for pending content |
|
1721d983dd6d
inline-changelog: fix pending transaction visibility when splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51505
diff
changeset
|
1168 # (<radix>.a) otherwise hooks won't be seeing the content of the |
|
1721d983dd6d
inline-changelog: fix pending transaction visibility when splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51505
diff
changeset
|
1169 # pending transaction. |
|
1721d983dd6d
inline-changelog: fix pending transaction visibility when splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51505
diff
changeset
|
1170 if index_file.endswith(b'.s'): |
|
1721d983dd6d
inline-changelog: fix pending transaction visibility when splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51505
diff
changeset
|
1171 index_file = self.index_file[:-2] |
|
1721d983dd6d
inline-changelog: fix pending transaction visibility when splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51505
diff
changeset
|
1172 return index_file + b'.a' |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1173 |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1174 def delay(self): |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1175 assert not self.is_open |
|
51203
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1176 if self.inline: |
|
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1177 msg = "revlog with delayed write should not be inline" |
|
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1178 raise error.ProgrammingError(msg) |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1179 if self._delay_buffer is not None or self._orig_index_file is not None: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1180 # delay or divert already in place |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1181 return None |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1182 elif len(self.index) == 0: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1183 self._orig_index_file = self.index_file |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1184 self.index_file = self._divert_index() |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1185 assert self._orig_index_file is not None |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1186 assert self.index_file is not None |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1187 if self.opener.exists(self.index_file): |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1188 self.opener.unlink(self.index_file) |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1189 return self.index_file |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1190 else: |
|
51142
66417f55ea33
revlog: avoid exposing delayed index entry too widely in non-inline revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51141
diff
changeset
|
1191 self._delay_buffer = [] |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1192 return None |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1193 |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1194 def write_pending(self): |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1195 assert not self.is_open |
|
51203
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1196 if self.inline: |
|
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1197 msg = "revlog with delayed write should not be inline" |
|
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1198 raise error.ProgrammingError(msg) |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1199 if self._orig_index_file is not None: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1200 return None, True |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1201 any_pending = False |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1202 pending_index_file = self._divert_index() |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1203 if self.opener.exists(pending_index_file): |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1204 self.opener.unlink(pending_index_file) |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1205 util.copyfile( |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1206 self.opener.join(self.index_file), |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1207 self.opener.join(pending_index_file), |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1208 ) |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1209 if self._delay_buffer: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1210 with self.opener(pending_index_file, b'r+') as ifh: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1211 ifh.seek(0, os.SEEK_END) |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1212 ifh.write(b"".join(self._delay_buffer)) |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1213 any_pending = True |
|
51142
66417f55ea33
revlog: avoid exposing delayed index entry too widely in non-inline revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51141
diff
changeset
|
1214 self._delay_buffer = None |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1215 self._orig_index_file = self.index_file |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1216 self.index_file = pending_index_file |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1217 return self.index_file, any_pending |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1218 |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1219 def finalize_pending(self): |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1220 assert not self.is_open |
|
51203
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1221 if self.inline: |
|
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1222 msg = "revlog with delayed write should not be inline" |
|
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1223 raise error.ProgrammingError(msg) |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1224 |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1225 delay = self._delay_buffer is not None |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1226 divert = self._orig_index_file is not None |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1227 |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1228 if delay and divert: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1229 assert False, "unreachable" |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1230 elif delay: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1231 if self._delay_buffer: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1232 with self.opener(self.index_file, b'r+') as ifh: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1233 ifh.seek(0, os.SEEK_END) |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1234 ifh.write(b"".join(self._delay_buffer)) |
|
51203
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
1235 self._delay_buffer = None |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1236 elif divert: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1237 if self.opener.exists(self.index_file): |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1238 self.opener.rename( |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1239 self.index_file, |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1240 self._orig_index_file, |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1241 checkambig=True, |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1242 ) |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1243 self.index_file = self._orig_index_file |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1244 self._orig_index_file = None |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1245 else: |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1246 msg = b"not delay or divert found on this revlog" |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1247 raise error.ProgrammingError(msg) |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1248 return self.canonical_index_file |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
1249 |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
1250 |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1251 if typing.TYPE_CHECKING: |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1252 # Tell Pytype what kind of object we expect |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1253 ProxyBase = BaseIndexObject |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1254 else: |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1255 ProxyBase = object |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1256 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1257 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1258 class RustIndexProxy(ProxyBase): |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1259 """Wrapper around the Rust index to fake having direct access to the index. |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1260 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1261 Rust enforces xor mutability (one mutable reference XOR 1..n non-mutable), |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1262 so we can't expose the index from Rust directly, since the `InnerRevlog` |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1263 already has ownership of the index. This object redirects all calls to the |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1264 index through the Rust-backed `InnerRevlog` glue which defines all |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1265 necessary forwarding methods. |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1266 """ |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1267 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1268 def __init__(self, inner): |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1269 # Do not rename as it's being used to access the index from Rust |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1270 self.inner = inner |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1271 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1272 # TODO possibly write all index methods manually to save on overhead? |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1273 def __getattr__(self, name): |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1274 return getattr(self.inner, f"_index_{name}") |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1275 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1276 # Magic methods need to be defined explicitely |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1277 def __len__(self): |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1278 return self.inner._index___len__() |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1279 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1280 def __getitem__(self, key): |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1281 return self.inner._index___getitem__(key) |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1282 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1283 def __contains__(self, key): |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1284 return self.inner._index___contains__(key) |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1285 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1286 def __delitem__(self, key): |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1287 return self.inner._index___delitem__(key) |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1288 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1289 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1290 class RustVFSWrapper: |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1291 """Used to wrap a Python VFS to pass it to Rust to lower the overhead of |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1292 calling back multiple times into Python. |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1293 """ |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1294 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1295 def __init__(self, inner): |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1296 self.inner = inner |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1297 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1298 def __call__( |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1299 self, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1300 path: bytes, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1301 mode: bytes = b"rb", |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1302 atomictemp=False, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1303 checkambig=False, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1304 ): |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1305 fd = self.inner.__call__( |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1306 path=path, mode=mode, atomictemp=atomictemp, checkambig=checkambig |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1307 ) |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1308 # Information that Rust needs to get ownership of the file that's |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1309 # being opened. |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1310 return (os.dup(fd.fileno()), fd._tempname if atomictemp else None) |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1311 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1312 def __getattr__(self, name): |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1313 return getattr(self.inner, name) |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1314 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1315 |
|
49037
642e31cb55f0
py3: use class X: instead of class X(object):
Gregory Szorc <gregory.szorc@gmail.com>
parents:
49019
diff
changeset
|
1316 class revlog: |
| 1083 | 1317 """ |
| 1318 the underlying revision storage object | |
| 1319 | |
| 1320 A revlog consists of two parts, an index and the revision data. | |
| 1321 | |
| 1322 The index is a file with a fixed record size containing | |
| 6912 | 1323 information on each revision, including its nodeid (hash), the |
| 1083 | 1324 nodeids of its parents, the position and offset of its data within |
| 1325 the data file, and the revision it's based on. Finally, each entry | |
| 1326 contains a linkrev entry that can serve as a pointer to external | |
| 1327 data. | |
| 1328 | |
| 1329 The revision data itself is a linear collection of data chunks. | |
| 1330 Each chunk represents a revision and is usually represented as a | |
| 1331 delta against the previous chunk. To bound lookup time, runs of | |
| 1332 deltas are limited to about 2 times the length of the original | |
| 1333 version data. This makes retrieval of a version proportional to | |
| 1334 its size, or O(1) relative to the number of revisions. | |
| 1335 | |
| 1336 Both pieces of the revlog are written to in an append-only | |
| 1337 fashion, which means we never need to rewrite a file to insert or | |
| 1338 remove data, and can use some simple techniques to avoid the need | |
| 1339 for locking while reading. | |
|
30001
b5e5ddf48bd2
revlog: specify checkambig at writing to avoid file stat ambiguity
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29841
diff
changeset
|
1340 |
|
b5e5ddf48bd2
revlog: specify checkambig at writing to avoid file stat ambiguity
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29841
diff
changeset
|
1341 If checkambig, indexfile is opened with checkambig=True at |
|
b5e5ddf48bd2
revlog: specify checkambig at writing to avoid file stat ambiguity
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29841
diff
changeset
|
1342 writing, to avoid file stat ambiguity. |
|
34303
3c9691728237
revlog: add option to mmap revlog index
Mark Thomas <mbthomas@fb.com>
parents:
34298
diff
changeset
|
1343 |
|
3c9691728237
revlog: add option to mmap revlog index
Mark Thomas <mbthomas@fb.com>
parents:
34298
diff
changeset
|
1344 If mmaplargeindex is True, and an mmapindexthreshold is set, the |
|
3c9691728237
revlog: add option to mmap revlog index
Mark Thomas <mbthomas@fb.com>
parents:
34298
diff
changeset
|
1345 index will be mmapped rather than read if it is larger than the |
|
3c9691728237
revlog: add option to mmap revlog index
Mark Thomas <mbthomas@fb.com>
parents:
34298
diff
changeset
|
1346 configured threshold. |
|
37443
65250a66b55c
revlog: move censor logic into main revlog class
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37442
diff
changeset
|
1347 |
|
65250a66b55c
revlog: move censor logic into main revlog class
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37442
diff
changeset
|
1348 If censorable is True, the revlog can have censored revisions. |
|
42478
bc4373babd04
revlog: add the option to track the expected compression upper bound
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42468
diff
changeset
|
1349 |
|
bc4373babd04
revlog: add the option to track the expected compression upper bound
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42468
diff
changeset
|
1350 If `upperboundcomp` is not None, this is the expected maximal gain from |
|
bc4373babd04
revlog: add the option to track the expected compression upper bound
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42468
diff
changeset
|
1351 compression for the data content. |
|
46646
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
1352 |
|
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
1353 `concurrencychecker` is an optional function that receives 3 arguments: a |
|
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
1354 file handle, a filename, and an expected position. It should check whether |
|
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
1355 the current position in the file handle is valid, and log/warn/fail (by |
|
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
1356 raising). |
|
47257
02a4463565ea
revlog: improve documentation of the entry tuple
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47256
diff
changeset
|
1357 |
|
47399
7a0ec25d5836
revlog: move entry documentation alongside new related constants
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47397
diff
changeset
|
1358 See mercurial/revlogutils/contants.py for details about the content of an |
|
7a0ec25d5836
revlog: move entry documentation alongside new related constants
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47397
diff
changeset
|
1359 index entry. |
| 1083 | 1360 """ |
|
42996
3674797ae8b9
flagprocessors: move _flagserrorclass attribute on revlog & co
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42995
diff
changeset
|
1361 |
|
3674797ae8b9
flagprocessors: move _flagserrorclass attribute on revlog & co
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42995
diff
changeset
|
1362 _flagserrorclass = error.RevlogError |
|
52670
4cb75772818d
pyupgrade: drop the quoting around type annotations
Matt Harbison <matt_harbison@yahoo.com>
parents:
52563
diff
changeset
|
1363 _inner: _InnerRevlog |
|
42996
3674797ae8b9
flagprocessors: move _flagserrorclass attribute on revlog & co
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42995
diff
changeset
|
1364 |
|
51862
71fb6e0a7a35
typing: add type hints to the `opener` attributes and arguments of revlog
Matt Harbison <matt_harbison@yahoo.com>
parents:
51788
diff
changeset
|
1365 opener: vfsmod.vfs |
|
71fb6e0a7a35
typing: add type hints to the `opener` attributes and arguments of revlog
Matt Harbison <matt_harbison@yahoo.com>
parents:
51788
diff
changeset
|
1366 |
|
50694
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1367 @staticmethod |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1368 def is_inline_index(header_bytes): |
|
51007
4ea606568f61
revlog: document the `is_inline_index` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50952
diff
changeset
|
1369 """Determine if a revlog is inline from the initial bytes of the index""" |
|
50789
74c004a515bc
stream-clone: fix a crash when a repo with an empty revlog is cloned
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50761
diff
changeset
|
1370 if len(header_bytes) == 0: |
|
74c004a515bc
stream-clone: fix a crash when a repo with an empty revlog is cloned
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50761
diff
changeset
|
1371 return True |
|
74c004a515bc
stream-clone: fix a crash when a repo with an empty revlog is cloned
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50761
diff
changeset
|
1372 |
|
50694
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1373 header = INDEX_HEADER.unpack(header_bytes)[0] |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1374 |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1375 _format_flags = header & ~0xFFFF |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1376 _format_version = header & 0xFFFF |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1377 |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1378 features = FEATURES_BY_VERSION[_format_version] |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1379 return features[b'inline'](_format_flags) |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1380 |
|
51737
df6ce326936f
typing: add a few type hints to `mercurial/revlog.py`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51650
diff
changeset
|
1381 _docket_file: Optional[bytes] |
|
df6ce326936f
typing: add a few type hints to `mercurial/revlog.py`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51650
diff
changeset
|
1382 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1383 def __init__( |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1384 self, |
|
51862
71fb6e0a7a35
typing: add type hints to the `opener` attributes and arguments of revlog
Matt Harbison <matt_harbison@yahoo.com>
parents:
51788
diff
changeset
|
1385 opener: vfsmod.vfs, |
|
47089
4c041c71ec01
revlog: introduce an explicit tracking of what the revlog is about
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47082
diff
changeset
|
1386 target, |
|
47164
8d3c2f9d4af7
revlog: use a "radix" to address revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47163
diff
changeset
|
1387 radix, |
|
47251
4f38ada3fc26
revlog: move the `trypending` logic from the `changelog` to the `revlog`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47250
diff
changeset
|
1388 postfix=None, # only exist for `tmpcensored` now |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1389 checkambig=False, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1390 mmaplargeindex=False, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1391 censorable=False, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1392 upperboundcomp=None, |
|
44351
5962fd0d1045
nodemap: write nodemap data on disk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44073
diff
changeset
|
1393 persistentnodemap=False, |
|
46646
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
1394 concurrencychecker=None, |
|
47251
4f38ada3fc26
revlog: move the `trypending` logic from the `changelog` to the `revlog`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47250
diff
changeset
|
1395 trypending=False, |
|
50316
87f0155d68aa
revlog: improve the robustness of the splitting process
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49923
diff
changeset
|
1396 try_split=False, |
|
49077
5b65721a75eb
revlog: recommit 49fd21f32695 with a fix for issue6528
Joerg Sonnenberger <joerg@bec.de>
parents:
49037
diff
changeset
|
1397 canonical_parent_order=True, |
|
51138
c136c797740e
revlog: allow explicit passing of config to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51116
diff
changeset
|
1398 data_config=None, |
|
c136c797740e
revlog: allow explicit passing of config to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51116
diff
changeset
|
1399 delta_config=None, |
|
c136c797740e
revlog: allow explicit passing of config to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51116
diff
changeset
|
1400 feature_config=None, |
|
51139
e9eac01c57f3
revlog: add a `may_inline` argument to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51138
diff
changeset
|
1401 may_inline=True, # may inline new revlog |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1402 ): |
| 1083 | 1403 """ |
| 1404 create a revlog object | |
| 1405 | |
| 1406 opener is a function that abstracts the file opening operation | |
| 1407 and can be used to implement COW semantics or the like. | |
|
42478
bc4373babd04
revlog: add the option to track the expected compression upper bound
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42468
diff
changeset
|
1408 |
|
47089
4c041c71ec01
revlog: introduce an explicit tracking of what the revlog is about
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47082
diff
changeset
|
1409 `target`: a (KIND, ID) tuple that identify the content stored in |
|
4c041c71ec01
revlog: introduce an explicit tracking of what the revlog is about
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47082
diff
changeset
|
1410 this revlog. It help the rest of the code to understand what the revlog |
|
4c041c71ec01
revlog: introduce an explicit tracking of what the revlog is about
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47082
diff
changeset
|
1411 is about without having to resort to heuristic and index filename |
|
4c041c71ec01
revlog: introduce an explicit tracking of what the revlog is about
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47082
diff
changeset
|
1412 analysis. Note: that this must be reliably be set by normal code, but |
|
4c041c71ec01
revlog: introduce an explicit tracking of what the revlog is about
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47082
diff
changeset
|
1413 that test, debug, or performance measurement code might not set this to |
|
4c041c71ec01
revlog: introduce an explicit tracking of what the revlog is about
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47082
diff
changeset
|
1414 accurate value. |
| 1083 | 1415 """ |
|
47164
8d3c2f9d4af7
revlog: use a "radix" to address revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47163
diff
changeset
|
1416 |
|
8d3c2f9d4af7
revlog: use a "radix" to address revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47163
diff
changeset
|
1417 self.radix = radix |
|
8d3c2f9d4af7
revlog: use a "radix" to address revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47163
diff
changeset
|
1418 |
|
47245
616b8f412676
revlogv2: introduce a very basic docket file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47242
diff
changeset
|
1419 self._docket_file = None |
|
47182
cacb08f357ed
revlog: define the actual index and datafile at loading time
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47181
diff
changeset
|
1420 self._indexfile = None |
|
cacb08f357ed
revlog: define the actual index and datafile at loading time
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47181
diff
changeset
|
1421 self._datafile = None |
|
47395
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
1422 self._sidedatafile = None |
|
47178
04f2f94836a5
revlog: rename `nodemap_file` to `_nodemap_file`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47177
diff
changeset
|
1423 self._nodemap_file = None |
|
47159
c6b8d5d91e73
revlog: deal with special "postfix" explicitely
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47158
diff
changeset
|
1424 self.postfix = postfix |
|
47251
4f38ada3fc26
revlog: move the `trypending` logic from the `changelog` to the `revlog`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47250
diff
changeset
|
1425 self._trypending = trypending |
|
50316
87f0155d68aa
revlog: improve the robustness of the splitting process
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49923
diff
changeset
|
1426 self._try_split = try_split |
|
51139
e9eac01c57f3
revlog: add a `may_inline` argument to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51138
diff
changeset
|
1427 self._may_inline = may_inline |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1428 self.uses_rust = False |
|
47165
24be247a13b4
revlog: stop usage of `_indexfile` to computing nodemap path
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47164
diff
changeset
|
1429 self.opener = opener |
|
44351
5962fd0d1045
nodemap: write nodemap data on disk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44073
diff
changeset
|
1430 if persistentnodemap: |
|
47178
04f2f94836a5
revlog: rename `nodemap_file` to `_nodemap_file`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47177
diff
changeset
|
1431 self._nodemap_file = nodemaputil.get_nodemap_file(self) |
|
47165
24be247a13b4
revlog: stop usage of `_indexfile` to computing nodemap path
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47164
diff
changeset
|
1432 |
|
47089
4c041c71ec01
revlog: introduce an explicit tracking of what the revlog is about
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47082
diff
changeset
|
1433 assert target[0] in ALL_KINDS |
|
4c041c71ec01
revlog: introduce an explicit tracking of what the revlog is about
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47082
diff
changeset
|
1434 assert len(target) == 2 |
|
4c041c71ec01
revlog: introduce an explicit tracking of what the revlog is about
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47082
diff
changeset
|
1435 self.target = target |
|
51138
c136c797740e
revlog: allow explicit passing of config to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51116
diff
changeset
|
1436 if feature_config is not None: |
|
c136c797740e
revlog: allow explicit passing of config to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51116
diff
changeset
|
1437 self.feature_config = feature_config.copy() |
|
c136c797740e
revlog: allow explicit passing of config to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51116
diff
changeset
|
1438 elif b'feature-config' in self.opener.options: |
|
51036
133f5a54ed9d
revlog: create the revlog object at the repository level
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51035
diff
changeset
|
1439 self.feature_config = self.opener.options[b'feature-config'].copy() |
|
133f5a54ed9d
revlog: create the revlog object at the repository level
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51035
diff
changeset
|
1440 else: |
|
133f5a54ed9d
revlog: create the revlog object at the repository level
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51035
diff
changeset
|
1441 self.feature_config = FeatureConfig() |
|
133f5a54ed9d
revlog: create the revlog object at the repository level
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51035
diff
changeset
|
1442 self.feature_config.censorable = censorable |
|
133f5a54ed9d
revlog: create the revlog object at the repository level
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51035
diff
changeset
|
1443 self.feature_config.canonical_parent_order = canonical_parent_order |
|
51138
c136c797740e
revlog: allow explicit passing of config to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51116
diff
changeset
|
1444 if data_config is not None: |
|
c136c797740e
revlog: allow explicit passing of config to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51116
diff
changeset
|
1445 self.data_config = data_config.copy() |
|
c136c797740e
revlog: allow explicit passing of config to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51116
diff
changeset
|
1446 elif b'data-config' in self.opener.options: |
|
51036
133f5a54ed9d
revlog: create the revlog object at the repository level
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51035
diff
changeset
|
1447 self.data_config = self.opener.options[b'data-config'].copy() |
|
133f5a54ed9d
revlog: create the revlog object at the repository level
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51035
diff
changeset
|
1448 else: |
|
133f5a54ed9d
revlog: create the revlog object at the repository level
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51035
diff
changeset
|
1449 self.data_config = DataConfig() |
|
133f5a54ed9d
revlog: create the revlog object at the repository level
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51035
diff
changeset
|
1450 self.data_config.check_ambig = checkambig |
|
133f5a54ed9d
revlog: create the revlog object at the repository level
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51035
diff
changeset
|
1451 self.data_config.mmap_large_index = mmaplargeindex |
|
51138
c136c797740e
revlog: allow explicit passing of config to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51116
diff
changeset
|
1452 if delta_config is not None: |
|
c136c797740e
revlog: allow explicit passing of config to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51116
diff
changeset
|
1453 self.delta_config = delta_config.copy() |
|
c136c797740e
revlog: allow explicit passing of config to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51116
diff
changeset
|
1454 elif b'delta-config' in self.opener.options: |
|
51036
133f5a54ed9d
revlog: create the revlog object at the repository level
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51035
diff
changeset
|
1455 self.delta_config = self.opener.options[b'delta-config'].copy() |
|
133f5a54ed9d
revlog: create the revlog object at the repository level
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51035
diff
changeset
|
1456 else: |
|
133f5a54ed9d
revlog: create the revlog object at the repository level
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51035
diff
changeset
|
1457 self.delta_config = DeltaConfig() |
|
51087
5645524c6b62
revlog: also migrates `revlog.upperboundcomp` to ConfigClass
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51086
diff
changeset
|
1458 self.delta_config.upper_bound_comp = upperboundcomp |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
1459 |
|
29841
92ac2baaea86
revlog: use an LRU cache for delta chain bases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29840
diff
changeset
|
1460 # Maps rev to chain base rev. |
|
92ac2baaea86
revlog: use an LRU cache for delta chain bases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29840
diff
changeset
|
1461 self._chainbasecache = util.lrucachedict(100) |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
1462 |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1463 self.index: Optional[BaseIndexObject] = None |
|
47245
616b8f412676
revlogv2: introduce a very basic docket file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47242
diff
changeset
|
1464 self._docket = None |
|
44366
76a96e3a2bbb
nodemap: keep track of the docket for loaded data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44363
diff
changeset
|
1465 self._nodemap_docket = None |
|
27070
7860366b46c9
revlog: improve documentation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26907
diff
changeset
|
1466 # Mapping of partial identifiers to full nodes. |
|
13258
c2661863f16f
revlog: introduce a cache for partial lookups
Matt Mackall <mpm@selenic.com>
parents:
13254
diff
changeset
|
1467 self._pcache = {} |
|
4985
e6525e459157
revlog: simplify revlog.__init__
Matt Mackall <mpm@selenic.com>
parents:
4984
diff
changeset
|
1468 |
|
49778
45d7b8c380d7
changelog-v2: add a configuration to disable rank computation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49772
diff
changeset
|
1469 # other optionnals features |
|
45d7b8c380d7
changelog-v2: add a configuration to disable rank computation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49772
diff
changeset
|
1470 |
|
39784
7b2b42fc377a
revlog: store flag processors per revlog
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39783
diff
changeset
|
1471 # Make copy of flag processors so each revlog instance can support |
|
7b2b42fc377a
revlog: store flag processors per revlog
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39783
diff
changeset
|
1472 # custom flags. |
|
42746
05c80f9ef100
flagutil: move the `flagprocessors` mapping in the new module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42745
diff
changeset
|
1473 self._flagprocessors = dict(flagutil.flagprocessors) |
|
47225
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
1474 # prevent nesting of addgroup |
|
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
1475 self._adding_group = None |
|
40671
e9293c5f8bb9
revlog: automatically read from opened file handles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40670
diff
changeset
|
1476 |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1477 index, chunk_cache = self._loadindex() |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1478 self._load_inner(index, chunk_cache) |
|
46646
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
1479 self._concurrencychecker = concurrencychecker |
|
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
1480 |
|
47158
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1481 def _init_opts(self): |
|
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1482 """process options (from above/config) to setup associated default revlog mode |
|
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1483 |
|
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1484 These values might be affected when actually reading on disk information. |
|
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1485 |
|
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1486 The relevant values are returned for use in _loadindex(). |
|
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1487 |
|
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1488 * newversionflags: |
|
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1489 version header to use if we need to create a new revlog |
|
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1490 |
|
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1491 * mmapindexthreshold: |
|
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1492 minimal index size for start to use mmap |
|
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1493 |
|
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1494 * force_nodemap: |
|
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1495 force the usage of a "development" version of the nodemap code |
|
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1496 """ |
|
43027
3518da504303
vfs: give all vfs an options attribute by default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43026
diff
changeset
|
1497 opts = self.opener.options |
|
41200
cecf3f8bccd3
revlog: always process opener options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41118
diff
changeset
|
1498 |
|
47274
6c84fc9c9a90
changelogv2: introduce a "changelogv2" feature
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47272
diff
changeset
|
1499 if b'changelogv2' in opts and self.revlog_kind == KIND_CHANGELOG: |
|
47277
921648d31553
changelogv2: use a dedicated version number
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47274
diff
changeset
|
1500 new_header = CHANGELOGV2 |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
1501 compute_rank = opts.get(b'changelogv2.compute-rank', True) |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
1502 self.feature_config.compute_rank = compute_rank |
|
47274
6c84fc9c9a90
changelogv2: introduce a "changelogv2" feature
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47272
diff
changeset
|
1503 elif b'revlogv2' in opts: |
|
47272
80164d50ae3d
revlogv2: no longer attempt to use inline for new revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47270
diff
changeset
|
1504 new_header = REVLOGV2 |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
1505 elif b'revlogv1' in opts: |
|
51139
e9eac01c57f3
revlog: add a `may_inline` argument to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51138
diff
changeset
|
1506 new_header = REVLOGV1 |
|
e9eac01c57f3
revlog: add a `may_inline` argument to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51138
diff
changeset
|
1507 if self._may_inline: |
|
e9eac01c57f3
revlog: add a `may_inline` argument to revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51138
diff
changeset
|
1508 new_header |= FLAG_INLINE_DATA |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
1509 if b'generaldelta' in opts: |
|
47185
729668105901
revlog: rename `newversionflags` to `new_header`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47184
diff
changeset
|
1510 new_header |= FLAG_GENERALDELTA |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
1511 elif b'revlogv0' in self.opener.options: |
|
47185
729668105901
revlog: rename `newversionflags` to `new_header`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47184
diff
changeset
|
1512 new_header = REVLOGV0 |
|
41200
cecf3f8bccd3
revlog: always process opener options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41118
diff
changeset
|
1513 else: |
|
47185
729668105901
revlog: rename `newversionflags` to `new_header`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47184
diff
changeset
|
1514 new_header = REVLOG_DEFAULT_VERSION |
|
41200
cecf3f8bccd3
revlog: always process opener options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41118
diff
changeset
|
1515 |
|
51047
027bc364524b
revlog: skip opener options to pass mmap_index_threshold value
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51046
diff
changeset
|
1516 mmapindexthreshold = None |
|
51054
3977068c638c
revlog: remove legacy usage of `_mmaplargeindex`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51053
diff
changeset
|
1517 if self.data_config.mmap_large_index: |
|
51047
027bc364524b
revlog: skip opener options to pass mmap_index_threshold value
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51046
diff
changeset
|
1518 mmapindexthreshold = self.data_config.mmap_index_threshold |
|
51046
683b96c416d8
revlog: skip opener options to pass enable_ellipsis
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51045
diff
changeset
|
1519 if self.feature_config.enable_ellipsis: |
|
41200
cecf3f8bccd3
revlog: always process opener options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41118
diff
changeset
|
1520 self._flagprocessors[REVIDX_ELLIPSIS] = ellipsisprocessor |
|
cecf3f8bccd3
revlog: always process opener options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41118
diff
changeset
|
1521 |
|
cecf3f8bccd3
revlog: always process opener options
Gregory Szorc <gregory.szorc@gmail.com>
parents:
41118
diff
changeset
|
1522 # revlog v0 doesn't have flag processors |
|
49019
ceafb0f81250
revlog: remove pycompat.iteritems()
Gregory Szorc <gregory.szorc@gmail.com>
parents:
49004
diff
changeset
|
1523 for flag, processor in opts.get(b'flagprocessors', {}).items(): |
|
42748
5109217a9ab6
flagutil: move insertflagprocessor to the new module (API)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42747
diff
changeset
|
1524 flagutil.insertflagprocessor(flag, processor, self._flagprocessors) |
|
40267
9d5ddf55415b
revlog: allow flag processors to be applied via store options
Matt Harbison <matt_harbison@yahoo.com>
parents:
40180
diff
changeset
|
1525 |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
1526 chunk_cache_size = self.data_config.chunk_cache_size |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
1527 if chunk_cache_size <= 0: |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1528 raise error.RevlogError( |
|
43117
8ff1ecfadcd1
cleanup: join string literals that are already on one line
Martin von Zweigbergk <martinvonz@google.com>
parents:
43106
diff
changeset
|
1529 _(b'revlog chunk cache size %r is not greater than 0') |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
1530 % chunk_cache_size |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1531 ) |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
1532 elif chunk_cache_size & (chunk_cache_size - 1): |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1533 raise error.RevlogError( |
|
43117
8ff1ecfadcd1
cleanup: join string literals that are already on one line
Martin von Zweigbergk <martinvonz@google.com>
parents:
43106
diff
changeset
|
1534 _(b'revlog chunk cache size %r is not a power of 2') |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
1535 % chunk_cache_size |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1536 ) |
|
47158
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1537 force_nodemap = opts.get(b'devel-force-nodemap', False) |
|
47185
729668105901
revlog: rename `newversionflags` to `new_header`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47184
diff
changeset
|
1538 return new_header, mmapindexthreshold, force_nodemap |
|
47158
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1539 |
|
47249
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1540 def _get_data(self, filepath, mmap_threshold, size=None): |
|
47183
a13f72b9ccfb
revlog: move index reading logic in a dedicated method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47182
diff
changeset
|
1541 """return a file content with or without mmap |
|
a13f72b9ccfb
revlog: move index reading logic in a dedicated method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47182
diff
changeset
|
1542 |
|
a13f72b9ccfb
revlog: move index reading logic in a dedicated method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47182
diff
changeset
|
1543 If the file is missing return the empty string""" |
|
a13f72b9ccfb
revlog: move index reading logic in a dedicated method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47182
diff
changeset
|
1544 try: |
|
a13f72b9ccfb
revlog: move index reading logic in a dedicated method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47182
diff
changeset
|
1545 with self.opener(filepath) as fp: |
|
a13f72b9ccfb
revlog: move index reading logic in a dedicated method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47182
diff
changeset
|
1546 if mmap_threshold is not None: |
|
a13f72b9ccfb
revlog: move index reading logic in a dedicated method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47182
diff
changeset
|
1547 file_size = self.opener.fstat(fp).st_size |
|
51650
d6c895e4adc4
mmap: only use mmap to read revlog index if it is safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51506
diff
changeset
|
1548 if ( |
|
d6c895e4adc4
mmap: only use mmap to read revlog index if it is safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51506
diff
changeset
|
1549 file_size >= mmap_threshold |
|
d6c895e4adc4
mmap: only use mmap to read revlog index if it is safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51506
diff
changeset
|
1550 and self.opener.is_mmap_safe(filepath) |
|
d6c895e4adc4
mmap: only use mmap to read revlog index if it is safe
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51506
diff
changeset
|
1551 ): |
|
47249
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1552 if size is not None: |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1553 # avoid potentiel mmap crash |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1554 size = min(file_size, size) |
|
47183
a13f72b9ccfb
revlog: move index reading logic in a dedicated method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47182
diff
changeset
|
1555 # TODO: should .close() to release resources without |
|
a13f72b9ccfb
revlog: move index reading logic in a dedicated method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47182
diff
changeset
|
1556 # relying on Python GC |
|
47249
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1557 if size is None: |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1558 return util.buffer(util.mmapread(fp)) |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1559 else: |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1560 return util.buffer(util.mmapread(fp, size)) |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1561 if size is None: |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1562 return fp.read() |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1563 else: |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1564 return fp.read(size) |
|
49314
2e726c934fcd
py3: catch FileNotFoundError instead of checking errno == ENOENT
Manuel Jacob <me@manueljacob.de>
parents:
49292
diff
changeset
|
1565 except FileNotFoundError: |
|
47183
a13f72b9ccfb
revlog: move index reading logic in a dedicated method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47182
diff
changeset
|
1566 return b'' |
|
a13f72b9ccfb
revlog: move index reading logic in a dedicated method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47182
diff
changeset
|
1567 |
|
50694
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1568 def get_streams(self, max_linkrev, force_inline=False): |
|
51008
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1569 """return a list of streams that represent this revlog |
|
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1570 |
|
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1571 This is used by stream-clone to do bytes to bytes copies of a repository. |
|
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1572 |
|
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1573 This streams data for all revisions that refer to a changelog revision up |
|
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1574 to `max_linkrev`. |
|
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1575 |
|
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1576 If `force_inline` is set, it enforces that the stream will represent an inline revlog. |
|
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1577 |
|
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1578 It returns is a list of three-tuple: |
|
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1579 |
|
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1580 [ |
|
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1581 (filename, bytes_stream, stream_size), |
|
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1582 … |
|
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1583 ] |
|
273434748051
revlog: document the `get_streams` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51007
diff
changeset
|
1584 """ |
|
50694
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1585 n = len(self) |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1586 index = self.index |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1587 while n > 0: |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1588 linkrev = index[n - 1][4] |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1589 if linkrev < max_linkrev: |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1590 break |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1591 # note: this loop will rarely go through multiple iterations, since |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1592 # it only traverses commits created during the current streaming |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1593 # pull operation. |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1594 # |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1595 # If this become a problem, using a binary search should cap the |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1596 # runtime of this. |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1597 n = n - 1 |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1598 if n == 0: |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1599 # no data to send |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1600 return [] |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1601 index_size = n * index.entry_size |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1602 data_size = self.end(n - 1) |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1603 |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1604 # XXX we might have been split (or stripped) since the object |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1605 # initialization, We need to close this race too, but having a way to |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1606 # pre-open the file we feed to the revlog and never closing them before |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1607 # we are done streaming. |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1608 |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1609 if self._inline: |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1610 |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1611 def get_stream(): |
|
51085
5ffee3cff8de
revlog: remove the `_indexfp` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51084
diff
changeset
|
1612 with self.opener(self._indexfile, mode=b"r") as fp: |
|
50694
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1613 yield None |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1614 size = index_size + data_size |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1615 if size <= 65536: |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1616 yield fp.read(size) |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1617 else: |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1618 yield from util.filechunkiter(fp, limit=size) |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1619 |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1620 inline_stream = get_stream() |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1621 next(inline_stream) |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1622 return [ |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1623 (self._indexfile, inline_stream, index_size + data_size), |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1624 ] |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1625 elif force_inline: |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1626 |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1627 def get_stream(): |
|
51023
720e5a5f2b95
stream-clone: use `revlog.reading` in `revlog.get_streams`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51021
diff
changeset
|
1628 with self.reading(): |
|
50694
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1629 yield None |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1630 |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1631 for rev in range(n): |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1632 idx = self.index.entry_binary(rev) |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1633 if rev == 0 and self._docket is None: |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1634 # re-inject the inline flag |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1635 header = self._format_flags |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1636 header |= self._format_version |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1637 header |= FLAG_INLINE_DATA |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1638 header = self.index.pack_header(header) |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1639 idx = header + idx |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1640 yield idx |
|
51091
df50a1592e0c
revlog: move _getsegmentforrevs on the internal object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51090
diff
changeset
|
1641 yield self._inner.get_segment_for_revs(rev, rev)[1] |
|
50694
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1642 |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1643 inline_stream = get_stream() |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1644 next(inline_stream) |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1645 return [ |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1646 (self._indexfile, inline_stream, index_size + data_size), |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1647 ] |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1648 else: |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1649 |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1650 def get_index_stream(): |
|
51085
5ffee3cff8de
revlog: remove the `_indexfp` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51084
diff
changeset
|
1651 with self.opener(self._indexfile, mode=b"r") as fp: |
|
50694
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1652 yield None |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1653 if index_size <= 65536: |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1654 yield fp.read(index_size) |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1655 else: |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1656 yield from util.filechunkiter(fp, limit=index_size) |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1657 |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1658 def get_data_stream(): |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1659 with self._datafp() as fp: |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1660 yield None |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1661 if data_size <= 65536: |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1662 yield fp.read(data_size) |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1663 else: |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1664 yield from util.filechunkiter(fp, limit=data_size) |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1665 |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1666 index_stream = get_index_stream() |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1667 next(index_stream) |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1668 data_stream = get_data_stream() |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1669 next(data_stream) |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1670 return [ |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1671 (self._datafile, data_stream, data_size), |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1672 (self._indexfile, index_stream, index_size), |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1673 ] |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1674 |
|
47408
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1675 def _loadindex(self, docket=None): |
|
47185
729668105901
revlog: rename `newversionflags` to `new_header`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47184
diff
changeset
|
1676 new_header, mmapindexthreshold, force_nodemap = self._init_opts() |
|
47182
cacb08f357ed
revlog: define the actual index and datafile at loading time
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47181
diff
changeset
|
1677 |
|
47251
4f38ada3fc26
revlog: move the `trypending` logic from the `changelog` to the `revlog`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47250
diff
changeset
|
1678 if self.postfix is not None: |
|
4f38ada3fc26
revlog: move the `trypending` logic from the `changelog` to the `revlog`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47250
diff
changeset
|
1679 entry_point = b'%s.i.%s' % (self.radix, self.postfix) |
|
4f38ada3fc26
revlog: move the `trypending` logic from the `changelog` to the `revlog`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47250
diff
changeset
|
1680 elif self._trypending and self.opener.exists(b'%s.i.a' % self.radix): |
|
4f38ada3fc26
revlog: move the `trypending` logic from the `changelog` to the `revlog`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47250
diff
changeset
|
1681 entry_point = b'%s.i.a' % self.radix |
|
50390
978ffa09910b
revlog: move the computation of the split_index path in a property
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50348
diff
changeset
|
1682 elif self._try_split and self.opener.exists(self._split_index_file): |
|
978ffa09910b
revlog: move the computation of the split_index path in a property
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50348
diff
changeset
|
1683 entry_point = self._split_index_file |
|
47251
4f38ada3fc26
revlog: move the `trypending` logic from the `changelog` to the `revlog`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47250
diff
changeset
|
1684 else: |
|
47189
21ef5f75edf0
revlog: use "entry_point" phrasing for loading the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47188
diff
changeset
|
1685 entry_point = b'%s.i' % self.radix |
|
47182
cacb08f357ed
revlog: define the actual index and datafile at loading time
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47181
diff
changeset
|
1686 |
|
47408
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1687 if docket is not None: |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1688 self._docket = docket |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1689 self._docket_file = entry_point |
|
47183
a13f72b9ccfb
revlog: move index reading logic in a dedicated method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47182
diff
changeset
|
1690 else: |
|
47408
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1691 self._initempty = True |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1692 entry_data = self._get_data(entry_point, mmapindexthreshold) |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1693 if len(entry_data) > 0: |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1694 header = INDEX_HEADER.unpack(entry_data[:4])[0] |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1695 self._initempty = False |
|
47245
616b8f412676
revlogv2: introduce a very basic docket file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47242
diff
changeset
|
1696 else: |
|
47408
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1697 header = new_header |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1698 |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1699 self._format_flags = header & ~0xFFFF |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1700 self._format_version = header & 0xFFFF |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1701 |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1702 supported_flags = SUPPORTED_FLAGS.get(self._format_version) |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1703 if supported_flags is None: |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1704 msg = _(b'unknown version (%d) in revlog %s') |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1705 msg %= (self._format_version, self.display_id) |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1706 raise error.RevlogError(msg) |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1707 elif self._format_flags & ~supported_flags: |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1708 msg = _(b'unknown flags (%#04x) in version %d revlog %s') |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1709 display_flag = self._format_flags >> 16 |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1710 msg %= (display_flag, self._format_version, self.display_id) |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1711 raise error.RevlogError(msg) |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1712 |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1713 features = FEATURES_BY_VERSION[self._format_version] |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1714 self._inline = features[b'inline'](self._format_flags) |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
1715 self.delta_config.general_delta = features[b'generaldelta']( |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
1716 self._format_flags |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
1717 ) |
|
52292
13815c9decd4
changelog: also set the general delta config flag in the data config
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52089
diff
changeset
|
1718 self.data_config.generaldelta = self.delta_config.general_delta |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
1719 self.feature_config.has_side_data = features[b'sidedata'] |
|
47408
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1720 |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1721 if not features[b'docket']: |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1722 self._indexfile = entry_point |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1723 index_data = entry_data |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1724 else: |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1725 self._docket_file = entry_point |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1726 if self._initempty: |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1727 self._docket = docketutil.default_docket(self, header) |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1728 else: |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1729 self._docket = docketutil.parse_docket( |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1730 self, entry_data, use_pending=self._trypending |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1731 ) |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1732 |
|
f7f082bc0e7c
revlog: allow to pass an existing docket to `_loadindex()`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47405
diff
changeset
|
1733 if self._docket is not None: |
|
47245
616b8f412676
revlogv2: introduce a very basic docket file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47242
diff
changeset
|
1734 self._indexfile = self._docket.index_filepath() |
|
47249
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1735 index_data = b'' |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1736 index_size = self._docket.index_end |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1737 if index_size > 0: |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1738 index_data = self._get_data( |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1739 self._indexfile, mmapindexthreshold, size=index_size |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1740 ) |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1741 if len(index_data) < index_size: |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1742 msg = _(b'too few index data for %s: got %d, expected %d') |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1743 msg %= (self.display_id, len(index_data), index_size) |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1744 raise error.RevlogError(msg) |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
1745 |
|
47245
616b8f412676
revlogv2: introduce a very basic docket file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47242
diff
changeset
|
1746 self._inline = False |
|
616b8f412676
revlogv2: introduce a very basic docket file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47242
diff
changeset
|
1747 # generaldelta implied by version 2 revlogs. |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
1748 self.delta_config.general_delta = True |
|
52292
13815c9decd4
changelog: also set the general delta config flag in the data config
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52089
diff
changeset
|
1749 self.data_config.generaldelta = True |
|
47245
616b8f412676
revlogv2: introduce a very basic docket file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47242
diff
changeset
|
1750 # the logic for persistent nodemap will be dealt with within the |
|
616b8f412676
revlogv2: introduce a very basic docket file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47242
diff
changeset
|
1751 # main docket, so disable it for now. |
|
616b8f412676
revlogv2: introduce a very basic docket file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47242
diff
changeset
|
1752 self._nodemap_file = None |
|
47189
21ef5f75edf0
revlog: use "entry_point" phrasing for loading the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47188
diff
changeset
|
1753 |
|
47332
0a3fa41fa719
revlogv2: use a unique filename for data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47305
diff
changeset
|
1754 if self._docket is not None: |
|
0a3fa41fa719
revlogv2: use a unique filename for data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47305
diff
changeset
|
1755 self._datafile = self._docket.data_filepath() |
|
47395
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
1756 self._sidedatafile = self._docket.sidedata_filepath() |
|
47332
0a3fa41fa719
revlogv2: use a unique filename for data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47305
diff
changeset
|
1757 elif self.postfix is None: |
|
47189
21ef5f75edf0
revlog: use "entry_point" phrasing for loading the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47188
diff
changeset
|
1758 self._datafile = b'%s.d' % self.radix |
|
21ef5f75edf0
revlog: use "entry_point" phrasing for loading the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47188
diff
changeset
|
1759 else: |
|
21ef5f75edf0
revlog: use "entry_point" phrasing for loading the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47188
diff
changeset
|
1760 self._datafile = b'%s.d.%s' % (self.radix, self.postfix) |
|
21ef5f75edf0
revlog: use "entry_point" phrasing for loading the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47188
diff
changeset
|
1761 |
|
46793
6266d19556ad
node: introduce nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46792
diff
changeset
|
1762 self.nodeconstants = sha1nodeconstants |
|
6266d19556ad
node: introduce nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46792
diff
changeset
|
1763 self.nullid = self.nodeconstants.nullid |
|
6266d19556ad
node: introduce nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46792
diff
changeset
|
1764 |
|
41312
189e06b2d719
revlog: make sure we never use sparserevlog without general delta (issue6056)
Boris Feld <boris.feld@octobus.net>
parents:
41310
diff
changeset
|
1765 # sparse-revlog can't be on without general-delta (issue6056) |
|
51051
f636103c4d67
revlog: remove legacy usage of `_generaldelta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51049
diff
changeset
|
1766 if not self.delta_config.general_delta: |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
1767 self.delta_config.sparse_revlog = False |
|
4985
e6525e459157
revlog: simplify revlog.__init__
Matt Mackall <mpm@selenic.com>
parents:
4984
diff
changeset
|
1768 |
|
39260
0a5b20c107a6
repository: remove storedeltachains from ifilestorage
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39259
diff
changeset
|
1769 self._storedeltachains = True |
|
30154
5e72129d75ed
revlog: add instance variable controlling delta chain use
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30014
diff
changeset
|
1770 |
|
44356
6f9e8e142cea
nodemap: add a (python) index class for persistent nodemap testing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44353
diff
changeset
|
1771 devel_nodemap = ( |
|
47178
04f2f94836a5
revlog: rename `nodemap_file` to `_nodemap_file`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47177
diff
changeset
|
1772 self._nodemap_file |
|
47158
b6e1fe7ac24b
revlog: split the option initialisation in its own method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47157
diff
changeset
|
1773 and force_nodemap |
|
47077
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
1774 and parse_index_v1_nodemap is not None |
|
44356
6f9e8e142cea
nodemap: add a (python) index class for persistent nodemap testing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44353
diff
changeset
|
1775 ) |
|
6f9e8e142cea
nodemap: add a (python) index class for persistent nodemap testing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44353
diff
changeset
|
1776 |
|
44523
e7fff9c3cdac
rust-nodemap: automatically use the rust index for persistent nodemap
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44511
diff
changeset
|
1777 use_rust_index = False |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1778 rust_applicable = self._nodemap_file is not None |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1779 rust_applicable = rust_applicable or self.target[0] == KIND_FILELOG |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1780 rust_applicable = rust_applicable and getattr( |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1781 self.opener, "rust_compatible", True |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1782 ) |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1783 if rustrevlog is not None and rust_applicable: |
|
51426
def497c75351
rust: disable the RustIndex without persistent nodemap
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51394
diff
changeset
|
1784 # we would like to use the rust_index in all case, especially |
|
def497c75351
rust: disable the RustIndex without persistent nodemap
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51394
diff
changeset
|
1785 # because it is necessary for AncestorsIterator and LazyAncestors |
|
def497c75351
rust: disable the RustIndex without persistent nodemap
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51394
diff
changeset
|
1786 # since the 6.7 cycle. |
|
def497c75351
rust: disable the RustIndex without persistent nodemap
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51394
diff
changeset
|
1787 # |
|
def497c75351
rust: disable the RustIndex without persistent nodemap
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51394
diff
changeset
|
1788 # However, the performance impact of inconditionnaly building the |
|
def497c75351
rust: disable the RustIndex without persistent nodemap
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51394
diff
changeset
|
1789 # nodemap is currently a problem for non-persistent nodemap |
|
def497c75351
rust: disable the RustIndex without persistent nodemap
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51394
diff
changeset
|
1790 # repository. |
|
def497c75351
rust: disable the RustIndex without persistent nodemap
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51394
diff
changeset
|
1791 use_rust_index = True |
|
44523
e7fff9c3cdac
rust-nodemap: automatically use the rust index for persistent nodemap
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44511
diff
changeset
|
1792 |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1793 if self._format_version != REVLOGV1: |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1794 use_rust_index = False |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1795 |
|
52302
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1796 if hasattr(self.opener, "fncache"): |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1797 vfs = self.opener.vfs |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1798 if not self.opener.uses_dotencode: |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1799 use_rust_index = False |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1800 if not isinstance(vfs, vfsmod.vfs): |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1801 # Be cautious since we don't support other vfs |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1802 use_rust_index = False |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1803 else: |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1804 # Rust only supports repos with fncache |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1805 use_rust_index = False |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1806 |
|
47077
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
1807 self._parse_index = parse_index_v1 |
|
47153
f58a13c52726
revlog: split the `version` attribute into its two components
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
1808 if self._format_version == REVLOGV0: |
|
47079
724db234b790
revlog: code for `revlogv0` in its own module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47078
diff
changeset
|
1809 self._parse_index = revlogv0.parse_index_v0 |
|
47187
ef7a8a1622ad
revlog: directly use self._format_version when loading index
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47186
diff
changeset
|
1810 elif self._format_version == REVLOGV2: |
|
47077
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
1811 self._parse_index = parse_index_v2 |
|
47277
921648d31553
changelogv2: use a dedicated version number
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47274
diff
changeset
|
1812 elif self._format_version == CHANGELOGV2: |
|
47281
25ce16bf724b
changelogv2: use a dedicated on disk format for changelogv2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47280
diff
changeset
|
1813 self._parse_index = parse_index_cl_v2 |
|
44356
6f9e8e142cea
nodemap: add a (python) index class for persistent nodemap testing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44353
diff
changeset
|
1814 elif devel_nodemap: |
|
47077
5e64c93d5f94
revlog: remove the revlogio class
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47075
diff
changeset
|
1815 self._parse_index = parse_index_v1_nodemap |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1816 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1817 if use_rust_index: |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1818 # Let the Rust code parse its own index |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1819 index, chunkcache = (index_data, None) |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1820 self.uses_rust = True |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1821 else: |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1822 try: |
|
52896
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
1823 d = self._parse_index( |
|
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
1824 index_data, self._inline, self.delta_config.general_delta |
|
8de68446a5bd
index: remember the generaldelta config instead of getting it from the revlog
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52895
diff
changeset
|
1825 ) |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1826 index, chunkcache = d |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1827 self._register_nodemap_info(index) |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1828 except (ValueError, IndexError): |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1829 raise error.RevlogError( |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1830 _(b"index %s is corrupted") % self.display_id |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1831 ) |
|
23306
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
1832 # revnum -> (chain-length, sum-delta-length) |
|
45802
8719a5b68419
revlog: use LRU for the chain cache
Joerg Sonnenberger <joerg@bec.de>
parents:
45735
diff
changeset
|
1833 self._chaininfocache = util.lrucachedict(500) |
|
116
e484cd5ec282
Only use lazy indexing for big indices and avoid the overhead of the
mpm@selenic.com
parents:
115
diff
changeset
|
1834 |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1835 return index, chunkcache |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1836 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1837 def _load_inner(self, index, chunk_cache): |
|
51095
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
1838 if self._docket is None: |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
1839 default_compression_header = None |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
1840 else: |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
1841 default_compression_header = self._docket.default_compression_header |
|
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
1842 |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1843 if self.uses_rust: |
|
52302
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1844 vfs_is_readonly = False |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1845 fncache = None |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1846 |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1847 if hasattr(self.opener, "vfs"): |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1848 vfs = self.opener |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1849 if isinstance(vfs, vfsmod.readonlyvfs): |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1850 vfs_is_readonly = True |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1851 vfs = vfs.vfs |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1852 fncache = vfs.fncache |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1853 vfs = vfs.vfs |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1854 else: |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1855 vfs = self.opener |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1856 |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1857 vfs_base = vfs.base |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1858 assert fncache is not None, "Rust only supports repos with fncache" |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1859 |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1860 self._inner = rustrevlog.InnerRevlog( |
|
52302
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1861 vfs_base=vfs_base, |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1862 fncache=fncache, |
|
72bc29f01570
revlog: add glue to use a pure-Rust VFS
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52293
diff
changeset
|
1863 vfs_is_readonly=vfs_is_readonly, |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1864 index_data=index, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1865 index_file=self._indexfile, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1866 data_file=self._datafile, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1867 sidedata_file=self._sidedatafile, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1868 inline=self._inline, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1869 data_config=self.data_config, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1870 delta_config=self.delta_config, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1871 feature_config=self.feature_config, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1872 chunk_cache=chunk_cache, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1873 default_compression_header=default_compression_header, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1874 revlog_type=self.target[0], |
|
52304
bcd4962e0df9
rust-revlog: don't create an in-memory nodemap for filelogs from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52302
diff
changeset
|
1875 use_persistent_nodemap=self._nodemap_file is not None, |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1876 ) |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1877 self.index = RustIndexProxy(self._inner) |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1878 self._register_nodemap_info(self.index) |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1879 self.uses_rust = True |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1880 else: |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1881 self._inner = _InnerRevlog( |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1882 opener=self.opener, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1883 index=index, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1884 index_file=self._indexfile, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1885 data_file=self._datafile, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1886 sidedata_file=self._sidedatafile, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1887 inline=self._inline, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1888 data_config=self.data_config, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1889 delta_config=self.delta_config, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1890 feature_config=self.feature_config, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1891 chunk_cache=chunk_cache, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1892 default_compression_header=default_compression_header, |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1893 ) |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1894 self.index = self._inner.index |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1895 |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1896 def _register_nodemap_info(self, index): |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1897 use_nodemap = ( |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1898 not self._inline |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1899 and self._nodemap_file is not None |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1900 and hasattr(index, 'update_nodemap_data') |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
1901 ) |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1902 if use_nodemap: |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1903 nodemap_data = nodemaputil.persisted_data(self) |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1904 if nodemap_data is not None: |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1905 docket = nodemap_data[0] |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1906 if ( |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1907 len(index) > docket.tip_rev |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1908 and index[docket.tip_rev][7] == docket.tip_node |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1909 ): |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1910 # no changelog tampering |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1911 self._nodemap_docket = docket |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1912 index.update_nodemap_data( |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1913 *nodemap_data |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
1914 ) # pytype: disable=attribute-error |
|
116
e484cd5ec282
Only use lazy indexing for big indices and avoid the overhead of the
mpm@selenic.com
parents:
115
diff
changeset
|
1915 |
|
50694
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1916 def get_revlog(self): |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1917 """simple function to mirror API of other not-really-revlog API""" |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1918 return self |
|
a41eeb877d07
branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50391
diff
changeset
|
1919 |
|
30795
78ac56aebab6
revlog: use compression engine API for compression
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30793
diff
changeset
|
1920 @util.propertycache |
|
47090
64cd1496bb70
revlog: replace the old `revlog_kind` approach with the new `target` one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47089
diff
changeset
|
1921 def revlog_kind(self): |
|
64cd1496bb70
revlog: replace the old `revlog_kind` approach with the new `target` one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47089
diff
changeset
|
1922 return self.target[0] |
|
64cd1496bb70
revlog: replace the old `revlog_kind` approach with the new `target` one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47089
diff
changeset
|
1923 |
|
64cd1496bb70
revlog: replace the old `revlog_kind` approach with the new `target` one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47089
diff
changeset
|
1924 @util.propertycache |
|
47167
fbf38517d17d
revlog: introduce a `display_id` property
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47165
diff
changeset
|
1925 def display_id(self): |
|
fbf38517d17d
revlog: introduce a `display_id` property
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47165
diff
changeset
|
1926 """The public facing "ID" of the revlog that we use in message""" |
|
49712
92892dff03f3
revlog: use the user facing filename as the display_id for filelogs
Matt Harbison <matt_harbison@yahoo.com>
parents:
49711
diff
changeset
|
1927 if self.revlog_kind == KIND_FILELOG: |
|
92892dff03f3
revlog: use the user facing filename as the display_id for filelogs
Matt Harbison <matt_harbison@yahoo.com>
parents:
49711
diff
changeset
|
1928 # Reference the file without the "data/" prefix, so it is familiar |
|
92892dff03f3
revlog: use the user facing filename as the display_id for filelogs
Matt Harbison <matt_harbison@yahoo.com>
parents:
49711
diff
changeset
|
1929 # to the user. |
|
92892dff03f3
revlog: use the user facing filename as the display_id for filelogs
Matt Harbison <matt_harbison@yahoo.com>
parents:
49711
diff
changeset
|
1930 return self.target[1] |
|
92892dff03f3
revlog: use the user facing filename as the display_id for filelogs
Matt Harbison <matt_harbison@yahoo.com>
parents:
49711
diff
changeset
|
1931 else: |
|
92892dff03f3
revlog: use the user facing filename as the display_id for filelogs
Matt Harbison <matt_harbison@yahoo.com>
parents:
49711
diff
changeset
|
1932 return self.radix |
|
47167
fbf38517d17d
revlog: introduce a `display_id` property
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47165
diff
changeset
|
1933 |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
1934 def _datafp(self, mode=b'r'): |
|
36006
61326dd7cb8d
revlog: move datafile opening in a method
Boris Feld <boris.feld@octobus.net>
parents:
35885
diff
changeset
|
1935 """file object for the revlog's data file""" |
|
47163
396442cd7e6a
revlog: rename `datafile` to `datafile`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47162
diff
changeset
|
1936 return self.opener(self._datafile, mode=mode) |
|
36006
61326dd7cb8d
revlog: move datafile opening in a method
Boris Feld <boris.feld@octobus.net>
parents:
35885
diff
changeset
|
1937 |
|
43492
ec7ba79bf3db
revlog: move tiprev() from changelog up to revlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
43133
diff
changeset
|
1938 def tiprev(self): |
|
ec7ba79bf3db
revlog: move tiprev() from changelog up to revlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
43133
diff
changeset
|
1939 return len(self.index) - 1 |
|
ec7ba79bf3db
revlog: move tiprev() from changelog up to revlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
43133
diff
changeset
|
1940 |
|
4980
fc44c8df9d99
revlog: some codingstyle cleanups
Matt Mackall <mpm@selenic.com>
parents:
4979
diff
changeset
|
1941 def tip(self): |
|
43492
ec7ba79bf3db
revlog: move tiprev() from changelog up to revlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
43133
diff
changeset
|
1942 return self.node(self.tiprev()) |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1943 |
|
24030
828dc8db5515
revlog: add __contains__ for fast membership test
Yuya Nishihara <yuya@tcha.org>
parents:
23857
diff
changeset
|
1944 def __contains__(self, rev): |
|
828dc8db5515
revlog: add __contains__ for fast membership test
Yuya Nishihara <yuya@tcha.org>
parents:
23857
diff
changeset
|
1945 return 0 <= rev < len(self) |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1946 |
|
6750
fb42030d79d6
add __len__ and __iter__ methods to repo and revlog
Matt Mackall <mpm@selenic.com>
parents:
6703
diff
changeset
|
1947 def __len__(self): |
|
38890
781b2720d2ac
index: don't include nullid in len()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38889
diff
changeset
|
1948 return len(self.index) |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1949 |
|
51868
0338fb200a30
typing: lock in new pytype gains from making revlog related classes typeable
Matt Harbison <matt_harbison@yahoo.com>
parents:
51867
diff
changeset
|
1950 def __iter__(self) -> Iterator[int]: |
|
49292
d44e3c45f0e4
py3: replace `pycompat.xrange` by `range`
Manuel Jacob <me@manueljacob.de>
parents:
49263
diff
changeset
|
1951 return iter(range(len(self))) |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1952 |
|
17672
474047947b8f
clfilter: make the revlog class responsible of all its iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17537
diff
changeset
|
1953 def revs(self, start=0, stop=None): |
|
474047947b8f
clfilter: make the revlog class responsible of all its iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17537
diff
changeset
|
1954 """iterate over all rev in this revlog (from start to stop)""" |
|
39886
d63153611ed5
storageutil: extract revision number iteration
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39884
diff
changeset
|
1955 return storageutil.iterrevs(len(self), start=start, stop=stop) |
|
13275
68da048b4c88
revlog: incrementally build node cache with linear searches
Matt Mackall <mpm@selenic.com>
parents:
13268
diff
changeset
|
1956 |
|
16374
29c2ff719715
revlog: add hasnode helper method
Matt Mackall <mpm@selenic.com>
parents:
15890
diff
changeset
|
1957 def hasnode(self, node): |
|
29c2ff719715
revlog: add hasnode helper method
Matt Mackall <mpm@selenic.com>
parents:
15890
diff
changeset
|
1958 try: |
|
29c2ff719715
revlog: add hasnode helper method
Matt Mackall <mpm@selenic.com>
parents:
15890
diff
changeset
|
1959 self.rev(node) |
|
29c2ff719715
revlog: add hasnode helper method
Matt Mackall <mpm@selenic.com>
parents:
15890
diff
changeset
|
1960 return True |
|
29c2ff719715
revlog: add hasnode helper method
Matt Mackall <mpm@selenic.com>
parents:
15890
diff
changeset
|
1961 except KeyError: |
|
29c2ff719715
revlog: add hasnode helper method
Matt Mackall <mpm@selenic.com>
parents:
15890
diff
changeset
|
1962 return False |
|
29c2ff719715
revlog: add hasnode helper method
Matt Mackall <mpm@selenic.com>
parents:
15890
diff
changeset
|
1963 |
|
51009
39fa0b948f5a
revlog: make the `candelta` method private
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51008
diff
changeset
|
1964 def _candelta(self, baserev, rev): |
|
35839
d031609b3cb7
changegroup: do not delta lfs revisions
Jun Wu <quark@fb.com>
parents:
35738
diff
changeset
|
1965 """whether two revisions (baserev, rev) can be delta-ed or not""" |
|
d031609b3cb7
changegroup: do not delta lfs revisions
Jun Wu <quark@fb.com>
parents:
35738
diff
changeset
|
1966 # Disable delta if either rev requires a content-changing flag |
|
d031609b3cb7
changegroup: do not delta lfs revisions
Jun Wu <quark@fb.com>
parents:
35738
diff
changeset
|
1967 # processor (ex. LFS). This is because such flag processor can alter |
|
d031609b3cb7
changegroup: do not delta lfs revisions
Jun Wu <quark@fb.com>
parents:
35738
diff
changeset
|
1968 # the rawtext content that the delta will be based on, and two clients |
|
d031609b3cb7
changegroup: do not delta lfs revisions
Jun Wu <quark@fb.com>
parents:
35738
diff
changeset
|
1969 # could have a same revlog node with different flags (i.e. different |
|
d031609b3cb7
changegroup: do not delta lfs revisions
Jun Wu <quark@fb.com>
parents:
35738
diff
changeset
|
1970 # rawtext contents) and the delta could be incompatible. |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1971 if (self.flags(baserev) & REVIDX_RAWTEXT_CHANGING_FLAGS) or ( |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1972 self.flags(rev) & REVIDX_RAWTEXT_CHANGING_FLAGS |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
1973 ): |
|
35839
d031609b3cb7
changegroup: do not delta lfs revisions
Jun Wu <quark@fb.com>
parents:
35738
diff
changeset
|
1974 return False |
|
d031609b3cb7
changegroup: do not delta lfs revisions
Jun Wu <quark@fb.com>
parents:
35738
diff
changeset
|
1975 return True |
|
d031609b3cb7
changegroup: do not delta lfs revisions
Jun Wu <quark@fb.com>
parents:
35738
diff
changeset
|
1976 |
|
44465
336ec75ed1ac
nodemap: warm the persistent nodemap on disk with debugupdatecache
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44397
diff
changeset
|
1977 def update_caches(self, transaction): |
|
51010
569eb5d0420d
revlog: document the `update_caches` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51009
diff
changeset
|
1978 """update on disk cache |
|
569eb5d0420d
revlog: document the `update_caches` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51009
diff
changeset
|
1979 |
|
569eb5d0420d
revlog: document the `update_caches` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51009
diff
changeset
|
1980 If a transaction is passed, the update may be delayed to transaction |
|
569eb5d0420d
revlog: document the `update_caches` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51009
diff
changeset
|
1981 commit.""" |
|
47178
04f2f94836a5
revlog: rename `nodemap_file` to `_nodemap_file`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47177
diff
changeset
|
1982 if self._nodemap_file is not None: |
|
44465
336ec75ed1ac
nodemap: warm the persistent nodemap on disk with debugupdatecache
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44397
diff
changeset
|
1983 if transaction is None: |
|
336ec75ed1ac
nodemap: warm the persistent nodemap on disk with debugupdatecache
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44397
diff
changeset
|
1984 nodemaputil.update_persistent_nodemap(self) |
|
336ec75ed1ac
nodemap: warm the persistent nodemap on disk with debugupdatecache
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44397
diff
changeset
|
1985 else: |
|
336ec75ed1ac
nodemap: warm the persistent nodemap on disk with debugupdatecache
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44397
diff
changeset
|
1986 nodemaputil.setup_persistent_nodemap(transaction, self) |
|
336ec75ed1ac
nodemap: warm the persistent nodemap on disk with debugupdatecache
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44397
diff
changeset
|
1987 |
|
51909
5e79783d4bc7
revlog: make `clearcaches()` signature consistent with ManifestRevlog
Matt Harbison <matt_harbison@yahoo.com>
parents:
51908
diff
changeset
|
1988 def clearcaches(self, clear_persisted_data: bool = False) -> None: |
|
51011
6c3798b4597f
revlog: document the `clearcaches` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51010
diff
changeset
|
1989 """Clear in-memory caches""" |
|
29841
92ac2baaea86
revlog: use an LRU cache for delta chain bases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29840
diff
changeset
|
1990 self._chainbasecache.clear() |
|
51105
045b5f745f93
revlog: consolidate cache invalidation within the inner objet
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51103
diff
changeset
|
1991 self._inner.clear_cache() |
|
27465
072a675c51f2
revlog: make clearcaches() more effective
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27449
diff
changeset
|
1992 self._pcache = {} |
|
44511
87b327de772c
nodemap: refresh the persistent data on nodemap creation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44503
diff
changeset
|
1993 self._nodemap_docket = None |
|
43573
845e5b313783
revlog: move the nodemap into the index object (for pure)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43572
diff
changeset
|
1994 self.index.clearcaches() |
|
44511
87b327de772c
nodemap: refresh the persistent data on nodemap creation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44503
diff
changeset
|
1995 # The python code is the one responsible for validating the docket, we |
|
87b327de772c
nodemap: refresh the persistent data on nodemap creation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44503
diff
changeset
|
1996 # end up having to refresh it here. |
|
87b327de772c
nodemap: refresh the persistent data on nodemap creation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44503
diff
changeset
|
1997 use_nodemap = ( |
|
87b327de772c
nodemap: refresh the persistent data on nodemap creation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44503
diff
changeset
|
1998 not self._inline |
|
47178
04f2f94836a5
revlog: rename `nodemap_file` to `_nodemap_file`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47177
diff
changeset
|
1999 and self._nodemap_file is not None |
|
50951
d718eddf01d9
safehasattr: drop usage in favor of hasattr
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50761
diff
changeset
|
2000 and hasattr(self.index, 'update_nodemap_data') |
|
44511
87b327de772c
nodemap: refresh the persistent data on nodemap creation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44503
diff
changeset
|
2001 ) |
|
87b327de772c
nodemap: refresh the persistent data on nodemap creation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44503
diff
changeset
|
2002 if use_nodemap: |
|
87b327de772c
nodemap: refresh the persistent data on nodemap creation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44503
diff
changeset
|
2003 nodemap_data = nodemaputil.persisted_data(self) |
|
87b327de772c
nodemap: refresh the persistent data on nodemap creation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44503
diff
changeset
|
2004 if nodemap_data is not None: |
|
87b327de772c
nodemap: refresh the persistent data on nodemap creation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44503
diff
changeset
|
2005 self._nodemap_docket = nodemap_data[0] |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2006 self.index.update_nodemap_data( |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2007 *nodemap_data |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2008 ) # pytype: disable=attribute-error |
|
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16375
diff
changeset
|
2009 |
|
13259
3b616dfa4b17
revlog: do revlog node->rev mapping by scanning
Matt Mackall <mpm@selenic.com>
parents:
13258
diff
changeset
|
2010 def rev(self, node): |
|
51012
ccddd2f54013
revlog: document the `rev` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51011
diff
changeset
|
2011 """return the revision number associated with a <nodeid>""" |
|
13275
68da048b4c88
revlog: incrementally build node cache with linear searches
Matt Mackall <mpm@selenic.com>
parents:
13268
diff
changeset
|
2012 try: |
|
43601
2da51e292734
index: use `index.rev` in `revlog.rev`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43600
diff
changeset
|
2013 return self.index.rev(node) |
|
22282
4092d12ba18a
repoview: fix 0L with pack/unpack for 2.4
Matt Mackall <mpm@selenic.com>
parents:
21752
diff
changeset
|
2014 except TypeError: |
|
4092d12ba18a
repoview: fix 0L with pack/unpack for 2.4
Matt Mackall <mpm@selenic.com>
parents:
21752
diff
changeset
|
2015 raise |
|
39789
2cd93a8d4bde
revlog: drop RevlogError alias (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39785
diff
changeset
|
2016 except error.RevlogError: |
|
43573
845e5b313783
revlog: move the nodemap into the index object (for pure)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43572
diff
changeset
|
2017 # parsers.c radix tree lookup failed |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2018 if ( |
|
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2019 node == self.nodeconstants.wdirid |
|
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2020 or node in self.nodeconstants.wdirfilenodeids |
|
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2021 ): |
|
43573
845e5b313783
revlog: move the nodemap into the index object (for pure)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43572
diff
changeset
|
2022 raise error.WdirUnsupported |
|
47169
96ee8ca99f5a
revlog: use revlog.display_id in LookupError
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47167
diff
changeset
|
2023 raise error.LookupError(node, self.display_id, _(b'no node')) |
|
13275
68da048b4c88
revlog: incrementally build node cache with linear searches
Matt Mackall <mpm@selenic.com>
parents:
13268
diff
changeset
|
2024 |
|
30301
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2025 # Accessors for index entries. |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2026 |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2027 # First tuple entry is 8 bytes. First 6 bytes are offset. Last 2 bytes |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2028 # are flags. |
| 2072 | 2029 def start(self, rev): |
|
5006
c2febf5420e9
revlog: minor chunk speed-up
Matt Mackall <mpm@selenic.com>
parents:
5005
diff
changeset
|
2030 return int(self.index[rev][0] >> 16) |
|
30301
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2031 |
|
47395
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2032 def sidedata_cut_off(self, rev): |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2033 sd_cut_off = self.index[rev][8] |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2034 if sd_cut_off != 0: |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2035 return sd_cut_off |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2036 # This is some annoying dance, because entries without sidedata |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2037 # currently use 0 as their ofsset. (instead of previous-offset + |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2038 # previous-size) |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2039 # |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2040 # We should reconsider this sidedata → 0 sidata_offset policy. |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2041 # In the meantime, we need this. |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2042 while 0 <= rev: |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2043 e = self.index[rev] |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2044 if e[9] != 0: |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2045 return e[8] + e[9] |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2046 rev -= 1 |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2047 return 0 |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
2048 |
|
30301
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2049 def flags(self, rev): |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2050 return self.index[rev][0] & 0xFFFF |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2051 |
|
4980
fc44c8df9d99
revlog: some codingstyle cleanups
Matt Mackall <mpm@selenic.com>
parents:
4979
diff
changeset
|
2052 def length(self, rev): |
|
fc44c8df9d99
revlog: some codingstyle cleanups
Matt Mackall <mpm@selenic.com>
parents:
4979
diff
changeset
|
2053 return self.index[rev][1] |
|
30301
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2054 |
|
46722
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
2055 def sidedata_length(self, rev): |
|
51066
7c2dc75cdc0f
revlog: remove legacy usage of `hassidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51065
diff
changeset
|
2056 if not self.feature_config.has_side_data: |
|
46722
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
2057 return 0 |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
2058 return self.index[rev][9] |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
2059 |
|
30301
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2060 def rawsize(self, rev): |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2061 """return the length of the uncompressed text for a given revision""" |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2062 l = self.index[rev][2] |
|
38210
7fa3408f83ef
revlog: disallow setting uncompressed length to None
Yuya Nishihara <yuya@tcha.org>
parents:
38202
diff
changeset
|
2063 if l >= 0: |
|
30301
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2064 return l |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2065 |
|
42784
5a8f2c8edff6
rawdata: update caller in revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42749
diff
changeset
|
2066 t = self.rawdata(rev) |
|
30301
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2067 return len(t) |
|
31856
0ab7f469d386
revlog: make "size" diverge from "rawsize"
Jun Wu <quark@fb.com>
parents:
31804
diff
changeset
|
2068 |
|
0ab7f469d386
revlog: make "size" diverge from "rawsize"
Jun Wu <quark@fb.com>
parents:
31804
diff
changeset
|
2069 def size(self, rev): |
|
0ab7f469d386
revlog: make "size" diverge from "rawsize"
Jun Wu <quark@fb.com>
parents:
31804
diff
changeset
|
2070 """length of non-raw text (processed by a "read" flag processor)""" |
|
0ab7f469d386
revlog: make "size" diverge from "rawsize"
Jun Wu <quark@fb.com>
parents:
31804
diff
changeset
|
2071 # fast path: if no "read" flag processor could change the content, |
|
0ab7f469d386
revlog: make "size" diverge from "rawsize"
Jun Wu <quark@fb.com>
parents:
31804
diff
changeset
|
2072 # size is rawsize. note: ELLIPSIS is known to not change the content. |
|
0ab7f469d386
revlog: make "size" diverge from "rawsize"
Jun Wu <quark@fb.com>
parents:
31804
diff
changeset
|
2073 flags = self.flags(rev) |
|
42747
92ac6b1697a7
flagutil: move REVIDX_KNOWN_FLAGS source of truth in flagutil (API)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42746
diff
changeset
|
2074 if flags & (flagutil.REVIDX_KNOWN_FLAGS ^ REVIDX_ELLIPSIS) == 0: |
|
31856
0ab7f469d386
revlog: make "size" diverge from "rawsize"
Jun Wu <quark@fb.com>
parents:
31804
diff
changeset
|
2075 return self.rawsize(rev) |
|
0ab7f469d386
revlog: make "size" diverge from "rawsize"
Jun Wu <quark@fb.com>
parents:
31804
diff
changeset
|
2076 |
|
48564
c514936d92b4
revlog: remove deprecated APIs
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48287
diff
changeset
|
2077 return len(self.revision(rev)) |
|
30301
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2078 |
|
48764
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
2079 def fast_rank(self, rev): |
|
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
2080 """Return the rank of a revision if already known, or None otherwise. |
|
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
2081 |
|
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
2082 The rank of a revision is the size of the sub-graph it defines as a |
|
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
2083 head. Equivalently, the rank of a revision `r` is the size of the set |
|
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
2084 `ancestors(r)`, `r` included. |
|
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
2085 |
|
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
2086 This method returns the rank retrieved from the revlog in constant |
|
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
2087 time. It makes no attempt at computing unknown values for versions of |
|
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
2088 the revlog which do not persist the rank. |
|
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
2089 """ |
|
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
2090 rank = self.index[rev][ENTRY_RANK] |
|
48942
d739cd69bb6a
revlog: return 0 for the fast_rank of nullrev
pacien <pacien.trangirard@pacien.net>
parents:
48772
diff
changeset
|
2091 if self._format_version != CHANGELOGV2 or rank == RANK_UNKNOWN: |
|
48764
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
2092 return None |
|
48942
d739cd69bb6a
revlog: return 0 for the fast_rank of nullrev
pacien <pacien.trangirard@pacien.net>
parents:
48772
diff
changeset
|
2093 if rev == nullrev: |
|
d739cd69bb6a
revlog: return 0 for the fast_rank of nullrev
pacien <pacien.trangirard@pacien.net>
parents:
48772
diff
changeset
|
2094 return 0 # convention |
|
48764
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
2095 return rank |
|
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
2096 |
|
14252
19067884c5f5
revlog: calculate base revisions iteratively
Sune Foldager <cryo@cyanite.org>
parents:
14251
diff
changeset
|
2097 def chainbase(self, rev): |
|
29841
92ac2baaea86
revlog: use an LRU cache for delta chain bases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29840
diff
changeset
|
2098 base = self._chainbasecache.get(rev) |
|
92ac2baaea86
revlog: use an LRU cache for delta chain bases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29840
diff
changeset
|
2099 if base is not None: |
|
92ac2baaea86
revlog: use an LRU cache for delta chain bases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29840
diff
changeset
|
2100 return base |
|
92ac2baaea86
revlog: use an LRU cache for delta chain bases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29840
diff
changeset
|
2101 |
|
14252
19067884c5f5
revlog: calculate base revisions iteratively
Sune Foldager <cryo@cyanite.org>
parents:
14251
diff
changeset
|
2102 index = self.index |
|
38202
fc72beec2a1a
revlog: make chainbase cache its result for the correct revision
Paul Morelle <paul.morelle@octobus.net>
parents:
38201
diff
changeset
|
2103 iterrev = rev |
|
fc72beec2a1a
revlog: make chainbase cache its result for the correct revision
Paul Morelle <paul.morelle@octobus.net>
parents:
38201
diff
changeset
|
2104 base = index[iterrev][3] |
|
fc72beec2a1a
revlog: make chainbase cache its result for the correct revision
Paul Morelle <paul.morelle@octobus.net>
parents:
38201
diff
changeset
|
2105 while base != iterrev: |
|
fc72beec2a1a
revlog: make chainbase cache its result for the correct revision
Paul Morelle <paul.morelle@octobus.net>
parents:
38201
diff
changeset
|
2106 iterrev = base |
|
fc72beec2a1a
revlog: make chainbase cache its result for the correct revision
Paul Morelle <paul.morelle@octobus.net>
parents:
38201
diff
changeset
|
2107 base = index[iterrev][3] |
|
29841
92ac2baaea86
revlog: use an LRU cache for delta chain bases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29840
diff
changeset
|
2108 |
|
92ac2baaea86
revlog: use an LRU cache for delta chain bases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29840
diff
changeset
|
2109 self._chainbasecache[rev] = base |
|
14252
19067884c5f5
revlog: calculate base revisions iteratively
Sune Foldager <cryo@cyanite.org>
parents:
14251
diff
changeset
|
2110 return base |
|
30301
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2111 |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2112 def linkrev(self, rev): |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2113 return self.index[rev][4] |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2114 |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2115 def parentrevs(self, rev): |
|
32441
a28c76e1cea9
revlog: raise WdirUnsupported when wdirrev is passed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32431
diff
changeset
|
2116 try: |
|
35525
a0fab647a8f1
revlog: don't use slicing to return parents
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35354
diff
changeset
|
2117 entry = self.index[rev] |
|
32441
a28c76e1cea9
revlog: raise WdirUnsupported when wdirrev is passed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32431
diff
changeset
|
2118 except IndexError: |
|
a28c76e1cea9
revlog: raise WdirUnsupported when wdirrev is passed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32431
diff
changeset
|
2119 if rev == wdirrev: |
|
a28c76e1cea9
revlog: raise WdirUnsupported when wdirrev is passed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32431
diff
changeset
|
2120 raise error.WdirUnsupported |
|
a28c76e1cea9
revlog: raise WdirUnsupported when wdirrev is passed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32431
diff
changeset
|
2121 raise |
|
47052
411dc27fd9fd
corruption: backout changeset 49fd21f32695 (issue6528)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46974
diff
changeset
|
2122 |
|
51070
14574a41a7a7
revlog: remove legacy usage of `canonical_parent_order`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51069
diff
changeset
|
2123 if self.feature_config.canonical_parent_order and entry[5] == nullrev: |
|
49077
5b65721a75eb
revlog: recommit 49fd21f32695 with a fix for issue6528
Joerg Sonnenberger <joerg@bec.de>
parents:
49037
diff
changeset
|
2124 return entry[6], entry[5] |
|
5b65721a75eb
revlog: recommit 49fd21f32695 with a fix for issue6528
Joerg Sonnenberger <joerg@bec.de>
parents:
49037
diff
changeset
|
2125 else: |
|
5b65721a75eb
revlog: recommit 49fd21f32695 with a fix for issue6528
Joerg Sonnenberger <joerg@bec.de>
parents:
49037
diff
changeset
|
2126 return entry[5], entry[6] |
|
35525
a0fab647a8f1
revlog: don't use slicing to return parents
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35354
diff
changeset
|
2127 |
|
40152
adbf8ca239e4
revlog: optimize ancestors() to not check filtered revisions for each
Yuya Nishihara <yuya@tcha.org>
parents:
40057
diff
changeset
|
2128 # fast parentrevs(rev) where rev isn't filtered |
|
adbf8ca239e4
revlog: optimize ancestors() to not check filtered revisions for each
Yuya Nishihara <yuya@tcha.org>
parents:
40057
diff
changeset
|
2129 _uncheckedparentrevs = parentrevs |
|
adbf8ca239e4
revlog: optimize ancestors() to not check filtered revisions for each
Yuya Nishihara <yuya@tcha.org>
parents:
40057
diff
changeset
|
2130 |
|
30301
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2131 def node(self, rev): |
|
32481
34e9b8b94f66
revlog: raise error.WdirUnsupported from revlog.node() if wdirrev is passed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32441
diff
changeset
|
2132 try: |
|
34e9b8b94f66
revlog: raise error.WdirUnsupported from revlog.node() if wdirrev is passed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32441
diff
changeset
|
2133 return self.index[rev][7] |
|
34e9b8b94f66
revlog: raise error.WdirUnsupported from revlog.node() if wdirrev is passed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32441
diff
changeset
|
2134 except IndexError: |
|
34e9b8b94f66
revlog: raise error.WdirUnsupported from revlog.node() if wdirrev is passed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32441
diff
changeset
|
2135 if rev == wdirrev: |
|
34e9b8b94f66
revlog: raise error.WdirUnsupported from revlog.node() if wdirrev is passed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32441
diff
changeset
|
2136 raise error.WdirUnsupported |
|
34e9b8b94f66
revlog: raise error.WdirUnsupported from revlog.node() if wdirrev is passed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32441
diff
changeset
|
2137 raise |
|
30301
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2138 |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2139 # Derived from index values. |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2140 |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2141 def end(self, rev): |
|
46723
4cd214c9948d
revlogv2: don't assume that the sidedata of the last rev is right after data
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46722
diff
changeset
|
2142 return self.start(rev) + self.length(rev) |
|
30301
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2143 |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2144 def parents(self, node): |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2145 i = self.index |
|
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2146 d = i[self.rev(node)] |
|
49077
5b65721a75eb
revlog: recommit 49fd21f32695 with a fix for issue6528
Joerg Sonnenberger <joerg@bec.de>
parents:
49037
diff
changeset
|
2147 # inline node() to avoid function call overhead |
|
51070
14574a41a7a7
revlog: remove legacy usage of `canonical_parent_order`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51069
diff
changeset
|
2148 if self.feature_config.canonical_parent_order and d[5] == self.nullid: |
|
49077
5b65721a75eb
revlog: recommit 49fd21f32695 with a fix for issue6528
Joerg Sonnenberger <joerg@bec.de>
parents:
49037
diff
changeset
|
2149 return i[d[6]][7], i[d[5]][7] |
|
5b65721a75eb
revlog: recommit 49fd21f32695 with a fix for issue6528
Joerg Sonnenberger <joerg@bec.de>
parents:
49037
diff
changeset
|
2150 else: |
|
5b65721a75eb
revlog: recommit 49fd21f32695 with a fix for issue6528
Joerg Sonnenberger <joerg@bec.de>
parents:
49037
diff
changeset
|
2151 return i[d[5]][7], i[d[6]][7] |
|
30301
0986f225c149
revlog: reorder index accessors to match data structure order
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30210
diff
changeset
|
2152 |
|
23254
d23834b871ac
debugrevlog: fix computing chain length in debugrevlog -d
Mateusz Kwapich <mitrandir@fb.com>
parents:
22934
diff
changeset
|
2153 def chainlen(self, rev): |
|
23286
40e0067899d4
revlog: compute length of compressed deltas along with chain length
Siddharth Agarwal <sid0@fb.com>
parents:
23285
diff
changeset
|
2154 return self._chaininfo(rev)[0] |
|
23306
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2155 |
|
23286
40e0067899d4
revlog: compute length of compressed deltas along with chain length
Siddharth Agarwal <sid0@fb.com>
parents:
23285
diff
changeset
|
2156 def _chaininfo(self, rev): |
|
23306
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2157 chaininfocache = self._chaininfocache |
|
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2158 if rev in chaininfocache: |
|
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2159 return chaininfocache[rev] |
|
23254
d23834b871ac
debugrevlog: fix computing chain length in debugrevlog -d
Mateusz Kwapich <mitrandir@fb.com>
parents:
22934
diff
changeset
|
2160 index = self.index |
|
51051
f636103c4d67
revlog: remove legacy usage of `_generaldelta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51049
diff
changeset
|
2161 generaldelta = self.delta_config.general_delta |
|
23254
d23834b871ac
debugrevlog: fix computing chain length in debugrevlog -d
Mateusz Kwapich <mitrandir@fb.com>
parents:
22934
diff
changeset
|
2162 iterrev = rev |
|
d23834b871ac
debugrevlog: fix computing chain length in debugrevlog -d
Mateusz Kwapich <mitrandir@fb.com>
parents:
22934
diff
changeset
|
2163 e = index[iterrev] |
|
d23834b871ac
debugrevlog: fix computing chain length in debugrevlog -d
Mateusz Kwapich <mitrandir@fb.com>
parents:
22934
diff
changeset
|
2164 clen = 0 |
|
23286
40e0067899d4
revlog: compute length of compressed deltas along with chain length
Siddharth Agarwal <sid0@fb.com>
parents:
23285
diff
changeset
|
2165 compresseddeltalen = 0 |
|
23254
d23834b871ac
debugrevlog: fix computing chain length in debugrevlog -d
Mateusz Kwapich <mitrandir@fb.com>
parents:
22934
diff
changeset
|
2166 while iterrev != e[3]: |
|
d23834b871ac
debugrevlog: fix computing chain length in debugrevlog -d
Mateusz Kwapich <mitrandir@fb.com>
parents:
22934
diff
changeset
|
2167 clen += 1 |
|
23286
40e0067899d4
revlog: compute length of compressed deltas along with chain length
Siddharth Agarwal <sid0@fb.com>
parents:
23285
diff
changeset
|
2168 compresseddeltalen += e[1] |
|
23254
d23834b871ac
debugrevlog: fix computing chain length in debugrevlog -d
Mateusz Kwapich <mitrandir@fb.com>
parents:
22934
diff
changeset
|
2169 if generaldelta: |
|
d23834b871ac
debugrevlog: fix computing chain length in debugrevlog -d
Mateusz Kwapich <mitrandir@fb.com>
parents:
22934
diff
changeset
|
2170 iterrev = e[3] |
|
d23834b871ac
debugrevlog: fix computing chain length in debugrevlog -d
Mateusz Kwapich <mitrandir@fb.com>
parents:
22934
diff
changeset
|
2171 else: |
|
d23834b871ac
debugrevlog: fix computing chain length in debugrevlog -d
Mateusz Kwapich <mitrandir@fb.com>
parents:
22934
diff
changeset
|
2172 iterrev -= 1 |
|
23306
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2173 if iterrev in chaininfocache: |
|
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2174 t = chaininfocache[iterrev] |
|
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2175 clen += t[0] |
|
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2176 compresseddeltalen += t[1] |
|
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2177 break |
|
23254
d23834b871ac
debugrevlog: fix computing chain length in debugrevlog -d
Mateusz Kwapich <mitrandir@fb.com>
parents:
22934
diff
changeset
|
2178 e = index[iterrev] |
|
23306
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2179 else: |
|
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2180 # Add text length of base since decompressing that also takes |
|
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2181 # work. For cache hits the length is already included. |
|
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2182 compresseddeltalen += e[1] |
|
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2183 r = (clen, compresseddeltalen) |
|
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2184 chaininfocache[rev] = r |
|
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2185 return r |
|
f7a42f8e82bd
revlog: cache chain info after calculating it for a rev (issue4452)
Siddharth Agarwal <sid0@fb.com>
parents:
23288
diff
changeset
|
2186 |
|
27468
93ac15f03331
revlog: refactor delta chain computation into own function
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27465
diff
changeset
|
2187 def _deltachain(self, rev, stoprev=None): |
|
51099
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
2188 return self._inner._deltachain(rev, stoprev=stoprev) |
|
27468
93ac15f03331
revlog: refactor delta chain computation into own function
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27465
diff
changeset
|
2189 |
|
18081
f88c60e740a1
revlog.ancestors: add support for including revs
Siddharth Agarwal <sid0@fb.com>
parents:
17975
diff
changeset
|
2190 def ancestors(self, revs, stoprev=0, inclusive=False): |
|
40772
8947f49daaa8
revlog: update the docstring of `ancestors` to match reality
Boris Feld <boris.feld@octobus.net>
parents:
40671
diff
changeset
|
2191 """Generate the ancestors of 'revs' in reverse revision order. |
|
16868
eb88ed4269c5
revlog: add optional stoprev arg to revlog.ancestors()
Joshua Redstone <joshua.redstone@fb.com>
parents:
16867
diff
changeset
|
2192 Does not generate revs lower than stoprev. |
|
10047
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2193 |
|
18090
9abc55ef85b5
revlog: move ancestor generation out to a new class
Siddharth Agarwal <sid0@fb.com>
parents:
18083
diff
changeset
|
2194 See the documentation for ancestor.lazyancestors for more details.""" |
|
18081
f88c60e740a1
revlog.ancestors: add support for including revs
Siddharth Agarwal <sid0@fb.com>
parents:
17975
diff
changeset
|
2195 |
|
40152
adbf8ca239e4
revlog: optimize ancestors() to not check filtered revisions for each
Yuya Nishihara <yuya@tcha.org>
parents:
40057
diff
changeset
|
2196 # first, make sure start revisions aren't filtered |
|
adbf8ca239e4
revlog: optimize ancestors() to not check filtered revisions for each
Yuya Nishihara <yuya@tcha.org>
parents:
40057
diff
changeset
|
2197 revs = list(revs) |
|
adbf8ca239e4
revlog: optimize ancestors() to not check filtered revisions for each
Yuya Nishihara <yuya@tcha.org>
parents:
40057
diff
changeset
|
2198 checkrev = self.node |
|
adbf8ca239e4
revlog: optimize ancestors() to not check filtered revisions for each
Yuya Nishihara <yuya@tcha.org>
parents:
40057
diff
changeset
|
2199 for r in revs: |
|
adbf8ca239e4
revlog: optimize ancestors() to not check filtered revisions for each
Yuya Nishihara <yuya@tcha.org>
parents:
40057
diff
changeset
|
2200 checkrev(r) |
|
adbf8ca239e4
revlog: optimize ancestors() to not check filtered revisions for each
Yuya Nishihara <yuya@tcha.org>
parents:
40057
diff
changeset
|
2201 # and we're sure ancestors aren't filtered as well |
|
41118
536c83535cbd
rust-cpython: using the new bindings from Python
Georges Racinet <gracinet@anybox.fr>
parents:
41089
diff
changeset
|
2202 |
|
47280
6be2a7ca4b1d
revlog: do not call Rust code if the index is not compatible with it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47277
diff
changeset
|
2203 if rustancestor is not None and self.index.rust_ext_compat: |
|
42468
a3a8887e4426
rust: using policy.importrust from Python callers
Georges Racinet <georges.racinet@octobus.net>
parents:
42462
diff
changeset
|
2204 lazyancestors = rustancestor.LazyAncestors |
|
41118
536c83535cbd
rust-cpython: using the new bindings from Python
Georges Racinet <gracinet@anybox.fr>
parents:
41089
diff
changeset
|
2205 arg = self.index |
|
536c83535cbd
rust-cpython: using the new bindings from Python
Georges Racinet <gracinet@anybox.fr>
parents:
41089
diff
changeset
|
2206 else: |
|
536c83535cbd
rust-cpython: using the new bindings from Python
Georges Racinet <gracinet@anybox.fr>
parents:
41089
diff
changeset
|
2207 lazyancestors = ancestor.lazyancestors |
|
536c83535cbd
rust-cpython: using the new bindings from Python
Georges Racinet <gracinet@anybox.fr>
parents:
41089
diff
changeset
|
2208 arg = self._uncheckedparentrevs |
|
536c83535cbd
rust-cpython: using the new bindings from Python
Georges Racinet <gracinet@anybox.fr>
parents:
41089
diff
changeset
|
2209 return lazyancestors(arg, revs, stoprev=stoprev, inclusive=inclusive) |
|
6872
c7cc40fd74f6
Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6750
diff
changeset
|
2210 |
|
16867
1093ad1e8903
revlog: descendants(*revs) becomes descendants(revs) (API)
Bryan O'Sullivan <bryano@fb.com>
parents:
16866
diff
changeset
|
2211 def descendants(self, revs): |
|
40000
0b24fcd88066
dagop: extract descendants() from revlog module
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39913
diff
changeset
|
2212 return dagop.descendantrevs(revs, self.revs, self.parentrevs) |
|
6872
c7cc40fd74f6
Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6750
diff
changeset
|
2213 |
|
13741
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2214 def findcommonmissing(self, common=None, heads=None): |
|
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2215 """Return a tuple of the ancestors of common and the ancestors of heads |
|
15835
fa15869bf95c
revlog: improve docstring for findcommonmissing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15827
diff
changeset
|
2216 that are not ancestors of common. In revset terminology, we return the |
|
fa15869bf95c
revlog: improve docstring for findcommonmissing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15827
diff
changeset
|
2217 tuple: |
|
10047
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2218 |
|
15835
fa15869bf95c
revlog: improve docstring for findcommonmissing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15827
diff
changeset
|
2219 ::common, (::heads) - (::common) |
|
7233
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2220 |
|
10047
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2221 The list is sorted by revision number, meaning it is |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2222 topologically sorted. |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2223 |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2224 'heads' and 'common' are both lists of node IDs. If heads is |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2225 not supplied, uses all of the revlog's heads. If common is not |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2226 supplied, uses nullid.""" |
|
7233
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2227 if common is None: |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2228 common = [self.nullid] |
|
7233
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2229 if heads is None: |
|
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2230 heads = self.heads() |
|
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2231 |
|
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2232 common = [self.rev(n) for n in common] |
|
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2233 heads = [self.rev(n) for n in heads] |
|
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2234 |
|
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2235 # we want the ancestors, but inclusive |
|
49037
642e31cb55f0
py3: use class X: instead of class X(object):
Gregory Szorc <gregory.szorc@gmail.com>
parents:
49019
diff
changeset
|
2236 class lazyset: |
|
20073
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2237 def __init__(self, lazyvalues): |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2238 self.addedvalues = set() |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2239 self.lazyvalues = lazyvalues |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2240 |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2241 def __contains__(self, value): |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2242 return value in self.addedvalues or value in self.lazyvalues |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2243 |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2244 def __iter__(self): |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2245 added = self.addedvalues |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2246 for r in added: |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2247 yield r |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2248 for r in self.lazyvalues: |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2249 if not r in added: |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2250 yield r |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2251 |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2252 def add(self, value): |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2253 self.addedvalues.add(value) |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2254 |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2255 def update(self, values): |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2256 self.addedvalues.update(values) |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2257 |
|
eeba4eaf0716
revlog: return lazy set from findcommonmissing
Durham Goode <durham@fb.com>
parents:
19776
diff
changeset
|
2258 has = lazyset(self.ancestors(common)) |
|
8152
08e1baf924ca
replace set-like dictionaries with real sets
Martin Geisler <mg@lazybytes.net>
parents:
8150
diff
changeset
|
2259 has.add(nullrev) |
|
08e1baf924ca
replace set-like dictionaries with real sets
Martin Geisler <mg@lazybytes.net>
parents:
8150
diff
changeset
|
2260 has.update(common) |
|
7233
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2261 |
|
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2262 # take all ancestors from heads that aren't in has |
|
8453
d1ca637b0773
revlog.missing(): use sets instead of a dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8391
diff
changeset
|
2263 missing = set() |
|
25113
0ca8410ea345
util: drop alias for collections.deque
Martin von Zweigbergk <martinvonz@google.com>
parents:
24454
diff
changeset
|
2264 visit = collections.deque(r for r in heads if r not in has) |
|
7233
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2265 while visit: |
|
16803
107a3270a24a
cleanup: use the deque type where appropriate
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
2266 r = visit.popleft() |
|
7233
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2267 if r in missing: |
|
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2268 continue |
|
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2269 else: |
|
8453
d1ca637b0773
revlog.missing(): use sets instead of a dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8391
diff
changeset
|
2270 missing.add(r) |
|
7233
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2271 for p in self.parentrevs(r): |
|
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2272 if p not in has: |
|
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2273 visit.append(p) |
|
8453
d1ca637b0773
revlog.missing(): use sets instead of a dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8391
diff
changeset
|
2274 missing = list(missing) |
|
7233
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2275 missing.sort() |
|
30401
2ded17b64f09
revlog: avoid shadowing several variables using list comprehensions
Augie Fackler <augie@google.com>
parents:
30303
diff
changeset
|
2276 return has, [self.node(miss) for miss in missing] |
|
13741
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2277 |
|
23337
3a8a763f4197
revlog: add a method to get missing revs incrementally
Siddharth Agarwal <sid0@fb.com>
parents:
23328
diff
changeset
|
2278 def incrementalmissingrevs(self, common=None): |
|
3a8a763f4197
revlog: add a method to get missing revs incrementally
Siddharth Agarwal <sid0@fb.com>
parents:
23328
diff
changeset
|
2279 """Return an object that can be used to incrementally compute the |
|
3a8a763f4197
revlog: add a method to get missing revs incrementally
Siddharth Agarwal <sid0@fb.com>
parents:
23328
diff
changeset
|
2280 revision numbers of the ancestors of arbitrary sets that are not |
|
3a8a763f4197
revlog: add a method to get missing revs incrementally
Siddharth Agarwal <sid0@fb.com>
parents:
23328
diff
changeset
|
2281 ancestors of common. This is an ancestor.incrementalmissingancestors |
|
3a8a763f4197
revlog: add a method to get missing revs incrementally
Siddharth Agarwal <sid0@fb.com>
parents:
23328
diff
changeset
|
2282 object. |
|
3a8a763f4197
revlog: add a method to get missing revs incrementally
Siddharth Agarwal <sid0@fb.com>
parents:
23328
diff
changeset
|
2283 |
|
3a8a763f4197
revlog: add a method to get missing revs incrementally
Siddharth Agarwal <sid0@fb.com>
parents:
23328
diff
changeset
|
2284 'common' is a list of revision numbers. If common is not supplied, uses |
|
3a8a763f4197
revlog: add a method to get missing revs incrementally
Siddharth Agarwal <sid0@fb.com>
parents:
23328
diff
changeset
|
2285 nullrev. |
|
3a8a763f4197
revlog: add a method to get missing revs incrementally
Siddharth Agarwal <sid0@fb.com>
parents:
23328
diff
changeset
|
2286 """ |
|
3a8a763f4197
revlog: add a method to get missing revs incrementally
Siddharth Agarwal <sid0@fb.com>
parents:
23328
diff
changeset
|
2287 if common is None: |
|
3a8a763f4197
revlog: add a method to get missing revs incrementally
Siddharth Agarwal <sid0@fb.com>
parents:
23328
diff
changeset
|
2288 common = [nullrev] |
|
3a8a763f4197
revlog: add a method to get missing revs incrementally
Siddharth Agarwal <sid0@fb.com>
parents:
23328
diff
changeset
|
2289 |
|
47280
6be2a7ca4b1d
revlog: do not call Rust code if the index is not compatible with it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47277
diff
changeset
|
2290 if rustancestor is not None and self.index.rust_ext_compat: |
|
42468
a3a8887e4426
rust: using policy.importrust from Python callers
Georges Racinet <georges.racinet@octobus.net>
parents:
42462
diff
changeset
|
2291 return rustancestor.MissingAncestors(self.index, common) |
|
23337
3a8a763f4197
revlog: add a method to get missing revs incrementally
Siddharth Agarwal <sid0@fb.com>
parents:
23328
diff
changeset
|
2292 return ancestor.incrementalmissingancestors(self.parentrevs, common) |
|
3a8a763f4197
revlog: add a method to get missing revs incrementally
Siddharth Agarwal <sid0@fb.com>
parents:
23328
diff
changeset
|
2293 |
|
17972
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2294 def findmissingrevs(self, common=None, heads=None): |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2295 """Return the revision numbers of the ancestors of heads that |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2296 are not ancestors of common. |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2297 |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2298 More specifically, return a list of revision numbers corresponding to |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2299 nodes N such that every N satisfies the following constraints: |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2300 |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2301 1. N is an ancestor of some node in 'heads' |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2302 2. N is not an ancestor of any node in 'common' |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2303 |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2304 The list is sorted by revision number, meaning it is |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2305 topologically sorted. |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2306 |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2307 'heads' and 'common' are both lists of revision numbers. If heads is |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2308 not supplied, uses all of the revlog's heads. If common is not |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2309 supplied, uses nullid.""" |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2310 if common is None: |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2311 common = [nullrev] |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2312 if heads is None: |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2313 heads = self.headrevs() |
|
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2314 |
|
23338
d8f5b2f50f41
revlog: switch findmissing* methods to incrementalmissingrevs
Siddharth Agarwal <sid0@fb.com>
parents:
23337
diff
changeset
|
2315 inc = self.incrementalmissingrevs(common=common) |
|
d8f5b2f50f41
revlog: switch findmissing* methods to incrementalmissingrevs
Siddharth Agarwal <sid0@fb.com>
parents:
23337
diff
changeset
|
2316 return inc.missingancestors(heads) |
|
17972
7ef00d09ef35
revlog: add rev-specific variant of findmissing
Siddharth Agarwal <sid0@fb.com>
parents:
17971
diff
changeset
|
2317 |
|
13741
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2318 def findmissing(self, common=None, heads=None): |
|
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2319 """Return the ancestors of heads that are not ancestors of common. |
|
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2320 |
|
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2321 More specifically, return a list of nodes N such that every N |
|
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2322 satisfies the following constraints: |
|
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2323 |
|
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2324 1. N is an ancestor of some node in 'heads' |
|
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2325 2. N is not an ancestor of any node in 'common' |
|
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2326 |
|
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2327 The list is sorted by revision number, meaning it is |
|
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2328 topologically sorted. |
|
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2329 |
|
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2330 'heads' and 'common' are both lists of node IDs. If heads is |
|
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2331 not supplied, uses all of the revlog's heads. If common is not |
|
b51bf961b3cb
wireproto: add getbundle() function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13400
diff
changeset
|
2332 supplied, uses nullid.""" |
|
17971
e1b9a78a7aed
revlog: switch findmissing to use ancestor.missingancestors
Siddharth Agarwal <sid0@fb.com>
parents:
17951
diff
changeset
|
2333 if common is None: |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2334 common = [self.nullid] |
|
17971
e1b9a78a7aed
revlog: switch findmissing to use ancestor.missingancestors
Siddharth Agarwal <sid0@fb.com>
parents:
17951
diff
changeset
|
2335 if heads is None: |
|
e1b9a78a7aed
revlog: switch findmissing to use ancestor.missingancestors
Siddharth Agarwal <sid0@fb.com>
parents:
17951
diff
changeset
|
2336 heads = self.heads() |
|
e1b9a78a7aed
revlog: switch findmissing to use ancestor.missingancestors
Siddharth Agarwal <sid0@fb.com>
parents:
17951
diff
changeset
|
2337 |
|
e1b9a78a7aed
revlog: switch findmissing to use ancestor.missingancestors
Siddharth Agarwal <sid0@fb.com>
parents:
17951
diff
changeset
|
2338 common = [self.rev(n) for n in common] |
|
e1b9a78a7aed
revlog: switch findmissing to use ancestor.missingancestors
Siddharth Agarwal <sid0@fb.com>
parents:
17951
diff
changeset
|
2339 heads = [self.rev(n) for n in heads] |
|
e1b9a78a7aed
revlog: switch findmissing to use ancestor.missingancestors
Siddharth Agarwal <sid0@fb.com>
parents:
17951
diff
changeset
|
2340 |
|
23338
d8f5b2f50f41
revlog: switch findmissing* methods to incrementalmissingrevs
Siddharth Agarwal <sid0@fb.com>
parents:
23337
diff
changeset
|
2341 inc = self.incrementalmissingrevs(common=common) |
|
d8f5b2f50f41
revlog: switch findmissing* methods to incrementalmissingrevs
Siddharth Agarwal <sid0@fb.com>
parents:
23337
diff
changeset
|
2342 return [self.node(r) for r in inc.missingancestors(heads)] |
|
7233
9f0e52e1df77
fix pull racing with push/commit (issue1320)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7109
diff
changeset
|
2343 |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2344 def nodesbetween(self, roots=None, heads=None): |
|
10047
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2345 """Return a topological path from 'roots' to 'heads'. |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2346 |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2347 Return a tuple (nodes, outroots, outheads) where 'nodes' is a |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2348 topologically sorted list of all nodes N that satisfy both of |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2349 these constraints: |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2350 |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2351 1. N is a descendant of some node in 'roots' |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2352 2. N is an ancestor of some node in 'heads' |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2353 |
|
10047
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2354 Every node is considered to be both a descendant and an ancestor |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2355 of itself, so every reachable node in 'roots' and 'heads' will be |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2356 included in 'nodes'. |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2357 |
|
10047
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2358 'outroots' is the list of reachable nodes in 'roots', i.e., the |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2359 subset of 'roots' that is returned in 'nodes'. Likewise, |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2360 'outheads' is the subset of 'heads' that is also in 'nodes'. |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2361 |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2362 'roots' and 'heads' are both lists of node IDs. If 'roots' is |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2363 unspecified, uses nullid as the only root. If 'heads' is |
|
27267b1f68b4
revlog: rewrite several method docstrings
Greg Ward <greg-hg@gerg.ca>
parents:
9679
diff
changeset
|
2364 unspecified, uses list of all of the revlog's heads.""" |
|
1463
26e73acc0cdf
Fix to handle case of empty list for roots or heads in nodesbetween.
Eric Hopper <hopper@omnifarious.org>
parents:
1459
diff
changeset
|
2365 nonodes = ([], [], []) |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2366 if roots is not None: |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2367 roots = list(roots) |
|
1463
26e73acc0cdf
Fix to handle case of empty list for roots or heads in nodesbetween.
Eric Hopper <hopper@omnifarious.org>
parents:
1459
diff
changeset
|
2368 if not roots: |
|
26e73acc0cdf
Fix to handle case of empty list for roots or heads in nodesbetween.
Eric Hopper <hopper@omnifarious.org>
parents:
1459
diff
changeset
|
2369 return nonodes |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2370 lowestrev = min([self.rev(n) for n in roots]) |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2371 else: |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2372 roots = [self.nullid] # Everybody's a descendant of nullid |
|
3578
3b4e00cba57a
Define and use nullrev (revision of nullid) instead of -1.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3508
diff
changeset
|
2373 lowestrev = nullrev |
|
3b4e00cba57a
Define and use nullrev (revision of nullid) instead of -1.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3508
diff
changeset
|
2374 if (lowestrev == nullrev) and (heads is None): |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2375 # We want _all_ the nodes! |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2376 return ( |
|
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2377 [self.node(r) for r in self], |
|
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2378 [self.nullid], |
|
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2379 list(self.heads()), |
|
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2380 ) |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2381 if heads is None: |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2382 # All nodes are ancestors, so the latest ancestor is the last |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2383 # node. |
|
6750
fb42030d79d6
add __len__ and __iter__ methods to repo and revlog
Matt Mackall <mpm@selenic.com>
parents:
6703
diff
changeset
|
2384 highestrev = len(self) - 1 |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2385 # Set ancestors to None to signal that every node is an ancestor. |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2386 ancestors = None |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2387 # Set heads to an empty dictionary for later discovery of heads |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2388 heads = {} |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2389 else: |
|
1463
26e73acc0cdf
Fix to handle case of empty list for roots or heads in nodesbetween.
Eric Hopper <hopper@omnifarious.org>
parents:
1459
diff
changeset
|
2390 heads = list(heads) |
|
26e73acc0cdf
Fix to handle case of empty list for roots or heads in nodesbetween.
Eric Hopper <hopper@omnifarious.org>
parents:
1459
diff
changeset
|
2391 if not heads: |
|
26e73acc0cdf
Fix to handle case of empty list for roots or heads in nodesbetween.
Eric Hopper <hopper@omnifarious.org>
parents:
1459
diff
changeset
|
2392 return nonodes |
|
8464
7af92e70bb25
revlog: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8453
diff
changeset
|
2393 ancestors = set() |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2394 # Turn heads into a dictionary so we can remove 'fake' heads. |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2395 # Also, later we will be using it to filter out the heads we can't |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2396 # find from roots. |
|
14219
c33427080671
revlog: use real Booleans instead of 0/1 in nodesbetween
Martin Geisler <mg@aragost.com>
parents:
14208
diff
changeset
|
2397 heads = dict.fromkeys(heads, False) |
|
3360
ef8307585b41
nodesbetween: fix a bug with duplicate heads
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3335
diff
changeset
|
2398 # Start at the top and keep marking parents until we're done. |
|
8163
62d7287fe6b0
rebase, revlog: use set(x) instead of set(x.keys())
Martin Geisler <mg@lazybytes.net>
parents:
8153
diff
changeset
|
2399 nodestotag = set(heads) |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2400 # Remember where the top was so we can use it as a limit later. |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2401 highestrev = max([self.rev(n) for n in nodestotag]) |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2402 while nodestotag: |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2403 # grab a node to tag |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2404 n = nodestotag.pop() |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2405 # Never tag nullid |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2406 if n == self.nullid: |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2407 continue |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2408 # A node's revision number represents its place in a |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2409 # topologically sorted list of nodes. |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2410 r = self.rev(n) |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2411 if r >= lowestrev: |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2412 if n not in ancestors: |
|
14549
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2413 # If we are possibly a descendant of one of the roots |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2414 # and we haven't already been marked as an ancestor |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2415 ancestors.add(n) # Mark as ancestor |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2416 # Add non-nullid parents to list of nodes to tag. |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2417 nodestotag.update( |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2418 [p for p in self.parents(n) if p != self.nullid] |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2419 ) |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2420 elif n in heads: # We've seen it before, is it a fake head? |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2421 # So it is, real heads should not be the ancestors of |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2422 # any other heads. |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2423 heads.pop(n) |
|
1459
106fdec8e1fb
Fix small bug in nodesbetween if heads is [nullid].
Eric Hopper <hopper@omnifarious.org>
parents:
1458
diff
changeset
|
2424 if not ancestors: |
|
1463
26e73acc0cdf
Fix to handle case of empty list for roots or heads in nodesbetween.
Eric Hopper <hopper@omnifarious.org>
parents:
1459
diff
changeset
|
2425 return nonodes |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2426 # Now that we have our set of ancestors, we want to remove any |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2427 # roots that are not ancestors. |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2428 |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2429 # If one of the roots was nullid, everything is included anyway. |
|
3578
3b4e00cba57a
Define and use nullrev (revision of nullid) instead of -1.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3508
diff
changeset
|
2430 if lowestrev > nullrev: |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2431 # But, since we weren't, let's recompute the lowest rev to not |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2432 # include roots that aren't ancestors. |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2433 |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2434 # Filter out roots that aren't ancestors of heads |
|
30401
2ded17b64f09
revlog: avoid shadowing several variables using list comprehensions
Augie Fackler <augie@google.com>
parents:
30303
diff
changeset
|
2435 roots = [root for root in roots if root in ancestors] |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2436 # Recompute the lowest revision |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2437 if roots: |
|
30401
2ded17b64f09
revlog: avoid shadowing several variables using list comprehensions
Augie Fackler <augie@google.com>
parents:
30303
diff
changeset
|
2438 lowestrev = min([self.rev(root) for root in roots]) |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2439 else: |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2440 # No more roots? Return empty list |
|
1463
26e73acc0cdf
Fix to handle case of empty list for roots or heads in nodesbetween.
Eric Hopper <hopper@omnifarious.org>
parents:
1459
diff
changeset
|
2441 return nonodes |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2442 else: |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2443 # We are descending from nullid, and don't need to care about |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2444 # any other roots. |
|
3578
3b4e00cba57a
Define and use nullrev (revision of nullid) instead of -1.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3508
diff
changeset
|
2445 lowestrev = nullrev |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2446 roots = [self.nullid] |
|
8152
08e1baf924ca
replace set-like dictionaries with real sets
Martin Geisler <mg@lazybytes.net>
parents:
8150
diff
changeset
|
2447 # Transform our roots list into a set. |
|
14549
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2448 descendants = set(roots) |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2449 # Also, keep the original roots so we can filter out roots that aren't |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2450 # 'real' roots (i.e. are descended from other roots). |
|
14549
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2451 roots = descendants.copy() |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2452 # Our topologically sorted list of output nodes. |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2453 orderedout = [] |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2454 # Don't start at nullid since we don't want nullid in our output list, |
| 17483 | 2455 # and if nullid shows up in descendants, empty parents will look like |
|
14549
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2456 # they're descendants. |
|
17672
474047947b8f
clfilter: make the revlog class responsible of all its iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17537
diff
changeset
|
2457 for r in self.revs(start=max(lowestrev, 0), stop=highestrev + 1): |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2458 n = self.node(r) |
|
14549
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2459 isdescendant = False |
|
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2460 if lowestrev == nullrev: # Everybody is a descendant of nullid |
|
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2461 isdescendant = True |
|
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2462 elif n in descendants: |
|
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2463 # n is already a descendant |
|
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2464 isdescendant = True |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2465 # This check only needs to be done here because all the roots |
|
14549
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2466 # will start being marked is descendants before the loop. |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2467 if n in roots: |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2468 # If n was a root, check if it's a 'real' root. |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2469 p = tuple(self.parents(n)) |
|
14549
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2470 # If any of its parents are descendants, it's not a root. |
|
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2471 if (p[0] in descendants) or (p[1] in descendants): |
|
8152
08e1baf924ca
replace set-like dictionaries with real sets
Martin Geisler <mg@lazybytes.net>
parents:
8150
diff
changeset
|
2472 roots.remove(n) |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2473 else: |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2474 p = tuple(self.parents(n)) |
|
14549
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2475 # A node is a descendant if either of its parents are |
|
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2476 # descendants. (We seeded the dependents list with the roots |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2477 # up there, remember?) |
|
14549
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2478 if (p[0] in descendants) or (p[1] in descendants): |
|
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2479 descendants.add(n) |
|
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2480 isdescendant = True |
|
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2481 if isdescendant and ((ancestors is None) or (n in ancestors)): |
|
48ec0763afbb
check-code: catch misspellings of descendant
Matt Mackall <mpm@selenic.com>
parents:
14523
diff
changeset
|
2482 # Only include nodes that are both descendants and ancestors. |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2483 orderedout.append(n) |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2484 if (ancestors is not None) and (n in heads): |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2485 # We're trying to figure out which heads are reachable |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2486 # from roots. |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2487 # Mark this head as having been reached |
|
14219
c33427080671
revlog: use real Booleans instead of 0/1 in nodesbetween
Martin Geisler <mg@aragost.com>
parents:
14208
diff
changeset
|
2488 heads[n] = True |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2489 elif ancestors is None: |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2490 # Otherwise, we're trying to discover the heads. |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2491 # Assume this is a head because if it isn't, the next step |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2492 # will eventually remove it. |
|
14219
c33427080671
revlog: use real Booleans instead of 0/1 in nodesbetween
Martin Geisler <mg@aragost.com>
parents:
14208
diff
changeset
|
2493 heads[n] = True |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2494 # But, obviously its parents aren't. |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2495 for p in self.parents(n): |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2496 heads.pop(p, None) |
|
49004
f254fc73d956
global: bulk replace simple pycompat.iteritems(x) with x.items()
Gregory Szorc <gregory.szorc@gmail.com>
parents:
48966
diff
changeset
|
2497 heads = [head for head, flag in heads.items() if flag] |
|
8152
08e1baf924ca
replace set-like dictionaries with real sets
Martin Geisler <mg@lazybytes.net>
parents:
8150
diff
changeset
|
2498 roots = list(roots) |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2499 assert orderedout |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2500 assert roots |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2501 assert heads |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2502 return (orderedout, roots, heads) |
|
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1351
diff
changeset
|
2503 |
|
52007
42a116f1cdc1
branchmap-v3: introduce a "stop_rev" argument to `headsrevs`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51999
diff
changeset
|
2504 def headrevs(self, revs=None, stop_rev=None): |
|
41275
1421d0487a61
revlog: accept a revs argument in `headrevs`
Boris Feld <boris.feld@octobus.net>
parents:
41247
diff
changeset
|
2505 if revs is None: |
|
52009
609700e5d8df
head-revs: add a native implementation of the `stop_rev` parameter
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
52007
diff
changeset
|
2506 return self.index.headrevs(None, stop_rev) |
|
47280
6be2a7ca4b1d
revlog: do not call Rust code if the index is not compatible with it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47277
diff
changeset
|
2507 if rustdagop is not None and self.index.rust_ext_compat: |
|
42468
a3a8887e4426
rust: using policy.importrust from Python callers
Georges Racinet <georges.racinet@octobus.net>
parents:
42462
diff
changeset
|
2508 return rustdagop.headrevs(self.index, revs) |
|
41772
6843379bf99e
changelog: prefilter in headrevs()
Georges Racinet <georges.racinet@octobus.net>
parents:
41700
diff
changeset
|
2509 return dagop.headrevs(revs, self._uncheckedparentrevs) |
|
17674
e69274f8d444
clfilter: split `revlog.headrevs` C call from python code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17673
diff
changeset
|
2510 |
|
51394
a0d88b021a98
unbundle: faster computation of changed heads
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
51328
diff
changeset
|
2511 def headrevsdiff(self, start, stop): |
|
a0d88b021a98
unbundle: faster computation of changed heads
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
51328
diff
changeset
|
2512 try: |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2513 return self.index.headrevsdiff( |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2514 start, stop |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2515 ) # pytype: disable=attribute-error |
|
51394
a0d88b021a98
unbundle: faster computation of changed heads
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
51328
diff
changeset
|
2516 except AttributeError: |
|
a0d88b021a98
unbundle: faster computation of changed heads
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
51328
diff
changeset
|
2517 return dagop.headrevsdiff(self._uncheckedparentrevs, start, stop) |
|
a0d88b021a98
unbundle: faster computation of changed heads
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
51328
diff
changeset
|
2518 |
|
24444
27e3ba73fbb1
phase: default to C implementation for phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24255
diff
changeset
|
2519 def computephases(self, roots): |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2520 return self.index.computephasesmapsets( |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2521 roots |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2522 ) # pytype: disable=attribute-error |
|
24444
27e3ba73fbb1
phase: default to C implementation for phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24255
diff
changeset
|
2523 |
|
51283
f20c4b307a5a
rust-index: add fast-path for getting a list of all heads as nodes
Rapha?l Gom?s <rgomes@octobus.net>
parents:
51275
diff
changeset
|
2524 def _head_node_ids(self): |
|
f20c4b307a5a
rust-index: add fast-path for getting a list of all heads as nodes
Rapha?l Gom?s <rgomes@octobus.net>
parents:
51275
diff
changeset
|
2525 try: |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2526 return self.index.head_node_ids() # pytype: disable=attribute-error |
|
51283
f20c4b307a5a
rust-index: add fast-path for getting a list of all heads as nodes
Rapha?l Gom?s <rgomes@octobus.net>
parents:
51275
diff
changeset
|
2527 except AttributeError: |
|
f20c4b307a5a
rust-index: add fast-path for getting a list of all heads as nodes
Rapha?l Gom?s <rgomes@octobus.net>
parents:
51275
diff
changeset
|
2528 return [self.node(r) for r in self.headrevs()] |
|
f20c4b307a5a
rust-index: add fast-path for getting a list of all heads as nodes
Rapha?l Gom?s <rgomes@octobus.net>
parents:
51275
diff
changeset
|
2529 |
|
3923
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3755
diff
changeset
|
2530 def heads(self, start=None, stop=None): |
|
1550
ccb9b62de892
add a -r/--rev option to heads to show only heads descendant from rev
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1535
diff
changeset
|
2531 """return the list of all nodes that have no children |
|
1551
e793cbc8be00
Fixes to "hg heads -r FOO":
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1550
diff
changeset
|
2532 |
|
e793cbc8be00
Fixes to "hg heads -r FOO":
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1550
diff
changeset
|
2533 if start is specified, only heads that are descendants of |
|
e793cbc8be00
Fixes to "hg heads -r FOO":
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1550
diff
changeset
|
2534 start will be returned |
|
3923
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3755
diff
changeset
|
2535 if stop is specified, it will consider all the revs from stop |
|
27230c29bfec
fix calculation of new heads added during push with -r
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3755
diff
changeset
|
2536 as if they had no children |
|
1551
e793cbc8be00
Fixes to "hg heads -r FOO":
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1550
diff
changeset
|
2537 """ |
|
4991
9c8c42bcf17a
revlog: implement a fast path for heads
Matt Mackall <mpm@selenic.com>
parents:
4990
diff
changeset
|
2538 if start is None and stop is None: |
|
14164
cb98fed52495
discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14144
diff
changeset
|
2539 if not len(self): |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2540 return [self.nullid] |
|
51283
f20c4b307a5a
rust-index: add fast-path for getting a list of all heads as nodes
Rapha?l Gom?s <rgomes@octobus.net>
parents:
51275
diff
changeset
|
2541 return self._head_node_ids() |
|
1551
e793cbc8be00
Fixes to "hg heads -r FOO":
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1550
diff
changeset
|
2542 if start is None: |
|
40001
8af835af0a85
dagop: extract DAG local heads functionality from revlog
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40000
diff
changeset
|
2543 start = nullrev |
|
8af835af0a85
dagop: extract DAG local heads functionality from revlog
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40000
diff
changeset
|
2544 else: |
|
8af835af0a85
dagop: extract DAG local heads functionality from revlog
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40000
diff
changeset
|
2545 start = self.rev(start) |
|
8af835af0a85
dagop: extract DAG local heads functionality from revlog
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40000
diff
changeset
|
2546 |
|
44470
9d2b2df2c2ba
cleanup: run pyupgrade on our source tree to clean up varying things
Augie Fackler <augie@google.com>
parents:
44465
diff
changeset
|
2547 stoprevs = {self.rev(n) for n in stop or []} |
|
40001
8af835af0a85
dagop: extract DAG local heads functionality from revlog
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40000
diff
changeset
|
2548 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2549 revs = dagop.headrevssubset( |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2550 self.revs, self.parentrevs, startrev=start, stoprevs=stoprevs |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2551 ) |
|
40001
8af835af0a85
dagop: extract DAG local heads functionality from revlog
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40000
diff
changeset
|
2552 |
|
8af835af0a85
dagop: extract DAG local heads functionality from revlog
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40000
diff
changeset
|
2553 return [self.node(rev) for rev in revs] |
| 370 | 2554 |
|
51394
a0d88b021a98
unbundle: faster computation of changed heads
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
51328
diff
changeset
|
2555 def diffheads(self, start, stop): |
|
a0d88b021a98
unbundle: faster computation of changed heads
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
51328
diff
changeset
|
2556 """return the nodes that make up the difference between |
|
a0d88b021a98
unbundle: faster computation of changed heads
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
51328
diff
changeset
|
2557 heads of revs before `start` and heads of revs before `stop`""" |
|
a0d88b021a98
unbundle: faster computation of changed heads
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
51328
diff
changeset
|
2558 removed, added = self.headrevsdiff(start, stop) |
|
a0d88b021a98
unbundle: faster computation of changed heads
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
51328
diff
changeset
|
2559 return [self.node(r) for r in removed], [self.node(r) for r in added] |
|
a0d88b021a98
unbundle: faster computation of changed heads
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
51328
diff
changeset
|
2560 |
| 370 | 2561 def children(self, node): |
| 1083 | 2562 """find the children of a given node""" |
| 370 | 2563 c = [] |
| 2564 p = self.rev(node) | |
|
17672
474047947b8f
clfilter: make the revlog class responsible of all its iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17537
diff
changeset
|
2565 for r in self.revs(start=p + 1): |
|
4746
62c56d8f368b
Fix revlog.children so the real children of the null revision can be calculated.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4635
diff
changeset
|
2566 prevs = [pr for pr in self.parentrevs(r) if pr != nullrev] |
|
62c56d8f368b
Fix revlog.children so the real children of the null revision can be calculated.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4635
diff
changeset
|
2567 if prevs: |
|
62c56d8f368b
Fix revlog.children so the real children of the null revision can be calculated.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4635
diff
changeset
|
2568 for pr in prevs: |
|
62c56d8f368b
Fix revlog.children so the real children of the null revision can be calculated.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4635
diff
changeset
|
2569 if pr == p: |
|
62c56d8f368b
Fix revlog.children so the real children of the null revision can be calculated.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4635
diff
changeset
|
2570 c.append(self.node(r)) |
|
62c56d8f368b
Fix revlog.children so the real children of the null revision can be calculated.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4635
diff
changeset
|
2571 elif p == nullrev: |
|
62c56d8f368b
Fix revlog.children so the real children of the null revision can be calculated.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4635
diff
changeset
|
2572 c.append(self.node(r)) |
| 370 | 2573 return c |
| 515 | 2574 |
|
21104
40ace21cb3a1
revlog: introduce commonancestorsheads method
Mads Kiilerich <madski@unity3d.com>
parents:
20965
diff
changeset
|
2575 def commonancestorsheads(self, a, b): |
|
40ace21cb3a1
revlog: introduce commonancestorsheads method
Mads Kiilerich <madski@unity3d.com>
parents:
20965
diff
changeset
|
2576 """calculate all the heads of the common ancestors of nodes a and b""" |
|
40ace21cb3a1
revlog: introduce commonancestorsheads method
Mads Kiilerich <madski@unity3d.com>
parents:
20965
diff
changeset
|
2577 a, b = self.rev(a), self.rev(b) |
|
38516
99f864b34451
revlog: refactor out the rev-oriented part of commonancestorheads
Boris Feld <boris.feld@octobus.net>
parents:
38515
diff
changeset
|
2578 ancs = self._commonancestorsheads(a, b) |
|
99f864b34451
revlog: refactor out the rev-oriented part of commonancestorheads
Boris Feld <boris.feld@octobus.net>
parents:
38515
diff
changeset
|
2579 return pycompat.maplist(self.node, ancs) |
|
99f864b34451
revlog: refactor out the rev-oriented part of commonancestorheads
Boris Feld <boris.feld@octobus.net>
parents:
38515
diff
changeset
|
2580 |
|
99f864b34451
revlog: refactor out the rev-oriented part of commonancestorheads
Boris Feld <boris.feld@octobus.net>
parents:
38515
diff
changeset
|
2581 def _commonancestorsheads(self, *revs): |
|
99f864b34451
revlog: refactor out the rev-oriented part of commonancestorheads
Boris Feld <boris.feld@octobus.net>
parents:
38515
diff
changeset
|
2582 """calculate all the heads of the common ancestors of revs""" |
|
21104
40ace21cb3a1
revlog: introduce commonancestorsheads method
Mads Kiilerich <madski@unity3d.com>
parents:
20965
diff
changeset
|
2583 try: |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2584 ancs = self.index.commonancestorsheads( |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2585 *revs |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2586 ) # pytype: disable=attribute-error |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2587 except (AttributeError, OverflowError): # C implementation failed |
|
38516
99f864b34451
revlog: refactor out the rev-oriented part of commonancestorheads
Boris Feld <boris.feld@octobus.net>
parents:
38515
diff
changeset
|
2588 ancs = ancestor.commonancestorsheads(self.parentrevs, *revs) |
|
99f864b34451
revlog: refactor out the rev-oriented part of commonancestorheads
Boris Feld <boris.feld@octobus.net>
parents:
38515
diff
changeset
|
2589 return ancs |
|
21104
40ace21cb3a1
revlog: introduce commonancestorsheads method
Mads Kiilerich <madski@unity3d.com>
parents:
20965
diff
changeset
|
2590 |
|
22381
392ae5cb8d62
revlog: introduce isancestor method for efficiently determining node lineage
Mads Kiilerich <madski@unity3d.com>
parents:
22282
diff
changeset
|
2591 def isancestor(self, a, b): |
|
38664
160da69ba1bf
revlog: replace descendant(b, a) by isdescendantrev(a, b) (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
38663
diff
changeset
|
2592 """return True if node a is an ancestor of node b |
|
160da69ba1bf
revlog: replace descendant(b, a) by isdescendantrev(a, b) (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
38663
diff
changeset
|
2593 |
|
160da69ba1bf
revlog: replace descendant(b, a) by isdescendantrev(a, b) (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
38663
diff
changeset
|
2594 A revision is considered an ancestor of itself.""" |
|
38518
cc3543c87de5
revlog: reuse 'descendant' implemention in 'isancestor'
Boris Feld <boris.feld@octobus.net>
parents:
38517
diff
changeset
|
2595 a, b = self.rev(a), self.rev(b) |
|
38666
a06b2b032557
revlog: introduce a isancestorrev() and use it in rebase
Martin von Zweigbergk <martinvonz@google.com>
parents:
38665
diff
changeset
|
2596 return self.isancestorrev(a, b) |
|
a06b2b032557
revlog: introduce a isancestorrev() and use it in rebase
Martin von Zweigbergk <martinvonz@google.com>
parents:
38665
diff
changeset
|
2597 |
|
a06b2b032557
revlog: introduce a isancestorrev() and use it in rebase
Martin von Zweigbergk <martinvonz@google.com>
parents:
38665
diff
changeset
|
2598 def isancestorrev(self, a, b): |
|
a06b2b032557
revlog: introduce a isancestorrev() and use it in rebase
Martin von Zweigbergk <martinvonz@google.com>
parents:
38665
diff
changeset
|
2599 """return True if revision a is an ancestor of revision b |
|
a06b2b032557
revlog: introduce a isancestorrev() and use it in rebase
Martin von Zweigbergk <martinvonz@google.com>
parents:
38665
diff
changeset
|
2600 |
|
38668
21846c94e605
revlog: delete isdescendantrev() in favor of isancestorrev()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38666
diff
changeset
|
2601 A revision is considered an ancestor of itself. |
|
21846c94e605
revlog: delete isdescendantrev() in favor of isancestorrev()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38666
diff
changeset
|
2602 |
|
21846c94e605
revlog: delete isdescendantrev() in favor of isancestorrev()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38666
diff
changeset
|
2603 The implementation of this is trivial but the use of |
|
42462
055c3e2c44f0
revlog: speed up isancestor
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
42044
diff
changeset
|
2604 reachableroots is not.""" |
|
38668
21846c94e605
revlog: delete isdescendantrev() in favor of isancestorrev()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38666
diff
changeset
|
2605 if a == nullrev: |
|
21846c94e605
revlog: delete isdescendantrev() in favor of isancestorrev()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38666
diff
changeset
|
2606 return True |
|
21846c94e605
revlog: delete isdescendantrev() in favor of isancestorrev()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38666
diff
changeset
|
2607 elif a == b: |
|
21846c94e605
revlog: delete isdescendantrev() in favor of isancestorrev()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38666
diff
changeset
|
2608 return True |
|
21846c94e605
revlog: delete isdescendantrev() in favor of isancestorrev()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38666
diff
changeset
|
2609 elif a > b: |
|
21846c94e605
revlog: delete isdescendantrev() in favor of isancestorrev()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38666
diff
changeset
|
2610 return False |
|
42462
055c3e2c44f0
revlog: speed up isancestor
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
42044
diff
changeset
|
2611 return bool(self.reachableroots(a, [b], [a], includepath=False)) |
|
055c3e2c44f0
revlog: speed up isancestor
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
42044
diff
changeset
|
2612 |
|
055c3e2c44f0
revlog: speed up isancestor
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
42044
diff
changeset
|
2613 def reachableroots(self, minroot, heads, roots, includepath=False): |
|
43799
2e30d7df4809
revlog: fix revset in reachableroots docstring
Jun Wu <quark@fb.com>
parents:
43663
diff
changeset
|
2614 """return (heads(::(<roots> and <roots>::<heads>))) |
|
42462
055c3e2c44f0
revlog: speed up isancestor
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
42044
diff
changeset
|
2615 |
|
055c3e2c44f0
revlog: speed up isancestor
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
42044
diff
changeset
|
2616 If includepath is True, return (<roots>::<heads>).""" |
|
055c3e2c44f0
revlog: speed up isancestor
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
42044
diff
changeset
|
2617 try: |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2618 return self.index.reachableroots2( |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2619 minroot, heads, roots, includepath |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2620 ) # pytype: disable=attribute-error |
|
42462
055c3e2c44f0
revlog: speed up isancestor
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
42044
diff
changeset
|
2621 except AttributeError: |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2622 return dagop._reachablerootspure( |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2623 self.parentrevs, minroot, roots, heads, includepath |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2624 ) |
|
22381
392ae5cb8d62
revlog: introduce isancestor method for efficiently determining node lineage
Mads Kiilerich <madski@unity3d.com>
parents:
22282
diff
changeset
|
2625 |
|
21107
4a6c8b6b10d3
revlog: backout 514d32de6646 - commonancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21104
diff
changeset
|
2626 def ancestor(self, a, b): |
|
22389
94f77624dbb5
comments: describe ancestor consistently - avoid 'least common ancestor'
Mads Kiilerich <madski@unity3d.com>
parents:
22381
diff
changeset
|
2627 """calculate the "best" common ancestor of nodes a and b""" |
|
21107
4a6c8b6b10d3
revlog: backout 514d32de6646 - commonancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21104
diff
changeset
|
2628 |
|
10897
adb6a291bbdb
revlog: put graph related functions together
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10404
diff
changeset
|
2629 a, b = self.rev(a), self.rev(b) |
|
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18987
diff
changeset
|
2630 try: |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2631 ancs = self.index.ancestors(a, b) # pytype: disable=attribute-error |
|
21107
4a6c8b6b10d3
revlog: backout 514d32de6646 - commonancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21104
diff
changeset
|
2632 except (AttributeError, OverflowError): |
|
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18987
diff
changeset
|
2633 ancs = ancestor.ancestors(self.parentrevs, a, b) |
|
18987
3605d4e7e618
revlog: choose a consistent ancestor when there's a tie
Bryan O'Sullivan <bryano@fb.com>
parents:
18986
diff
changeset
|
2634 if ancs: |
|
3605d4e7e618
revlog: choose a consistent ancestor when there's a tie
Bryan O'Sullivan <bryano@fb.com>
parents:
18986
diff
changeset
|
2635 # choose a consistent winner when there's a tie |
|
21107
4a6c8b6b10d3
revlog: backout 514d32de6646 - commonancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21104
diff
changeset
|
2636 return min(map(self.node, ancs)) |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2637 return self.nullid |
|
10897
adb6a291bbdb
revlog: put graph related functions together
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10404
diff
changeset
|
2638 |
|
3453
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2639 def _match(self, id): |
|
16762
93f8b9565257
revlog: don't handle long for revision matching
Matt Mackall <mpm@selenic.com>
parents:
16686
diff
changeset
|
2640 if isinstance(id, int): |
|
3156
d01e4cb2f5f2
cleanups in revlog.lookup
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3139
diff
changeset
|
2641 # rev |
|
2641
156fb1feab62
lookup should allow -1 to represent nullid (if passed an int as arg)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2600
diff
changeset
|
2642 return self.node(id) |
|
47082
c5e1cc0b4c77
core: don't hard-code node length
Joerg Sonnenberger <joerg@bec.de>
parents:
47081
diff
changeset
|
2643 if len(id) == self.nodeconstants.nodelen: |
| 3438 | 2644 # possibly a binary node |
| 2645 # odds of a binary node being all hex in ASCII are 1 in 10**25 | |
| 2646 try: | |
| 2647 node = id | |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2648 self.rev(node) # quick search the index |
| 3438 | 2649 return node |
|
39791
974592474dee
revlog: drop LookupError alias (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39790
diff
changeset
|
2650 except error.LookupError: |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2651 pass # may be partial hex id |
|
36
da28286bf6b7
Add smart node lookup by substring or by rev number
mpm@selenic.com
parents:
26
diff
changeset
|
2652 try: |
|
3156
d01e4cb2f5f2
cleanups in revlog.lookup
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3139
diff
changeset
|
2653 # str(rev) |
|
36
da28286bf6b7
Add smart node lookup by substring or by rev number
mpm@selenic.com
parents:
26
diff
changeset
|
2654 rev = int(id) |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
2655 if b"%d" % rev != id: |
|
4980
fc44c8df9d99
revlog: some codingstyle cleanups
Matt Mackall <mpm@selenic.com>
parents:
4979
diff
changeset
|
2656 raise ValueError |
|
fc44c8df9d99
revlog: some codingstyle cleanups
Matt Mackall <mpm@selenic.com>
parents:
4979
diff
changeset
|
2657 if rev < 0: |
|
6750
fb42030d79d6
add __len__ and __iter__ methods to repo and revlog
Matt Mackall <mpm@selenic.com>
parents:
6703
diff
changeset
|
2658 rev = len(self) + rev |
|
fb42030d79d6
add __len__ and __iter__ methods to repo and revlog
Matt Mackall <mpm@selenic.com>
parents:
6703
diff
changeset
|
2659 if rev < 0 or rev >= len(self): |
|
4980
fc44c8df9d99
revlog: some codingstyle cleanups
Matt Mackall <mpm@selenic.com>
parents:
4979
diff
changeset
|
2660 raise ValueError |
|
36
da28286bf6b7
Add smart node lookup by substring or by rev number
mpm@selenic.com
parents:
26
diff
changeset
|
2661 return self.node(rev) |
| 469 | 2662 except (ValueError, OverflowError): |
|
3156
d01e4cb2f5f2
cleanups in revlog.lookup
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3139
diff
changeset
|
2663 pass |
|
47081
a407fe56d6e8
core: don't hard-code hex node lengths
Joerg Sonnenberger <joerg@bec.de>
parents:
47079
diff
changeset
|
2664 if len(id) == 2 * self.nodeconstants.nodelen: |
|
3453
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2665 try: |
| 3438 | 2666 # a full hex nodeid? |
| 2667 node = bin(id) | |
|
7874
d812029cda85
cleanup: drop variables for unused return values
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7873
diff
changeset
|
2668 self.rev(node) |
|
3157
4fe41a9e4591
optimize revlog.lookup when passed hex(node)[:...]
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3156
diff
changeset
|
2669 return node |
|
49263
63fd0282ad40
node: stop converting binascii.Error to TypeError in bin()
Manuel Jacob <me@manueljacob.de>
parents:
49262
diff
changeset
|
2670 except (binascii.Error, error.LookupError): |
|
3453
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2671 pass |
|
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2672 |
|
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2673 def _partialmatch(self, id): |
|
37449
a0d71618074f
revlog: detect pseudo file nodeids to raise WdirUnsupported exception
Yuya Nishihara <yuya@tcha.org>
parents:
37443
diff
changeset
|
2674 # we don't care wdirfilenodeids as they should be always full hash |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2675 maybewdir = self.nodeconstants.wdirhex.startswith(id) |
|
47305
93a0abe098e7
revlog: avoid raising no-arg RevlogError for internal flow control
Martin von Zweigbergk <martinvonz@google.com>
parents:
47296
diff
changeset
|
2676 ambiguous = False |
|
16665
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16533
diff
changeset
|
2677 try: |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2678 partial = self.index.partialmatch( |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2679 id |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2680 ) # pytype: disable=attribute-error |
|
30401
2ded17b64f09
revlog: avoid shadowing several variables using list comprehensions
Augie Fackler <augie@google.com>
parents:
30303
diff
changeset
|
2681 if partial and self.hasnode(partial): |
|
32704
af854b1b36f8
revlog: add support for partial matching of wdir node id
Yuya Nishihara <yuya@tcha.org>
parents:
32679
diff
changeset
|
2682 if maybewdir: |
|
af854b1b36f8
revlog: add support for partial matching of wdir node id
Yuya Nishihara <yuya@tcha.org>
parents:
32679
diff
changeset
|
2683 # single 'ff...' match in radix tree, ambiguous with wdir |
|
47305
93a0abe098e7
revlog: avoid raising no-arg RevlogError for internal flow control
Martin von Zweigbergk <martinvonz@google.com>
parents:
47296
diff
changeset
|
2684 ambiguous = True |
|
93a0abe098e7
revlog: avoid raising no-arg RevlogError for internal flow control
Martin von Zweigbergk <martinvonz@google.com>
parents:
47296
diff
changeset
|
2685 else: |
|
93a0abe098e7
revlog: avoid raising no-arg RevlogError for internal flow control
Martin von Zweigbergk <martinvonz@google.com>
parents:
47296
diff
changeset
|
2686 return partial |
|
93a0abe098e7
revlog: avoid raising no-arg RevlogError for internal flow control
Martin von Zweigbergk <martinvonz@google.com>
parents:
47296
diff
changeset
|
2687 elif maybewdir: |
|
32704
af854b1b36f8
revlog: add support for partial matching of wdir node id
Yuya Nishihara <yuya@tcha.org>
parents:
32679
diff
changeset
|
2688 # no 'ff...' match in radix tree, wdir identified |
|
af854b1b36f8
revlog: add support for partial matching of wdir node id
Yuya Nishihara <yuya@tcha.org>
parents:
32679
diff
changeset
|
2689 raise error.WdirUnsupported |
|
47305
93a0abe098e7
revlog: avoid raising no-arg RevlogError for internal flow control
Martin von Zweigbergk <martinvonz@google.com>
parents:
47296
diff
changeset
|
2690 else: |
|
93a0abe098e7
revlog: avoid raising no-arg RevlogError for internal flow control
Martin von Zweigbergk <martinvonz@google.com>
parents:
47296
diff
changeset
|
2691 return None |
|
39789
2cd93a8d4bde
revlog: drop RevlogError alias (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39785
diff
changeset
|
2692 except error.RevlogError: |
|
16665
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16533
diff
changeset
|
2693 # parsers.c radix tree lookup gave multiple matches |
|
29396
d0ae5b8f80dc
revlog: add a fast path for "ambiguous identifier"
Jun Wu <quark@fb.com>
parents:
29339
diff
changeset
|
2694 # fast path: for unfiltered changelog, radix tree is accurate |
|
d0ae5b8f80dc
revlog: add a fast path for "ambiguous identifier"
Jun Wu <quark@fb.com>
parents:
29339
diff
changeset
|
2695 if not getattr(self, 'filteredrevs', None): |
|
47305
93a0abe098e7
revlog: avoid raising no-arg RevlogError for internal flow control
Martin von Zweigbergk <martinvonz@google.com>
parents:
47296
diff
changeset
|
2696 ambiguous = True |
|
19471
fd1bb7c1be78
revlog: handle hidden revs in _partialmatch (issue3979)
Matt Mackall <mpm@selenic.com>
parents:
19326
diff
changeset
|
2697 # fall through to slow path that filters hidden revisions |
|
16665
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16533
diff
changeset
|
2698 except (AttributeError, ValueError): |
|
49448
5fe7e9eda0f3
revlog: make _partialmatch fail fast on almost-hex inputs
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49314
diff
changeset
|
2699 # we are pure python, or key is not hex |
|
16665
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16533
diff
changeset
|
2700 pass |
|
47305
93a0abe098e7
revlog: avoid raising no-arg RevlogError for internal flow control
Martin von Zweigbergk <martinvonz@google.com>
parents:
47296
diff
changeset
|
2701 if ambiguous: |
|
93a0abe098e7
revlog: avoid raising no-arg RevlogError for internal flow control
Martin von Zweigbergk <martinvonz@google.com>
parents:
47296
diff
changeset
|
2702 raise error.AmbiguousPrefixLookupError( |
|
93a0abe098e7
revlog: avoid raising no-arg RevlogError for internal flow control
Martin von Zweigbergk <martinvonz@google.com>
parents:
47296
diff
changeset
|
2703 id, self.display_id, _(b'ambiguous identifier') |
|
93a0abe098e7
revlog: avoid raising no-arg RevlogError for internal flow control
Martin von Zweigbergk <martinvonz@google.com>
parents:
47296
diff
changeset
|
2704 ) |
|
16665
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16533
diff
changeset
|
2705 |
|
13258
c2661863f16f
revlog: introduce a cache for partial lookups
Matt Mackall <mpm@selenic.com>
parents:
13254
diff
changeset
|
2706 if id in self._pcache: |
|
c2661863f16f
revlog: introduce a cache for partial lookups
Matt Mackall <mpm@selenic.com>
parents:
13254
diff
changeset
|
2707 return self._pcache[id] |
|
c2661863f16f
revlog: introduce a cache for partial lookups
Matt Mackall <mpm@selenic.com>
parents:
13254
diff
changeset
|
2708 |
|
37819
ee3d58b4a47f
revlog: make pure version of _partialmatch() support 40-byte hex nodeids
Martin von Zweigbergk <martinvonz@google.com>
parents:
37767
diff
changeset
|
2709 if len(id) <= 40: |
|
49262
3e5f1fb2aec7
revlog: make try block smaller
Manuel Jacob <me@manueljacob.de>
parents:
49261
diff
changeset
|
2710 # hex(node)[:...] |
|
3e5f1fb2aec7
revlog: make try block smaller
Manuel Jacob <me@manueljacob.de>
parents:
49261
diff
changeset
|
2711 l = len(id) // 2 * 2 # grab an even number of digits |
|
3453
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2712 try: |
|
49448
5fe7e9eda0f3
revlog: make _partialmatch fail fast on almost-hex inputs
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49314
diff
changeset
|
2713 # we're dropping the last digit, so let's check that it's hex, |
|
5fe7e9eda0f3
revlog: make _partialmatch fail fast on almost-hex inputs
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49314
diff
changeset
|
2714 # to avoid the expensive computation below if it's not |
|
5fe7e9eda0f3
revlog: make _partialmatch fail fast on almost-hex inputs
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49314
diff
changeset
|
2715 if len(id) % 2 > 0: |
|
5fe7e9eda0f3
revlog: make _partialmatch fail fast on almost-hex inputs
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49314
diff
changeset
|
2716 if not (id[-1] in hexdigits): |
|
5fe7e9eda0f3
revlog: make _partialmatch fail fast on almost-hex inputs
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49314
diff
changeset
|
2717 return None |
|
49261
31602d471b60
revlog: make round-down pattern clearer
Manuel Jacob <me@manueljacob.de>
parents:
49248
diff
changeset
|
2718 prefix = bin(id[:l]) |
|
49263
63fd0282ad40
node: stop converting binascii.Error to TypeError in bin()
Manuel Jacob <me@manueljacob.de>
parents:
49262
diff
changeset
|
2719 except binascii.Error: |
|
49262
3e5f1fb2aec7
revlog: make try block smaller
Manuel Jacob <me@manueljacob.de>
parents:
49261
diff
changeset
|
2720 pass |
|
3e5f1fb2aec7
revlog: make try block smaller
Manuel Jacob <me@manueljacob.de>
parents:
49261
diff
changeset
|
2721 else: |
|
13259
3b616dfa4b17
revlog: do revlog node->rev mapping by scanning
Matt Mackall <mpm@selenic.com>
parents:
13258
diff
changeset
|
2722 nl = [e[7] for e in self.index if e[7].startswith(prefix)] |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2723 nl = [ |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2724 n for n in nl if hex(n).startswith(id) and self.hasnode(n) |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2725 ] |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2726 if self.nodeconstants.nullhex.startswith(id): |
|
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2727 nl.append(self.nullid) |
|
7365
ec3aafa84d44
lookup: speed up partial lookup
Matt Mackall <mpm@selenic.com>
parents:
7363
diff
changeset
|
2728 if len(nl) > 0: |
|
32704
af854b1b36f8
revlog: add support for partial matching of wdir node id
Yuya Nishihara <yuya@tcha.org>
parents:
32679
diff
changeset
|
2729 if len(nl) == 1 and not maybewdir: |
|
13258
c2661863f16f
revlog: introduce a cache for partial lookups
Matt Mackall <mpm@selenic.com>
parents:
13254
diff
changeset
|
2730 self._pcache[id] = nl[0] |
|
7365
ec3aafa84d44
lookup: speed up partial lookup
Matt Mackall <mpm@selenic.com>
parents:
7363
diff
changeset
|
2731 return nl[0] |
|
39790
4a2466b2a434
revlog: drop some more error aliases (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39789
diff
changeset
|
2732 raise error.AmbiguousPrefixLookupError( |
|
47173
1ec64f59dc27
revlog: use revlog.display_id in ambiguity errors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47172
diff
changeset
|
2733 id, self.display_id, _(b'ambiguous identifier') |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2734 ) |
|
32704
af854b1b36f8
revlog: add support for partial matching of wdir node id
Yuya Nishihara <yuya@tcha.org>
parents:
32679
diff
changeset
|
2735 if maybewdir: |
|
af854b1b36f8
revlog: add support for partial matching of wdir node id
Yuya Nishihara <yuya@tcha.org>
parents:
32679
diff
changeset
|
2736 raise error.WdirUnsupported |
|
7365
ec3aafa84d44
lookup: speed up partial lookup
Matt Mackall <mpm@selenic.com>
parents:
7363
diff
changeset
|
2737 return None |
|
3453
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2738 |
|
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2739 def lookup(self, id): |
|
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2740 """locate a node based on: |
|
45957
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
45885
diff
changeset
|
2741 - revision number or str(revision number) |
|
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
45885
diff
changeset
|
2742 - nodeid or subset of hex nodeid |
|
3453
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2743 """ |
|
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2744 n = self._match(id) |
|
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2745 if n is not None: |
|
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2746 return n |
|
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2747 n = self._partialmatch(id) |
|
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2748 if n: |
|
dba3cadef789
Only look up tags and branches as a last resort
Matt Mackall <mpm@selenic.com>
parents:
3438
diff
changeset
|
2749 return n |
| 515 | 2750 |
|
47169
96ee8ca99f5a
revlog: use revlog.display_id in LookupError
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47167
diff
changeset
|
2751 raise error.LookupError(id, self.display_id, _(b'no match found')) |
|
36
da28286bf6b7
Add smart node lookup by substring or by rev number
mpm@selenic.com
parents:
26
diff
changeset
|
2752 |
|
37767
44d1959acb3b
revlog: make shortest() take a full binary nodeid (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
37494
diff
changeset
|
2753 def shortest(self, node, minlength=1): |
|
44d1959acb3b
revlog: make shortest() take a full binary nodeid (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
37494
diff
changeset
|
2754 """Find the shortest unambiguous prefix that matches node.""" |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2755 |
|
37907
6921d3ecadc1
shortest: rename "test" variable to "prefix"
Martin von Zweigbergk <martinvonz@google.com>
parents:
37906
diff
changeset
|
2756 def isvalid(prefix): |
|
34257
448725a2ef73
templater: extract shortest() logic from template function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34160
diff
changeset
|
2757 try: |
|
42629
24111fb9a725
lookup: don't use "00changelog.i@None" when lookup of prefix fails
Martin von Zweigbergk <martinvonz@google.com>
parents:
42567
diff
changeset
|
2758 matchednode = self._partialmatch(prefix) |
|
39836
7a9e2d85f475
revlog: catch more specific exception in shortest()
Yuya Nishihara <yuya@tcha.org>
parents:
39794
diff
changeset
|
2759 except error.AmbiguousPrefixLookupError: |
|
34257
448725a2ef73
templater: extract shortest() logic from template function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34160
diff
changeset
|
2760 return False |
|
448725a2ef73
templater: extract shortest() logic from template function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34160
diff
changeset
|
2761 except error.WdirUnsupported: |
|
448725a2ef73
templater: extract shortest() logic from template function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34160
diff
changeset
|
2762 # single 'ff...' match |
|
448725a2ef73
templater: extract shortest() logic from template function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34160
diff
changeset
|
2763 return True |
|
42629
24111fb9a725
lookup: don't use "00changelog.i@None" when lookup of prefix fails
Martin von Zweigbergk <martinvonz@google.com>
parents:
42567
diff
changeset
|
2764 if matchednode is None: |
|
47169
96ee8ca99f5a
revlog: use revlog.display_id in LookupError
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47167
diff
changeset
|
2765 raise error.LookupError(node, self.display_id, _(b'no node')) |
|
38014
76e933e0ccc9
shortest: remove unnecessary check for revnum in isvalid()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38013
diff
changeset
|
2766 return True |
|
34257
448725a2ef73
templater: extract shortest() logic from template function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34160
diff
changeset
|
2767 |
|
38012
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37909
diff
changeset
|
2768 def maybewdir(prefix): |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
2769 return all(c == b'f' for c in pycompat.iterbytestr(prefix)) |
|
38012
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37909
diff
changeset
|
2770 |
|
37767
44d1959acb3b
revlog: make shortest() take a full binary nodeid (API)
Martin von Zweigbergk <martinvonz@google.com>
parents:
37494
diff
changeset
|
2771 hexnode = hex(node) |
|
38012
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37909
diff
changeset
|
2772 |
|
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37909
diff
changeset
|
2773 def disambiguate(hexnode, minlength): |
|
38015
3ac950cd5978
shortest: move revnum-disambiguation out of revlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
38014
diff
changeset
|
2774 """Disambiguate against wdirid.""" |
|
45054
cc2572923ea3
revlog: avoid hard-coded hash sizes
Joerg Sonnenberger <joerg@bec.de>
parents:
44803
diff
changeset
|
2775 for length in range(minlength, len(hexnode) + 1): |
|
38012
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37909
diff
changeset
|
2776 prefix = hexnode[:length] |
|
38015
3ac950cd5978
shortest: move revnum-disambiguation out of revlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
38014
diff
changeset
|
2777 if not maybewdir(prefix): |
|
38012
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37909
diff
changeset
|
2778 return prefix |
|
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37909
diff
changeset
|
2779 |
|
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37909
diff
changeset
|
2780 if not getattr(self, 'filteredrevs', None): |
|
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37909
diff
changeset
|
2781 try: |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2782 shortest = self.index.shortest( |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2783 node |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2784 ) # pytype: disable=attribute-error |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
2785 length = max(shortest, minlength) |
|
38012
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37909
diff
changeset
|
2786 return disambiguate(hexnode, length) |
|
39789
2cd93a8d4bde
revlog: drop RevlogError alias (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39785
diff
changeset
|
2787 except error.RevlogError: |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2788 if node != self.nodeconstants.wdirid: |
|
47162
a07d5cb03a85
revlog: rename `indexfile` to `_indexfile`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47159
diff
changeset
|
2789 raise error.LookupError( |
|
47169
96ee8ca99f5a
revlog: use revlog.display_id in LookupError
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47167
diff
changeset
|
2790 node, self.display_id, _(b'no node') |
|
47162
a07d5cb03a85
revlog: rename `indexfile` to `_indexfile`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47159
diff
changeset
|
2791 ) |
|
38012
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37909
diff
changeset
|
2792 except AttributeError: |
|
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37909
diff
changeset
|
2793 # Fall through to pure code |
|
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37909
diff
changeset
|
2794 pass |
|
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37909
diff
changeset
|
2795 |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2796 if node == self.nodeconstants.wdirid: |
|
45054
cc2572923ea3
revlog: avoid hard-coded hash sizes
Joerg Sonnenberger <joerg@bec.de>
parents:
44803
diff
changeset
|
2797 for length in range(minlength, len(hexnode) + 1): |
|
38013
0db7fe7c34d3
shortest: make pure code also disambigute against revnums at end
Martin von Zweigbergk <martinvonz@google.com>
parents:
38012
diff
changeset
|
2798 prefix = hexnode[:length] |
|
0db7fe7c34d3
shortest: make pure code also disambigute against revnums at end
Martin von Zweigbergk <martinvonz@google.com>
parents:
38012
diff
changeset
|
2799 if isvalid(prefix): |
|
0db7fe7c34d3
shortest: make pure code also disambigute against revnums at end
Martin von Zweigbergk <martinvonz@google.com>
parents:
38012
diff
changeset
|
2800 return prefix |
|
0db7fe7c34d3
shortest: make pure code also disambigute against revnums at end
Martin von Zweigbergk <martinvonz@google.com>
parents:
38012
diff
changeset
|
2801 |
|
45054
cc2572923ea3
revlog: avoid hard-coded hash sizes
Joerg Sonnenberger <joerg@bec.de>
parents:
44803
diff
changeset
|
2802 for length in range(minlength, len(hexnode) + 1): |
|
37907
6921d3ecadc1
shortest: rename "test" variable to "prefix"
Martin von Zweigbergk <martinvonz@google.com>
parents:
37906
diff
changeset
|
2803 prefix = hexnode[:length] |
|
6921d3ecadc1
shortest: rename "test" variable to "prefix"
Martin von Zweigbergk <martinvonz@google.com>
parents:
37906
diff
changeset
|
2804 if isvalid(prefix): |
|
38013
0db7fe7c34d3
shortest: make pure code also disambigute against revnums at end
Martin von Zweigbergk <martinvonz@google.com>
parents:
38012
diff
changeset
|
2805 return disambiguate(hexnode, length) |
|
34257
448725a2ef73
templater: extract shortest() logic from template function
Martin von Zweigbergk <martinvonz@google.com>
parents:
34160
diff
changeset
|
2806 |
|
2890
5df3e5cf16bc
Move cmp bits from filelog to revlog
Matt Mackall <mpm@selenic.com>
parents:
2859
diff
changeset
|
2807 def cmp(self, node, text): |
|
11539
a463e3c50212
cmp: document the fact that we return True if content is different
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11323
diff
changeset
|
2808 """compare text with a given file revision |
|
a463e3c50212
cmp: document the fact that we return True if content is different
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11323
diff
changeset
|
2809 |
|
a463e3c50212
cmp: document the fact that we return True if content is different
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11323
diff
changeset
|
2810 returns True if text is different than what is stored. |
|
a463e3c50212
cmp: document the fact that we return True if content is different
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11323
diff
changeset
|
2811 """ |
|
2890
5df3e5cf16bc
Move cmp bits from filelog to revlog
Matt Mackall <mpm@selenic.com>
parents:
2859
diff
changeset
|
2812 p1, p2 = self.parents(node) |
|
39882
f8eb71f9e3bd
storageutil: new module for storage primitives (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39877
diff
changeset
|
2813 return storageutil.hashrevisionsha1(text, p1, p2) != node |
|
2890
5df3e5cf16bc
Move cmp bits from filelog to revlog
Matt Mackall <mpm@selenic.com>
parents:
2859
diff
changeset
|
2814 |
|
11929
1839a7518b0d
revlog: deltachain() returns chain of revs need to construct a revision
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
11928
diff
changeset
|
2815 def deltaparent(self, rev): |
|
14195
0013d3eeb826
revlog: remove support for parentdelta
Sune Foldager <cryo@cyanite.org>
parents:
14164
diff
changeset
|
2816 """return deltaparent of the given revision""" |
|
14253
c28d5200374c
revlog: support reading generaldelta revlogs
Sune Foldager <cryo@cyanite.org>
parents:
14252
diff
changeset
|
2817 base = self.index[rev][3] |
|
c28d5200374c
revlog: support reading generaldelta revlogs
Sune Foldager <cryo@cyanite.org>
parents:
14252
diff
changeset
|
2818 if base == rev: |
|
14208
d62d597b8974
revlog: compute correct deltaparent in the deltaparent function
Sune Foldager <cryo@cyanite.org>
parents:
14196
diff
changeset
|
2819 return nullrev |
|
51051
f636103c4d67
revlog: remove legacy usage of `_generaldelta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51049
diff
changeset
|
2820 elif self.delta_config.general_delta: |
|
14253
c28d5200374c
revlog: support reading generaldelta revlogs
Sune Foldager <cryo@cyanite.org>
parents:
14252
diff
changeset
|
2821 return base |
|
14208
d62d597b8974
revlog: compute correct deltaparent in the deltaparent function
Sune Foldager <cryo@cyanite.org>
parents:
14196
diff
changeset
|
2822 else: |
|
d62d597b8974
revlog: compute correct deltaparent in the deltaparent function
Sune Foldager <cryo@cyanite.org>
parents:
14196
diff
changeset
|
2823 return rev - 1 |
|
11929
1839a7518b0d
revlog: deltachain() returns chain of revs need to construct a revision
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
11928
diff
changeset
|
2824 |
|
39182
f8db458651c8
revlog: add a method to tells whether rev is stored as a snapshot
Paul Morelle <paul.morelle@octobus.net>
parents:
39180
diff
changeset
|
2825 def issnapshot(self, rev): |
|
45957
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
45885
diff
changeset
|
2826 """tells whether rev is a snapshot""" |
|
51097
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
2827 ret = self._inner.issnapshot(rev) |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
2828 self.issnapshot = self._inner.issnapshot |
|
ff673b9da21f
revlog: add a couple more of useful method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51096
diff
changeset
|
2829 return ret |
|
39182
f8db458651c8
revlog: add a method to tells whether rev is stored as a snapshot
Paul Morelle <paul.morelle@octobus.net>
parents:
39180
diff
changeset
|
2830 |
|
39185
3b1042cab4b4
revlog: add a method to retrieve snapshot depth
Boris Feld <boris.feld@octobus.net>
parents:
39183
diff
changeset
|
2831 def snapshotdepth(self, rev): |
|
3b1042cab4b4
revlog: add a method to retrieve snapshot depth
Boris Feld <boris.feld@octobus.net>
parents:
39183
diff
changeset
|
2832 """number of snapshot in the chain before this one""" |
|
3b1042cab4b4
revlog: add a method to retrieve snapshot depth
Boris Feld <boris.feld@octobus.net>
parents:
39183
diff
changeset
|
2833 if not self.issnapshot(rev): |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
2834 raise error.ProgrammingError(b'revision %d not a snapshot') |
|
51099
30f458fc59e9
revlog: move the `deltachain` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51098
diff
changeset
|
2835 return len(self._inner._deltachain(rev)[0]) - 1 |
|
39185
3b1042cab4b4
revlog: add a method to retrieve snapshot depth
Boris Feld <boris.feld@octobus.net>
parents:
39183
diff
changeset
|
2836 |
|
1941
7518823709a2
revlog.py: factorization and fixes for rev < 0 (nullid)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1853
diff
changeset
|
2837 def revdiff(self, rev1, rev2): |
|
31758
5d11b5edcb0b
revlog: use raw revisions in revdiff
Jun Wu <quark@fb.com>
parents:
31757
diff
changeset
|
2838 """return or calculate a delta between two revisions |
|
5d11b5edcb0b
revlog: use raw revisions in revdiff
Jun Wu <quark@fb.com>
parents:
31757
diff
changeset
|
2839 |
|
5d11b5edcb0b
revlog: use raw revisions in revdiff
Jun Wu <quark@fb.com>
parents:
31757
diff
changeset
|
2840 The delta calculated is in binary form and is intended to be written to |
|
5d11b5edcb0b
revlog: use raw revisions in revdiff
Jun Wu <quark@fb.com>
parents:
31757
diff
changeset
|
2841 revlog data directly. So this function needs raw revision data. |
|
5d11b5edcb0b
revlog: use raw revisions in revdiff
Jun Wu <quark@fb.com>
parents:
31757
diff
changeset
|
2842 """ |
|
14208
d62d597b8974
revlog: compute correct deltaparent in the deltaparent function
Sune Foldager <cryo@cyanite.org>
parents:
14196
diff
changeset
|
2843 if rev1 != nullrev and self.deltaparent(rev2) == rev1: |
|
51096
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
2844 return bytes(self._inner._chunk(rev2)) |
|
5005
72082bfced9a
revlog: minor revdiff reorganization
Matt Mackall <mpm@selenic.com>
parents:
5004
diff
changeset
|
2845 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2846 return mdiff.textdiff(self.rawdata(rev1), self.rawdata(rev2)) |
|
119
c7a66f9752a4
Add code to retrieve or construct a revlog delta
mpm@selenic.com
parents:
117
diff
changeset
|
2847 |
|
51027
33d2f0164d0d
revlog: drop the df argument to `revision`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51025
diff
changeset
|
2848 def revision(self, nodeorrev): |
|
16435
df347129305d
revlog: fix partial revision() docstring (from d7d64b89a65c)
Patrick Mezard <patrick@mezard.eu>
parents:
16424
diff
changeset
|
2849 """return an uncompressed revision of a given node or revision |
|
df347129305d
revlog: fix partial revision() docstring (from d7d64b89a65c)
Patrick Mezard <patrick@mezard.eu>
parents:
16424
diff
changeset
|
2850 number. |
|
df347129305d
revlog: fix partial revision() docstring (from d7d64b89a65c)
Patrick Mezard <patrick@mezard.eu>
parents:
16424
diff
changeset
|
2851 """ |
|
51027
33d2f0164d0d
revlog: drop the df argument to `revision`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51025
diff
changeset
|
2852 return self._revisiondata(nodeorrev) |
|
42735
389233789952
revlog: split a `_revisiondata` method to file `revision` job
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42711
diff
changeset
|
2853 |
|
51029
299b7b5440db
revlog: drop the df argument to `sidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51028
diff
changeset
|
2854 def sidedata(self, nodeorrev): |
|
42982
0d1272783f24
revlog: introduce a `sidedata` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42885
diff
changeset
|
2855 """a map of extra data related to the changeset but not part of the hash |
|
0d1272783f24
revlog: introduce a `sidedata` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42885
diff
changeset
|
2856 |
|
0d1272783f24
revlog: introduce a `sidedata` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42885
diff
changeset
|
2857 This function currently return a dictionary. However, more advanced |
|
0d1272783f24
revlog: introduce a `sidedata` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42885
diff
changeset
|
2858 mapping object will likely be used in the future for a more |
|
0d1272783f24
revlog: introduce a `sidedata` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42885
diff
changeset
|
2859 efficient/lazy code. |
|
0d1272783f24
revlog: introduce a `sidedata` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42885
diff
changeset
|
2860 """ |
|
47388
d6a52783d2ba
revlog: implement sidedata without using _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47336
diff
changeset
|
2861 # deal with <nodeorrev> argument type |
|
d6a52783d2ba
revlog: implement sidedata without using _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47336
diff
changeset
|
2862 if isinstance(nodeorrev, int): |
|
d6a52783d2ba
revlog: implement sidedata without using _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47336
diff
changeset
|
2863 rev = nodeorrev |
|
d6a52783d2ba
revlog: implement sidedata without using _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47336
diff
changeset
|
2864 else: |
|
d6a52783d2ba
revlog: implement sidedata without using _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47336
diff
changeset
|
2865 rev = self.rev(nodeorrev) |
|
d6a52783d2ba
revlog: implement sidedata without using _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47336
diff
changeset
|
2866 return self._sidedata(rev) |
|
42982
0d1272783f24
revlog: introduce a `sidedata` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42885
diff
changeset
|
2867 |
|
51101
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
2868 def _rawtext(self, node, rev): |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
2869 """return the possibly unvalidated rawtext for a revision |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
2870 |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
2871 returns (rev, rawtext, validated) |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
2872 """ |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
2873 # Check if we have the entry in cache |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
2874 # The cache entry looks like (node, rev, rawtext) |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
2875 if self._inner._revisioncache: |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
2876 if self._inner._revisioncache[0] == node: |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
2877 return (rev, self._inner._revisioncache[2], True) |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
2878 |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
2879 if rev is None: |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
2880 rev = self.rev(node) |
|
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
2881 |
|
51894
384016e91947
revlog: simplify rawtext return value
Rapha?l Gom?s <rgomes@octobus.net>
parents:
51893
diff
changeset
|
2882 text = self._inner.raw_text(node, rev) |
|
384016e91947
revlog: simplify rawtext return value
Rapha?l Gom?s <rgomes@octobus.net>
parents:
51893
diff
changeset
|
2883 return (rev, text, False) |
|
51101
be56d322ee89
revlog: move the `rawtext` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51100
diff
changeset
|
2884 |
|
51031
8520db304f01
revlog: drop more file description passing between private function
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51030
diff
changeset
|
2885 def _revisiondata(self, nodeorrev, raw=False): |
|
42806
616aa62e5027
revlog: add some documentation to `_revisiondata` code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42805
diff
changeset
|
2886 # deal with <nodeorrev> argument type |
|
16375
d7d64b89a65c
revlog: allow retrieving contents by revision number
Matt Mackall <mpm@selenic.com>
parents:
16374
diff
changeset
|
2887 if isinstance(nodeorrev, int): |
|
d7d64b89a65c
revlog: allow retrieving contents by revision number
Matt Mackall <mpm@selenic.com>
parents:
16374
diff
changeset
|
2888 rev = nodeorrev |
|
d7d64b89a65c
revlog: allow retrieving contents by revision number
Matt Mackall <mpm@selenic.com>
parents:
16374
diff
changeset
|
2889 node = self.node(rev) |
|
d7d64b89a65c
revlog: allow retrieving contents by revision number
Matt Mackall <mpm@selenic.com>
parents:
16374
diff
changeset
|
2890 else: |
|
d7d64b89a65c
revlog: allow retrieving contents by revision number
Matt Mackall <mpm@selenic.com>
parents:
16374
diff
changeset
|
2891 node = nodeorrev |
|
d7d64b89a65c
revlog: allow retrieving contents by revision number
Matt Mackall <mpm@selenic.com>
parents:
16374
diff
changeset
|
2892 rev = None |
|
d7d64b89a65c
revlog: allow retrieving contents by revision number
Matt Mackall <mpm@selenic.com>
parents:
16374
diff
changeset
|
2893 |
|
42806
616aa62e5027
revlog: add some documentation to `_revisiondata` code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42805
diff
changeset
|
2894 # fast path the special `nullid` rev |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
2895 if node == self.nullid: |
|
47391
9d9eb22b9b69
revlog: no longer return sidedata from `_revisiondata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47390
diff
changeset
|
2896 return b"" |
|
42805
bf070a59546a
revlog: move `nullid` early return sooner in `_revisiondata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42804
diff
changeset
|
2897 |
|
43984
bdb357161d7a
revlog: drop an unused variable assignment
Matt Harbison <matt_harbison@yahoo.com>
parents:
43962
diff
changeset
|
2898 # ``rawtext`` is the text as stored inside the revlog. Might be the |
|
bdb357161d7a
revlog: drop an unused variable assignment
Matt Harbison <matt_harbison@yahoo.com>
parents:
43962
diff
changeset
|
2899 # revision or might need to be processed to retrieve the revision. |
|
51031
8520db304f01
revlog: drop more file description passing between private function
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51030
diff
changeset
|
2900 rev, rawtext, validated = self._rawtext(node, rev) |
|
42808
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2901 |
|
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2902 if raw and validated: |
|
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2903 # if we don't want to process the raw text and that raw |
|
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2904 # text is cached, we can exit early. |
|
47391
9d9eb22b9b69
revlog: no longer return sidedata from `_revisiondata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47390
diff
changeset
|
2905 return rawtext |
|
42808
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2906 if rev is None: |
|
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2907 rev = self.rev(node) |
|
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2908 # the revlog's flag for this revision |
|
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2909 # (usually alter its state or content) |
|
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2910 flags = self.flags(rev) |
|
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2911 |
|
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2912 if validated and flags == REVIDX_DEFAULT_FLAGS: |
|
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2913 # no extra flags set, no flag processor runs, text = rawtext |
|
47391
9d9eb22b9b69
revlog: no longer return sidedata from `_revisiondata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47390
diff
changeset
|
2914 return rawtext |
|
46722
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
2915 |
|
42885
4a3efe0febb5
revlog: stop using `_processflags` directly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42882
diff
changeset
|
2916 if raw: |
|
42994
dff95420480f
flagprocessors: make `processflagsraw` a module level function
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42993
diff
changeset
|
2917 validatehash = flagutil.processflagsraw(self, rawtext, flags) |
|
42885
4a3efe0febb5
revlog: stop using `_processflags` directly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42882
diff
changeset
|
2918 text = rawtext |
|
4a3efe0febb5
revlog: stop using `_processflags` directly
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42882
diff
changeset
|
2919 else: |
|
46722
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
2920 r = flagutil.processflagsread(self, rawtext, flags) |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
2921 text, validatehash = r |
|
42808
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2922 if validatehash: |
|
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2923 self.checkhash(text, node, rev=rev) |
|
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2924 if not validated: |
|
51100
8ec2de9c6770
revlog: move the_revisioncache on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51099
diff
changeset
|
2925 self._inner._revisioncache = (node, rev, rawtext) |
|
42808
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2926 |
|
47391
9d9eb22b9b69
revlog: no longer return sidedata from `_revisiondata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47390
diff
changeset
|
2927 return text |
|
42808
e91411fcc697
revlog: split `rawtext` retrieval out of _revisiondata
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42807
diff
changeset
|
2928 |
|
46722
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
2929 def _sidedata(self, rev): |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
2930 """Return the sidedata for a given revision number.""" |
|
51895
b04011ca6eff
revlog: add an early return for getting sidedata
Rapha?l Gom?s <rgomes@octobus.net>
parents:
51894
diff
changeset
|
2931 if self._sidedatafile is None: |
|
b04011ca6eff
revlog: add an early return for getting sidedata
Rapha?l Gom?s <rgomes@octobus.net>
parents:
51894
diff
changeset
|
2932 return {} |
|
51102
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
2933 sidedata_end = None |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
2934 if self._docket is not None: |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
2935 sidedata_end = self._docket.sidedata_end |
|
49d75cc12b8f
revlog: move `sidedata` in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51101
diff
changeset
|
2936 return self._inner.sidedata(rev, sidedata_end) |
|
46722
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
2937 |
|
51028
14de15825253
revlog: drop the df argument to `rawdata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51027
diff
changeset
|
2938 def rawdata(self, nodeorrev): |
|
14de15825253
revlog: drop the df argument to `rawdata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51027
diff
changeset
|
2939 """return an uncompressed raw data of a given node or revision number.""" |
|
14de15825253
revlog: drop the df argument to `rawdata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51027
diff
changeset
|
2940 return self._revisiondata(nodeorrev, raw=True) |
|
42736
415e4136d326
rawdata: introduce a `rawdata` method on revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42735
diff
changeset
|
2941 |
|
22785
abc44fcc9c57
revlog: move references to revlog.hash to inside the revlog class
Augie Fackler <raf@durin42.com>
parents:
22784
diff
changeset
|
2942 def hash(self, text, p1, p2): |
|
abc44fcc9c57
revlog: move references to revlog.hash to inside the revlog class
Augie Fackler <raf@durin42.com>
parents:
22784
diff
changeset
|
2943 """Compute a node hash. |
|
abc44fcc9c57
revlog: move references to revlog.hash to inside the revlog class
Augie Fackler <raf@durin42.com>
parents:
22784
diff
changeset
|
2944 |
|
abc44fcc9c57
revlog: move references to revlog.hash to inside the revlog class
Augie Fackler <raf@durin42.com>
parents:
22784
diff
changeset
|
2945 Available as a function so that subclasses can replace the hash |
|
abc44fcc9c57
revlog: move references to revlog.hash to inside the revlog class
Augie Fackler <raf@durin42.com>
parents:
22784
diff
changeset
|
2946 as needed. |
|
abc44fcc9c57
revlog: move references to revlog.hash to inside the revlog class
Augie Fackler <raf@durin42.com>
parents:
22784
diff
changeset
|
2947 """ |
|
39882
f8eb71f9e3bd
storageutil: new module for storage primitives (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39877
diff
changeset
|
2948 return storageutil.hashrevisionsha1(text, p1, p2) |
|
22785
abc44fcc9c57
revlog: move references to revlog.hash to inside the revlog class
Augie Fackler <raf@durin42.com>
parents:
22784
diff
changeset
|
2949 |
|
30589
be5b2098a817
revlog: merge hash checking subfunctions
Remi Chaintron <remi@fb.com>
parents:
30552
diff
changeset
|
2950 def checkhash(self, text, node, p1=None, p2=None, rev=None): |
|
be5b2098a817
revlog: merge hash checking subfunctions
Remi Chaintron <remi@fb.com>
parents:
30552
diff
changeset
|
2951 """Check node hash integrity. |
|
19624
55749cb14d24
revlog: extract 'checkhash' method
Wojciech Lopata <lopek@fb.com>
parents:
19471
diff
changeset
|
2952 |
|
30589
be5b2098a817
revlog: merge hash checking subfunctions
Remi Chaintron <remi@fb.com>
parents:
30552
diff
changeset
|
2953 Available as a function so that subclasses can extend hash mismatch |
|
be5b2098a817
revlog: merge hash checking subfunctions
Remi Chaintron <remi@fb.com>
parents:
30552
diff
changeset
|
2954 behaviors as needed. |
|
be5b2098a817
revlog: merge hash checking subfunctions
Remi Chaintron <remi@fb.com>
parents:
30552
diff
changeset
|
2955 """ |
|
37443
65250a66b55c
revlog: move censor logic into main revlog class
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37442
diff
changeset
|
2956 try: |
|
65250a66b55c
revlog: move censor logic into main revlog class
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37442
diff
changeset
|
2957 if p1 is None and p2 is None: |
|
65250a66b55c
revlog: move censor logic into main revlog class
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37442
diff
changeset
|
2958 p1, p2 = self.parents(node) |
|
65250a66b55c
revlog: move censor logic into main revlog class
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37442
diff
changeset
|
2959 if node != self.hash(text, p1, p2): |
|
40055
801ccd8e67c0
revlog: clear revision cache on hash verification failure
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40053
diff
changeset
|
2960 # Clear the revision cache on hash failure. The revision cache |
|
801ccd8e67c0
revlog: clear revision cache on hash verification failure
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40053
diff
changeset
|
2961 # only stores the raw revision and clearing the cache does have |
|
801ccd8e67c0
revlog: clear revision cache on hash verification failure
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40053
diff
changeset
|
2962 # the side-effect that we won't have a cache hit when the raw |
|
801ccd8e67c0
revlog: clear revision cache on hash verification failure
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40053
diff
changeset
|
2963 # revision data is accessed. But this case should be rare and |
|
801ccd8e67c0
revlog: clear revision cache on hash verification failure
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40053
diff
changeset
|
2964 # it is extra work to teach the cache about the hash |
|
801ccd8e67c0
revlog: clear revision cache on hash verification failure
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40053
diff
changeset
|
2965 # verification state. |
|
51100
8ec2de9c6770
revlog: move the_revisioncache on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51099
diff
changeset
|
2966 if ( |
|
8ec2de9c6770
revlog: move the_revisioncache on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51099
diff
changeset
|
2967 self._inner._revisioncache |
|
8ec2de9c6770
revlog: move the_revisioncache on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51099
diff
changeset
|
2968 and self._inner._revisioncache[0] == node |
|
8ec2de9c6770
revlog: move the_revisioncache on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51099
diff
changeset
|
2969 ): |
|
8ec2de9c6770
revlog: move the_revisioncache on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51099
diff
changeset
|
2970 self._inner._revisioncache = None |
|
40055
801ccd8e67c0
revlog: clear revision cache on hash verification failure
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40053
diff
changeset
|
2971 |
|
37443
65250a66b55c
revlog: move censor logic into main revlog class
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37442
diff
changeset
|
2972 revornode = rev |
|
65250a66b55c
revlog: move censor logic into main revlog class
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37442
diff
changeset
|
2973 if revornode is None: |
|
65250a66b55c
revlog: move censor logic into main revlog class
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37442
diff
changeset
|
2974 revornode = templatefilters.short(hex(node)) |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2975 raise error.RevlogError( |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
2976 _(b"integrity check failed on %s:%s") |
|
47174
0a66eef0ed97
revlog: use revlog.display_id in integrity error
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47173
diff
changeset
|
2977 % (self.display_id, pycompat.bytestr(revornode)) |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
2978 ) |
|
39789
2cd93a8d4bde
revlog: drop RevlogError alias (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39785
diff
changeset
|
2979 except error.RevlogError: |
|
51055
0d33f4b0c4cb
revlog: remove legacy usage of `_censorable`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51054
diff
changeset
|
2980 if self.feature_config.censorable and storageutil.iscensoredtext( |
|
0d33f4b0c4cb
revlog: remove legacy usage of `_censorable`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51054
diff
changeset
|
2981 text |
|
0d33f4b0c4cb
revlog: remove legacy usage of `_censorable`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51054
diff
changeset
|
2982 ): |
|
47175
f574734eb2b7
revlog: use revlog.display_id in censor related errors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47174
diff
changeset
|
2983 raise error.CensoredNodeError(self.display_id, node, text) |
|
37443
65250a66b55c
revlog: move censor logic into main revlog class
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37442
diff
changeset
|
2984 raise |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
2985 |
|
50390
978ffa09910b
revlog: move the computation of the split_index path in a property
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50348
diff
changeset
|
2986 @property |
|
978ffa09910b
revlog: move the computation of the split_index path in a property
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50348
diff
changeset
|
2987 def _split_index_file(self): |
|
978ffa09910b
revlog: move the computation of the split_index path in a property
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50348
diff
changeset
|
2988 """the path where to expect the index of an ongoing splitting operation |
|
978ffa09910b
revlog: move the computation of the split_index path in a property
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50348
diff
changeset
|
2989 |
|
978ffa09910b
revlog: move the computation of the split_index path in a property
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50348
diff
changeset
|
2990 The file will only exist if a splitting operation is in progress, but |
|
978ffa09910b
revlog: move the computation of the split_index path in a property
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50348
diff
changeset
|
2991 it is always expected at the same location.""" |
|
50761
4a3a9d961561
revlog: fix the naming scheme use by split temporary file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50694
diff
changeset
|
2992 parts = self.radix.split(b'/') |
|
50391
12f13b13f414
revlog: avoid possible collision between directory and temporary index
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50390
diff
changeset
|
2993 if len(parts) > 1: |
|
12f13b13f414
revlog: avoid possible collision between directory and temporary index
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50390
diff
changeset
|
2994 # adds a '-s' prefix to the ``data/` or `meta/` base |
|
12f13b13f414
revlog: avoid possible collision between directory and temporary index
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50390
diff
changeset
|
2995 head = parts[0] + b'-s' |
|
50761
4a3a9d961561
revlog: fix the naming scheme use by split temporary file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50694
diff
changeset
|
2996 mids = parts[1:-1] |
|
4a3a9d961561
revlog: fix the naming scheme use by split temporary file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50694
diff
changeset
|
2997 tail = parts[-1] + b'.i' |
|
4a3a9d961561
revlog: fix the naming scheme use by split temporary file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50694
diff
changeset
|
2998 pieces = [head] + mids + [tail] |
|
4a3a9d961561
revlog: fix the naming scheme use by split temporary file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50694
diff
changeset
|
2999 return b'/'.join(pieces) |
|
50391
12f13b13f414
revlog: avoid possible collision between directory and temporary index
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50390
diff
changeset
|
3000 else: |
|
12f13b13f414
revlog: avoid possible collision between directory and temporary index
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50390
diff
changeset
|
3001 # the revlog is stored at the root of the store (changelog or |
|
12f13b13f414
revlog: avoid possible collision between directory and temporary index
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50390
diff
changeset
|
3002 # manifest), no risk of collision. |
|
12f13b13f414
revlog: avoid possible collision between directory and temporary index
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50390
diff
changeset
|
3003 return self.radix + b'.i.s' |
|
50390
978ffa09910b
revlog: move the computation of the split_index path in a property
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50348
diff
changeset
|
3004 |
|
51327
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3005 def _enforceinlinesize(self, tr): |
|
26376
344a1621674b
revlog: add docstring for checkinlinesize()
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26243
diff
changeset
|
3006 """Check if the revlog is too big for inline and convert if so. |
|
344a1621674b
revlog: add docstring for checkinlinesize()
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26243
diff
changeset
|
3007 |
|
344a1621674b
revlog: add docstring for checkinlinesize()
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26243
diff
changeset
|
3008 This should be called after revisions are added to the revlog. If the |
|
344a1621674b
revlog: add docstring for checkinlinesize()
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26243
diff
changeset
|
3009 revlog has grown too large to be an inline revlog, it will convert it |
|
344a1621674b
revlog: add docstring for checkinlinesize()
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26243
diff
changeset
|
3010 to use multiple index and data files. |
|
344a1621674b
revlog: add docstring for checkinlinesize()
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26243
diff
changeset
|
3011 """ |
|
38883
119d14f41cb2
revlog: remove some knowledge of sentinel nullid in index
Martin von Zweigbergk <martinvonz@google.com>
parents:
38880
diff
changeset
|
3012 tiprev = len(self) - 1 |
|
47181
88bd08a6830f
revlog: simplify a conditionnal in _enforceinlinesize
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47180
diff
changeset
|
3013 total_size = self.start(tiprev) + self.length(tiprev) |
|
51203
a93e52f0b6ff
changelog: disallow delayed write on inline changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51202
diff
changeset
|
3014 if not self._inline or (self._may_inline and total_size < _maxinline): |
| 2073 | 3015 return |
|
8315
c8493310ad9b
revlog: use index to find index size
Matt Mackall <mpm@selenic.com>
parents:
8314
diff
changeset
|
3016 |
|
51092
31f143448704
revlog: drop reference to docket in the inline-splitting code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51091
diff
changeset
|
3017 if self._docket is not None: |
|
31f143448704
revlog: drop reference to docket in the inline-splitting code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51091
diff
changeset
|
3018 msg = b"inline revlog should not have a docket" |
|
31f143448704
revlog: drop reference to docket in the inline-splitting code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51091
diff
changeset
|
3019 raise error.ProgrammingError(msg) |
|
31f143448704
revlog: drop reference to docket in the inline-splitting code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51091
diff
changeset
|
3020 |
|
51202
dcaa2df1f688
changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51143
diff
changeset
|
3021 # In the common case, we enforce inline size because the revlog has |
|
dcaa2df1f688
changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51143
diff
changeset
|
3022 # been appened too. And in such case, it must have an initial offset |
|
dcaa2df1f688
changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51143
diff
changeset
|
3023 # recorded in the transaction. |
|
51109
af96fbb8f739
revlog: add a `canonical_index_file` attribute on inner revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51106
diff
changeset
|
3024 troffset = tr.findoffset(self._inner.canonical_index_file) |
|
51202
dcaa2df1f688
changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51143
diff
changeset
|
3025 pre_touched = troffset is not None |
|
dcaa2df1f688
changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51143
diff
changeset
|
3026 if not pre_touched and self.target[0] != KIND_CHANGELOG: |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3027 raise error.RevlogError( |
|
47162
a07d5cb03a85
revlog: rename `indexfile` to `_indexfile`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47159
diff
changeset
|
3028 _(b"%s not found in the transaction") % self._indexfile |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3029 ) |
|
51202
dcaa2df1f688
changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51143
diff
changeset
|
3030 |
|
dcaa2df1f688
changelog: never inline changelog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51143
diff
changeset
|
3031 tr.addbackup(self._inner.canonical_index_file, for_offset=pre_touched) |
|
47163
396442cd7e6a
revlog: rename `datafile` to `datafile`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47162
diff
changeset
|
3032 tr.add(self._datafile, 0) |
|
8315
c8493310ad9b
revlog: use index to find index size
Matt Mackall <mpm@selenic.com>
parents:
8314
diff
changeset
|
3033 |
|
51094
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
3034 new_index_file_path = None |
|
51327
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3035 old_index_file_path = self._indexfile |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3036 new_index_file_path = self._split_index_file |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3037 opener = self.opener |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3038 weak_self = weakref.ref(self) |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3039 |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3040 # the "split" index replace the real index when the transaction is |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3041 # finalized |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3042 def finalize_callback(tr): |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3043 opener.rename( |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3044 new_index_file_path, |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3045 old_index_file_path, |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3046 checkambig=True, |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3047 ) |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3048 maybe_self = weak_self() |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3049 if maybe_self is not None: |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3050 maybe_self._indexfile = old_index_file_path |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3051 maybe_self._inner.index_file = maybe_self._indexfile |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3052 |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3053 def abort_callback(tr): |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3054 maybe_self = weak_self() |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3055 if maybe_self is not None: |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3056 maybe_self._indexfile = old_index_file_path |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3057 maybe_self._inner.inline = True |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3058 maybe_self._inner.index_file = old_index_file_path |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3059 |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3060 tr.registertmp(new_index_file_path) |
|
51505
3cf9e52f5e27
inline-changelog: fix a critical bug in write_pending that delete data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51426
diff
changeset
|
3061 # we use 001 here to make this this happens after the finalisation of |
|
3cf9e52f5e27
inline-changelog: fix a critical bug in write_pending that delete data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51426
diff
changeset
|
3062 # pending changelog write (using 000). Otherwise the two finalizer |
|
3cf9e52f5e27
inline-changelog: fix a critical bug in write_pending that delete data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51426
diff
changeset
|
3063 # would step over each other and delete the changelog.i file. |
|
51327
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3064 if self.target[1] is not None: |
|
51505
3cf9e52f5e27
inline-changelog: fix a critical bug in write_pending that delete data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51426
diff
changeset
|
3065 callback_id = b'001-revlog-split-%d-%s' % self.target |
|
51327
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3066 else: |
|
51505
3cf9e52f5e27
inline-changelog: fix a critical bug in write_pending that delete data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51426
diff
changeset
|
3067 callback_id = b'001-revlog-split-%d' % self.target[0] |
|
51327
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3068 tr.addfinalize(callback_id, finalize_callback) |
|
5b3b6db49bbb
changelog: drop the side_write argument to revlog splitting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51290
diff
changeset
|
3069 tr.addabort(callback_id, abort_callback) |
|
8315
c8493310ad9b
revlog: use index to find index size
Matt Mackall <mpm@selenic.com>
parents:
8314
diff
changeset
|
3070 |
|
51094
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
3071 self._format_flags &= ~FLAG_INLINE_DATA |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
3072 self._inner.split_inline( |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
3073 tr, |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
3074 self._format_flags | self._format_version, |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
3075 new_index_file_path=new_index_file_path, |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
3076 ) |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
3077 |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
3078 self._inline = False |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
3079 if new_index_file_path is not None: |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
3080 self._indexfile = new_index_file_path |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
3081 |
|
de6a8cc24de3
revlog: move the splitting-inline-revlog logic inside the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51093
diff
changeset
|
3082 nodemaputil.setup_persistent_nodemap(tr, self) |
|
47225
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
3083 |
|
39891
debc4ee597e7
revlog: add a callback "tracking" duplicate node addition
Boris Feld <boris.feld@octobus.net>
parents:
39886
diff
changeset
|
3084 def _nodeduplicatecallback(self, transaction, node): |
|
45957
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
45885
diff
changeset
|
3085 """called when trying to add a node already stored.""" |
|
39891
debc4ee597e7
revlog: add a callback "tracking" duplicate node addition
Boris Feld <boris.feld@octobus.net>
parents:
39886
diff
changeset
|
3086 |
|
47225
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
3087 @contextlib.contextmanager |
|
47469
5fa083a5ff04
copies: Keep changelog sidedata file open during copy tracing
Simon Sapin <simon.sapin@octobus.net>
parents:
47463
diff
changeset
|
3088 def reading(self): |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
3089 with self._inner.reading(): |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
3090 yield |
|
47469
5fa083a5ff04
copies: Keep changelog sidedata file open during copy tracing
Simon Sapin <simon.sapin@octobus.net>
parents:
47463
diff
changeset
|
3091 |
|
5fa083a5ff04
copies: Keep changelog sidedata file open during copy tracing
Simon Sapin <simon.sapin@octobus.net>
parents:
47463
diff
changeset
|
3092 @contextlib.contextmanager |
|
47225
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
3093 def _writing(self, transaction): |
|
47251
4f38ada3fc26
revlog: move the `trypending` logic from the `changelog` to the `revlog`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47250
diff
changeset
|
3094 if self._trypending: |
|
4f38ada3fc26
revlog: move the `trypending` logic from the `changelog` to the `revlog`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47250
diff
changeset
|
3095 msg = b'try to write in a `trypending` revlog: %s' |
|
4f38ada3fc26
revlog: move the `trypending` logic from the `changelog` to the `revlog`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47250
diff
changeset
|
3096 msg %= self.display_id |
|
4f38ada3fc26
revlog: move the `trypending` logic from the `changelog` to the `revlog`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47250
diff
changeset
|
3097 raise error.ProgrammingError(msg) |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
3098 if self._inner.is_writing: |
|
47225
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
3099 yield |
|
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
3100 else: |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
3101 data_end = None |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
3102 sidedata_end = None |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
3103 if self._docket is not None: |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
3104 data_end = self._docket.data_end |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
3105 sidedata_end = self._docket.sidedata_end |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
3106 with self._inner.writing( |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
3107 transaction, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
3108 data_end=data_end, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
3109 sidedata_end=sidedata_end, |
|
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
3110 ): |
|
47335
1844a2e3401c
revlog: simplify the try nesting in the `_writing` context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47332
diff
changeset
|
3111 yield |
|
1844a2e3401c
revlog: simplify the try nesting in the `_writing` context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47332
diff
changeset
|
3112 if self._docket is not None: |
|
1844a2e3401c
revlog: simplify the try nesting in the `_writing` context
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47332
diff
changeset
|
3113 self._write_docket(transaction) |
|
47225
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
3114 |
|
51110
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
3115 @property |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
3116 def is_delaying(self): |
|
d83d788590a8
changelog-delay: move the delay/divert logic inside the (inner) revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51109
diff
changeset
|
3117 return self._inner.is_delaying |
|
47225
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
3118 |
|
47250
682f09857d69
revlogv2: delay the update of the changelog docket to transaction end
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47249
diff
changeset
|
3119 def _write_docket(self, transaction): |
|
682f09857d69
revlogv2: delay the update of the changelog docket to transaction end
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47249
diff
changeset
|
3120 """write the current docket on disk |
|
682f09857d69
revlogv2: delay the update of the changelog docket to transaction end
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47249
diff
changeset
|
3121 |
|
682f09857d69
revlogv2: delay the update of the changelog docket to transaction end
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47249
diff
changeset
|
3122 Exist as a method to help changelog to implement transaction logic |
|
682f09857d69
revlogv2: delay the update of the changelog docket to transaction end
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47249
diff
changeset
|
3123 |
|
682f09857d69
revlogv2: delay the update of the changelog docket to transaction end
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47249
diff
changeset
|
3124 We could also imagine using the same transaction logic for all revlog |
|
682f09857d69
revlogv2: delay the update of the changelog docket to transaction end
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47249
diff
changeset
|
3125 since docket are cheap.""" |
|
682f09857d69
revlogv2: delay the update of the changelog docket to transaction end
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47249
diff
changeset
|
3126 self._docket.write(transaction) |
|
682f09857d69
revlogv2: delay the update of the changelog docket to transaction end
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47249
diff
changeset
|
3127 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3128 def addrevision( |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3129 self, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3130 text, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3131 transaction, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3132 link, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3133 p1, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3134 p2, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3135 cachedelta=None, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3136 node=None, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3137 flags=REVIDX_DEFAULT_FLAGS, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3138 deltacomputer=None, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3139 sidedata=None, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3140 ): |
| 1083 | 3141 """add a revision to the log |
| 3142 | |
| 3143 text - the revision data to add | |
| 3144 transaction - the transaction object used for rollback | |
| 3145 link - the linkrev data to add | |
| 3146 p1, p2 - the parent nodeids of the revision | |
|
12012
bade7a9c5c07
revlog: fix docstring
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12011
diff
changeset
|
3147 cachedelta - an optional precomputed delta |
|
19625
6a411a06cb1f
revlog: pass node as an argument of addrevision
Wojciech Lopata <lopek@fb.com>
parents:
19624
diff
changeset
|
3148 node - nodeid of revision; typically node is not specified, and it is |
|
6a411a06cb1f
revlog: pass node as an argument of addrevision
Wojciech Lopata <lopek@fb.com>
parents:
19624
diff
changeset
|
3149 computed by default as hash(text, p1, p2), however subclasses might |
|
6a411a06cb1f
revlog: pass node as an argument of addrevision
Wojciech Lopata <lopek@fb.com>
parents:
19624
diff
changeset
|
3150 use different hashing method (and override checkhash() in such case) |
|
30744
e12c0fa1f65b
revlog: pass revlog flags to addrevision
Remi Chaintron <remi@fb.com>
parents:
30743
diff
changeset
|
3151 flags - the known flags to set on the revision |
|
39357
655b5b465953
revlog: split functionality related to deltas computation in a new module
Boris Feld <boris.feld@octobus.net>
parents:
39356
diff
changeset
|
3152 deltacomputer - an optional deltacomputer instance shared between |
|
35738
f90f6fd130c1
revlog: group delta computation methods under _deltacomputer object
Paul Morelle <paul.morelle@octobus.net>
parents:
35737
diff
changeset
|
3153 multiple calls |
| 1083 | 3154 """ |
|
19326
7014526d67a8
revlog: add exception when linkrev == nullrev
Durham Goode <durham@fb.com>
parents:
19200
diff
changeset
|
3155 if link == nullrev: |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3156 raise error.RevlogError( |
|
47177
6bc7c467a7d1
revlog: use revlog.display_id in error related to bad revisions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47176
diff
changeset
|
3157 _(b"attempted to add linkrev -1 to %s") % self.display_id |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3158 ) |
|
25459
0bda5bfaf0b1
revlog: move size limit check to addrevision
Matt Mackall <mpm@selenic.com>
parents:
25410
diff
changeset
|
3159 |
|
42988
33532939c667
revlog: add a `sidedata` parameters to addrevision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42987
diff
changeset
|
3160 if sidedata is None: |
|
33532939c667
revlog: add a `sidedata` parameters to addrevision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42987
diff
changeset
|
3161 sidedata = {} |
|
51066
7c2dc75cdc0f
revlog: remove legacy usage of `hassidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51065
diff
changeset
|
3162 elif sidedata and not self.feature_config.has_side_data: |
|
43030
827cb4fe62a3
sidedata: introduce a new requirement to protect the feature
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43027
diff
changeset
|
3163 raise error.ProgrammingError( |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3164 _(b"trying to add sidedata to a revlog who don't support them") |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3165 ) |
|
42988
33532939c667
revlog: add a `sidedata` parameters to addrevision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42987
diff
changeset
|
3166 |
| 30745 | 3167 if flags: |
| 3168 node = node or self.hash(text, p1, p2) | |
| 3169 | |
|
46722
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3170 rawtext, validatehash = flagutil.processflagswrite(self, text, flags) |
| 30745 | 3171 |
| 3172 # If the flag processor modifies the revision data, ignore any provided | |
| 3173 # cachedelta. | |
|
31755
f319981c24c9
revlog: rename some "text"s to "rawtext"
Jun Wu <quark@fb.com>
parents:
31754
diff
changeset
|
3174 if rawtext != text: |
| 30745 | 3175 cachedelta = None |
| 3176 | |
|
31755
f319981c24c9
revlog: rename some "text"s to "rawtext"
Jun Wu <quark@fb.com>
parents:
31754
diff
changeset
|
3177 if len(rawtext) > _maxentrysize: |
|
39789
2cd93a8d4bde
revlog: drop RevlogError alias (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39785
diff
changeset
|
3178 raise error.RevlogError( |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3179 _( |
|
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3180 b"%s: size of %d bytes exceeds maximum revlog storage of 2GiB" |
|
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3181 ) |
|
47176
dfe8074239de
revlog: use revlog.display_id in "revision too big" errors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47175
diff
changeset
|
3182 % (self.display_id, len(rawtext)) |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3183 ) |
|
25459
0bda5bfaf0b1
revlog: move size limit check to addrevision
Matt Mackall <mpm@selenic.com>
parents:
25410
diff
changeset
|
3184 |
|
31755
f319981c24c9
revlog: rename some "text"s to "rawtext"
Jun Wu <quark@fb.com>
parents:
31754
diff
changeset
|
3185 node = node or self.hash(rawtext, p1, p2) |
|
46560
f7b61ad3c64a
revlog: change addrevision to return the new revision, not node
Joerg Sonnenberger <joerg@bec.de>
parents:
46559
diff
changeset
|
3186 rev = self.index.get_rev(node) |
|
f7b61ad3c64a
revlog: change addrevision to return the new revision, not node
Joerg Sonnenberger <joerg@bec.de>
parents:
46559
diff
changeset
|
3187 if rev is not None: |
|
f7b61ad3c64a
revlog: change addrevision to return the new revision, not node
Joerg Sonnenberger <joerg@bec.de>
parents:
46559
diff
changeset
|
3188 return rev |
|
12023
44c22dc193a4
revlog.addrevision(): move computation of nodeid in addrevision()
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12012
diff
changeset
|
3189 |
| 30745 | 3190 if validatehash: |
|
31755
f319981c24c9
revlog: rename some "text"s to "rawtext"
Jun Wu <quark@fb.com>
parents:
31754
diff
changeset
|
3191 self.checkhash(rawtext, node, p1=p1, p2=p2) |
| 30745 | 3192 |
|
46560
f7b61ad3c64a
revlog: change addrevision to return the new revision, not node
Joerg Sonnenberger <joerg@bec.de>
parents:
46559
diff
changeset
|
3193 return self.addrawrevision( |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3194 rawtext, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3195 transaction, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3196 link, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3197 p1, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3198 p2, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3199 node, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3200 flags, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3201 cachedelta=cachedelta, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3202 deltacomputer=deltacomputer, |
|
46722
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3203 sidedata=sidedata, |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3204 ) |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3205 |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3206 def addrawrevision( |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3207 self, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3208 rawtext, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3209 transaction, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3210 link, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3211 p1, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3212 p2, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3213 node, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3214 flags, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3215 cachedelta=None, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3216 deltacomputer=None, |
|
46722
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3217 sidedata=None, |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3218 ): |
|
32284
3de4c61b5087
revlog: move part of "addrevision" to "addrawrevision"
Jun Wu <quark@fb.com>
parents:
32269
diff
changeset
|
3219 """add a raw revision with known flags, node and parents |
|
3de4c61b5087
revlog: move part of "addrevision" to "addrawrevision"
Jun Wu <quark@fb.com>
parents:
32269
diff
changeset
|
3220 useful when reusing a revision not stored in this revlog (ex: received |
|
3de4c61b5087
revlog: move part of "addrevision" to "addrawrevision"
Jun Wu <quark@fb.com>
parents:
32269
diff
changeset
|
3221 over wire, or read from an external bundle). |
|
3de4c61b5087
revlog: move part of "addrevision" to "addrawrevision"
Jun Wu <quark@fb.com>
parents:
32269
diff
changeset
|
3222 """ |
|
47225
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
3223 with self._writing(transaction): |
|
46559
9ee4e988e2be
revlog: change addrawrevision to return the revision
Joerg Sonnenberger <joerg@bec.de>
parents:
46558
diff
changeset
|
3224 return self._addrevision( |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3225 node, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3226 rawtext, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3227 transaction, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3228 link, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3229 p1, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3230 p2, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3231 flags, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3232 cachedelta, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3233 deltacomputer=deltacomputer, |
|
46722
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3234 sidedata=sidedata, |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3235 ) |
|
3390
a74addddd092
make revlog.addgroup pass its file handles to addrevision
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3360
diff
changeset
|
3236 |
|
51737
df6ce326936f
typing: add a few type hints to `mercurial/revlog.py`
Matt Harbison <matt_harbison@yahoo.com>
parents:
51650
diff
changeset
|
3237 def compress(self, data: bytes) -> Tuple[bytes, bytes]: |
|
51095
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
3238 return self._inner.compress(data) |
|
17128
1028a1c9077a
revlog: make compress a method
Bryan O'Sullivan <bryano@fb.com>
parents:
17009
diff
changeset
|
3239 |
|
30793
b6f455a6e4d6
revlog: move decompress() from module to revlog class (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30792
diff
changeset
|
3240 def decompress(self, data): |
|
51095
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
3241 return self._inner.decompress(data) |
|
30793
b6f455a6e4d6
revlog: move decompress() from module to revlog class (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30792
diff
changeset
|
3242 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3243 def _addrevision( |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3244 self, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3245 node, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3246 rawtext, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3247 transaction, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3248 link, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3249 p1, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3250 p2, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3251 flags, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3252 cachedelta, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3253 alwayscache=False, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3254 deltacomputer=None, |
|
46722
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3255 sidedata=None, |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3256 ): |
|
14292
c97d8485b5fa
revlog: add docstring to _addrevision
Sune Foldager <cryo@cyanite.org>
parents:
14270
diff
changeset
|
3257 """internal function to add revisions to the log |
|
12623
8f97b50a8d10
revlog._addrevision(): allow text argument to be None, build it lazily
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12336
diff
changeset
|
3258 |
|
14292
c97d8485b5fa
revlog: add docstring to _addrevision
Sune Foldager <cryo@cyanite.org>
parents:
14270
diff
changeset
|
3259 see addrevision for argument descriptions. |
|
31760
ec48d57de110
revlog: make _addrevision only accept rawtext
Jun Wu <quark@fb.com>
parents:
31759
diff
changeset
|
3260 |
|
ec48d57de110
revlog: make _addrevision only accept rawtext
Jun Wu <quark@fb.com>
parents:
31759
diff
changeset
|
3261 note: "addrevision" takes non-raw text, "_addrevision" takes raw text. |
|
ec48d57de110
revlog: make _addrevision only accept rawtext
Jun Wu <quark@fb.com>
parents:
31759
diff
changeset
|
3262 |
|
35738
f90f6fd130c1
revlog: group delta computation methods under _deltacomputer object
Paul Morelle <paul.morelle@octobus.net>
parents:
35737
diff
changeset
|
3263 if "deltacomputer" is not provided or None, a defaultdeltacomputer will |
|
f90f6fd130c1
revlog: group delta computation methods under _deltacomputer object
Paul Morelle <paul.morelle@octobus.net>
parents:
35737
diff
changeset
|
3264 be used. |
|
f90f6fd130c1
revlog: group delta computation methods under _deltacomputer object
Paul Morelle <paul.morelle@octobus.net>
parents:
35737
diff
changeset
|
3265 |
|
14292
c97d8485b5fa
revlog: add docstring to _addrevision
Sune Foldager <cryo@cyanite.org>
parents:
14270
diff
changeset
|
3266 invariants: |
|
31760
ec48d57de110
revlog: make _addrevision only accept rawtext
Jun Wu <quark@fb.com>
parents:
31759
diff
changeset
|
3267 - rawtext is optional (can be None); if not set, cachedelta must be set. |
|
17424
e7cfe3587ea4
fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents:
17150
diff
changeset
|
3268 if both are set, they must correspond to each other. |
|
14292
c97d8485b5fa
revlog: add docstring to _addrevision
Sune Foldager <cryo@cyanite.org>
parents:
14270
diff
changeset
|
3269 """ |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
3270 if node == self.nullid: |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3271 raise error.RevlogError( |
|
47177
6bc7c467a7d1
revlog: use revlog.display_id in error related to bad revisions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47176
diff
changeset
|
3272 _(b"%s: attempt to add null revision") % self.display_id |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3273 ) |
|
47055
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
3274 if ( |
|
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
3275 node == self.nodeconstants.wdirid |
|
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
3276 or node in self.nodeconstants.wdirfilenodeids |
|
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46974
diff
changeset
|
3277 ): |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3278 raise error.RevlogError( |
|
47177
6bc7c467a7d1
revlog: use revlog.display_id in error related to bad revisions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47176
diff
changeset
|
3279 _(b"%s: attempt to add wdir revision") % self.display_id |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3280 ) |
|
51896
2fd44b3dcc33
revlog: use the method to check if the revlog is being written to
Rapha?l Gom?s <rgomes@octobus.net>
parents:
51895
diff
changeset
|
3281 if not self._inner.is_writing: |
|
47225
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
3282 msg = b'adding revision outside `revlog._writing` context' |
|
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
3283 raise error.ProgrammingError(msg) |
|
34045
bfb38c5cebf4
revlog: move check for wdir from changelog to revlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
34044
diff
changeset
|
3284 |
|
31760
ec48d57de110
revlog: make _addrevision only accept rawtext
Jun Wu <quark@fb.com>
parents:
31759
diff
changeset
|
3285 btext = [rawtext] |
|
12623
8f97b50a8d10
revlog._addrevision(): allow text argument to be None, build it lazily
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12336
diff
changeset
|
3286 |
|
6750
fb42030d79d6
add __len__ and __iter__ methods to repo and revlog
Matt Mackall <mpm@selenic.com>
parents:
6703
diff
changeset
|
3287 curr = len(self) |
|
4981
e7131935fbb3
revlog: simplify addrevision
Matt Mackall <mpm@selenic.com>
parents:
4980
diff
changeset
|
3288 prev = curr - 1 |
|
46723
4cd214c9948d
revlogv2: don't assume that the sidedata of the last rev is right after data
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46722
diff
changeset
|
3289 |
|
4cd214c9948d
revlogv2: don't assume that the sidedata of the last rev is right after data
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46722
diff
changeset
|
3290 offset = self._get_data_offset(prev) |
|
46646
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
3291 |
|
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
3292 if self._concurrencychecker: |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
3293 ifh, dfh, sdfh = self._inner._writinghandles |
|
47395
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
3294 # XXX no checking for the sidedata file |
|
46646
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
3295 if self._inline: |
|
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
3296 # offset is "as if" it were in the .d file, so we need to add on |
|
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
3297 # the size of the entry metadata. |
|
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
3298 self._concurrencychecker( |
|
47162
a07d5cb03a85
revlog: rename `indexfile` to `_indexfile`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47159
diff
changeset
|
3299 ifh, self._indexfile, offset + curr * self.index.entry_size |
|
46646
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
3300 ) |
|
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
3301 else: |
|
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
3302 # Entries in the .i are a consistent size. |
|
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
3303 self._concurrencychecker( |
|
47162
a07d5cb03a85
revlog: rename `indexfile` to `_indexfile`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47159
diff
changeset
|
3304 ifh, self._indexfile, curr * self.index.entry_size |
|
46646
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
3305 ) |
|
47163
396442cd7e6a
revlog: rename `datafile` to `datafile`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47162
diff
changeset
|
3306 self._concurrencychecker(dfh, self._datafile, offset) |
|
46646
e9901d01d135
revlog: add a mechanism to verify expected file position before appending
Kyle Lippincott <spectral@google.com>
parents:
46561
diff
changeset
|
3307 |
|
12889
5482c6b826f4
revlog: precalculate p1 and p2 revisions
Matt Mackall <mpm@selenic.com>
parents:
12888
diff
changeset
|
3308 p1r, p2r = self.rev(p1), self.rev(p2) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
3309 |
|
26116
562cfc99e611
revlog: move textlen calculation to be above delta chooser
Durham Goode <durham@fb.com>
parents:
26115
diff
changeset
|
3310 # full versions are inserted when the needed deltas |
|
562cfc99e611
revlog: move textlen calculation to be above delta chooser
Durham Goode <durham@fb.com>
parents:
26115
diff
changeset
|
3311 # become comparable to the uncompressed text |
|
31760
ec48d57de110
revlog: make _addrevision only accept rawtext
Jun Wu <quark@fb.com>
parents:
31759
diff
changeset
|
3312 if rawtext is None: |
|
35841
369aadf7a326
revlog: resolve lfs rawtext to vanilla rawtext before applying delta
Jun Wu <quark@fb.com>
parents:
35840
diff
changeset
|
3313 # need rawtext size, before changed by flag processors, which is |
|
369aadf7a326
revlog: resolve lfs rawtext to vanilla rawtext before applying delta
Jun Wu <quark@fb.com>
parents:
35840
diff
changeset
|
3314 # the non-raw size. use revlog explicitly to avoid filelog's extra |
|
369aadf7a326
revlog: resolve lfs rawtext to vanilla rawtext before applying delta
Jun Wu <quark@fb.com>
parents:
35840
diff
changeset
|
3315 # logic that might remove metadata size. |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3316 textlen = mdiff.patchedsize( |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3317 revlog.size(self, cachedelta[0]), cachedelta[1] |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3318 ) |
|
26116
562cfc99e611
revlog: move textlen calculation to be above delta chooser
Durham Goode <durham@fb.com>
parents:
26115
diff
changeset
|
3319 else: |
|
31760
ec48d57de110
revlog: make _addrevision only accept rawtext
Jun Wu <quark@fb.com>
parents:
31759
diff
changeset
|
3320 textlen = len(rawtext) |
|
26116
562cfc99e611
revlog: move textlen calculation to be above delta chooser
Durham Goode <durham@fb.com>
parents:
26115
diff
changeset
|
3321 |
|
35738
f90f6fd130c1
revlog: group delta computation methods under _deltacomputer object
Paul Morelle <paul.morelle@octobus.net>
parents:
35737
diff
changeset
|
3322 if deltacomputer is None: |
|
49248
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3323 write_debug = None |
|
51059
ab2bc31fa91f
revlog: remove legacy usage of `_debug_delta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51056
diff
changeset
|
3324 if self.delta_config.debug_delta: |
|
49248
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3325 write_debug = transaction._report |
|
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3326 deltacomputer = deltautil.deltacomputer( |
|
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3327 self, write_debug=write_debug |
|
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3328 ) |
|
35738
f90f6fd130c1
revlog: group delta computation methods under _deltacomputer object
Paul Morelle <paul.morelle@octobus.net>
parents:
35737
diff
changeset
|
3329 |
|
49791
05db41701ece
find-delta: pass the cache-delta usage policy alongside the cache-delta
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49778
diff
changeset
|
3330 if cachedelta is not None and len(cachedelta) == 2: |
|
05db41701ece
find-delta: pass the cache-delta usage policy alongside the cache-delta
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49778
diff
changeset
|
3331 # If the cached delta has no information about how it should be |
|
05db41701ece
find-delta: pass the cache-delta usage policy alongside the cache-delta
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49778
diff
changeset
|
3332 # reused, add the default reuse instruction according to the |
|
05db41701ece
find-delta: pass the cache-delta usage policy alongside the cache-delta
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49778
diff
changeset
|
3333 # revlog's configuration. |
|
51051
f636103c4d67
revlog: remove legacy usage of `_generaldelta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51049
diff
changeset
|
3334 if ( |
|
f636103c4d67
revlog: remove legacy usage of `_generaldelta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51049
diff
changeset
|
3335 self.delta_config.general_delta |
|
f636103c4d67
revlog: remove legacy usage of `_generaldelta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51049
diff
changeset
|
3336 and self.delta_config.lazy_delta_base |
|
f636103c4d67
revlog: remove legacy usage of `_generaldelta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51049
diff
changeset
|
3337 ): |
|
49791
05db41701ece
find-delta: pass the cache-delta usage policy alongside the cache-delta
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49778
diff
changeset
|
3338 delta_base_reuse = DELTA_BASE_REUSE_TRY |
|
05db41701ece
find-delta: pass the cache-delta usage policy alongside the cache-delta
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49778
diff
changeset
|
3339 else: |
|
05db41701ece
find-delta: pass the cache-delta usage policy alongside the cache-delta
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49778
diff
changeset
|
3340 delta_base_reuse = DELTA_BASE_REUSE_NO |
|
05db41701ece
find-delta: pass the cache-delta usage policy alongside the cache-delta
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49778
diff
changeset
|
3341 cachedelta = (cachedelta[0], cachedelta[1], delta_base_reuse) |
|
05db41701ece
find-delta: pass the cache-delta usage policy alongside the cache-delta
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49778
diff
changeset
|
3342 |
|
47405
34cc102c73f5
revlog: move `revisioninfo` in `revlogutils`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47402
diff
changeset
|
3343 revinfo = revlogutils.revisioninfo( |
|
34cc102c73f5
revlog: move `revisioninfo` in `revlogutils`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47402
diff
changeset
|
3344 node, |
|
34cc102c73f5
revlog: move `revisioninfo` in `revlogutils`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47402
diff
changeset
|
3345 p1, |
|
34cc102c73f5
revlog: move `revisioninfo` in `revlogutils`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47402
diff
changeset
|
3346 p2, |
|
34cc102c73f5
revlog: move `revisioninfo` in `revlogutils`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47402
diff
changeset
|
3347 btext, |
|
34cc102c73f5
revlog: move `revisioninfo` in `revlogutils`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47402
diff
changeset
|
3348 textlen, |
|
34cc102c73f5
revlog: move `revisioninfo` in `revlogutils`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47402
diff
changeset
|
3349 cachedelta, |
|
34cc102c73f5
revlog: move `revisioninfo` in `revlogutils`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47402
diff
changeset
|
3350 flags, |
|
34cc102c73f5
revlog: move `revisioninfo` in `revlogutils`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47402
diff
changeset
|
3351 ) |
|
35840
33275ab5e837
revlog: do not use delta for lfs revisions
Jun Wu <quark@fb.com>
parents:
35839
diff
changeset
|
3352 |
|
51025
509f0f7fc89e
delta-computer: stop explicitly taking file handle
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51023
diff
changeset
|
3353 deltainfo = deltacomputer.finddeltainfo(revinfo) |
|
35634
b43578ec483a
revlog: refactor out the selection of candidate revisions
Paul Morelle <paul.morelle@octobus.net>
parents:
35525
diff
changeset
|
3354 |
|
47264
b876f0bf7366
revlog: introduce a plain compression mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47263
diff
changeset
|
3355 compression_mode = COMP_MODE_INLINE |
|
b876f0bf7366
revlog: introduce a plain compression mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47263
diff
changeset
|
3356 if self._docket is not None: |
|
47458
c6844912c327
revlog: factor the logic to determine the delta compression out
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47456
diff
changeset
|
3357 default_comp = self._docket.default_compression_header |
|
c6844912c327
revlog: factor the logic to determine the delta compression out
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47456
diff
changeset
|
3358 r = deltautil.delta_compression(default_comp, deltainfo) |
|
c6844912c327
revlog: factor the logic to determine the delta compression out
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47456
diff
changeset
|
3359 compression_mode, deltainfo = r |
|
47264
b876f0bf7366
revlog: introduce a plain compression mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47263
diff
changeset
|
3360 |
|
47267
2b69555e4875
revlog: introduce a compression mode for sidedata in the revlog index
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47266
diff
changeset
|
3361 sidedata_compression_mode = COMP_MODE_INLINE |
|
51066
7c2dc75cdc0f
revlog: remove legacy usage of `hassidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51065
diff
changeset
|
3362 if sidedata and self.feature_config.has_side_data: |
|
47267
2b69555e4875
revlog: introduce a compression mode for sidedata in the revlog index
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47266
diff
changeset
|
3363 sidedata_compression_mode = COMP_MODE_PLAIN |
|
46722
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3364 serialized_sidedata = sidedatautil.serialize_sidedata(sidedata) |
|
47395
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
3365 sidedata_offset = self._docket.sidedata_end |
|
51095
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
3366 h, comp_sidedata = self._inner.compress(serialized_sidedata) |
|
47269
c4dbb7636a12
revlog: compress sidedata in `_writeentry`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47268
diff
changeset
|
3367 if ( |
|
c4dbb7636a12
revlog: compress sidedata in `_writeentry`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47268
diff
changeset
|
3368 h != b'u' |
|
c4dbb7636a12
revlog: compress sidedata in `_writeentry`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47268
diff
changeset
|
3369 and comp_sidedata[0:1] != b'\0' |
|
c4dbb7636a12
revlog: compress sidedata in `_writeentry`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47268
diff
changeset
|
3370 and len(comp_sidedata) < len(serialized_sidedata) |
|
c4dbb7636a12
revlog: compress sidedata in `_writeentry`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47268
diff
changeset
|
3371 ): |
|
c4dbb7636a12
revlog: compress sidedata in `_writeentry`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47268
diff
changeset
|
3372 assert not h |
|
c4dbb7636a12
revlog: compress sidedata in `_writeentry`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47268
diff
changeset
|
3373 if ( |
|
c4dbb7636a12
revlog: compress sidedata in `_writeentry`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47268
diff
changeset
|
3374 comp_sidedata[0:1] |
|
c4dbb7636a12
revlog: compress sidedata in `_writeentry`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47268
diff
changeset
|
3375 == self._docket.default_compression_header |
|
c4dbb7636a12
revlog: compress sidedata in `_writeentry`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47268
diff
changeset
|
3376 ): |
|
c4dbb7636a12
revlog: compress sidedata in `_writeentry`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47268
diff
changeset
|
3377 sidedata_compression_mode = COMP_MODE_DEFAULT |
|
c4dbb7636a12
revlog: compress sidedata in `_writeentry`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47268
diff
changeset
|
3378 serialized_sidedata = comp_sidedata |
|
c4dbb7636a12
revlog: compress sidedata in `_writeentry`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47268
diff
changeset
|
3379 else: |
|
c4dbb7636a12
revlog: compress sidedata in `_writeentry`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47268
diff
changeset
|
3380 sidedata_compression_mode = COMP_MODE_INLINE |
|
c4dbb7636a12
revlog: compress sidedata in `_writeentry`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47268
diff
changeset
|
3381 serialized_sidedata = comp_sidedata |
|
46722
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3382 else: |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3383 serialized_sidedata = b"" |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3384 # Don't store the offset if the sidedata is empty, that way |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3385 # we can easily detect empty sidedata and they will be no different |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3386 # than ones we manually add. |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3387 sidedata_offset = 0 |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3388 |
|
48764
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
3389 rank = RANK_UNKNOWN |
|
51069
81f3877372c3
revlog: remove legacy usage of `_compute_rank`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51066
diff
changeset
|
3390 if self.feature_config.compute_rank: |
|
48768
580660518459
rank: compute property incrementally
pacien <pacien.trangirard@pacien.net>
parents:
48764
diff
changeset
|
3391 if (p1r, p2r) == (nullrev, nullrev): |
|
580660518459
rank: compute property incrementally
pacien <pacien.trangirard@pacien.net>
parents:
48764
diff
changeset
|
3392 rank = 1 |
|
580660518459
rank: compute property incrementally
pacien <pacien.trangirard@pacien.net>
parents:
48764
diff
changeset
|
3393 elif p1r != nullrev and p2r == nullrev: |
|
580660518459
rank: compute property incrementally
pacien <pacien.trangirard@pacien.net>
parents:
48764
diff
changeset
|
3394 rank = 1 + self.fast_rank(p1r) |
|
580660518459
rank: compute property incrementally
pacien <pacien.trangirard@pacien.net>
parents:
48764
diff
changeset
|
3395 elif p1r == nullrev and p2r != nullrev: |
|
580660518459
rank: compute property incrementally
pacien <pacien.trangirard@pacien.net>
parents:
48764
diff
changeset
|
3396 rank = 1 + self.fast_rank(p2r) |
|
580660518459
rank: compute property incrementally
pacien <pacien.trangirard@pacien.net>
parents:
48764
diff
changeset
|
3397 else: # merge node |
|
48946
6ea9ead59cf8
revlog: use rust rank computation if available
pacien <pacien.trangirard@pacien.net>
parents:
48942
diff
changeset
|
3398 if rustdagop is not None and self.index.rust_ext_compat: |
|
6ea9ead59cf8
revlog: use rust rank computation if available
pacien <pacien.trangirard@pacien.net>
parents:
48942
diff
changeset
|
3399 rank = rustdagop.rank(self.index, p1r, p2r) |
|
6ea9ead59cf8
revlog: use rust rank computation if available
pacien <pacien.trangirard@pacien.net>
parents:
48942
diff
changeset
|
3400 else: |
|
6ea9ead59cf8
revlog: use rust rank computation if available
pacien <pacien.trangirard@pacien.net>
parents:
48942
diff
changeset
|
3401 pmin, pmax = sorted((p1r, p2r)) |
|
6ea9ead59cf8
revlog: use rust rank computation if available
pacien <pacien.trangirard@pacien.net>
parents:
48942
diff
changeset
|
3402 rank = 1 + self.fast_rank(pmax) |
|
6ea9ead59cf8
revlog: use rust rank computation if available
pacien <pacien.trangirard@pacien.net>
parents:
48942
diff
changeset
|
3403 rank += sum(1 for _ in self.findmissingrevs([pmax], [pmin])) |
|
48764
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
3404 |
|
47402
8230f0204eb8
revlog: use the new `entry` function in revlog.py
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47400
diff
changeset
|
3405 e = revlogutils.entry( |
|
8230f0204eb8
revlog: use the new `entry` function in revlog.py
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47400
diff
changeset
|
3406 flags=flags, |
|
8230f0204eb8
revlog: use the new `entry` function in revlog.py
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47400
diff
changeset
|
3407 data_offset=offset, |
|
8230f0204eb8
revlog: use the new `entry` function in revlog.py
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47400
diff
changeset
|
3408 data_compressed_length=deltainfo.deltalen, |
|
8230f0204eb8
revlog: use the new `entry` function in revlog.py
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47400
diff
changeset
|
3409 data_uncompressed_length=textlen, |
|
8230f0204eb8
revlog: use the new `entry` function in revlog.py
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47400
diff
changeset
|
3410 data_compression_mode=compression_mode, |
|
8230f0204eb8
revlog: use the new `entry` function in revlog.py
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47400
diff
changeset
|
3411 data_delta_base=deltainfo.base, |
|
8230f0204eb8
revlog: use the new `entry` function in revlog.py
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47400
diff
changeset
|
3412 link_rev=link, |
|
8230f0204eb8
revlog: use the new `entry` function in revlog.py
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47400
diff
changeset
|
3413 parent_rev_1=p1r, |
|
8230f0204eb8
revlog: use the new `entry` function in revlog.py
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47400
diff
changeset
|
3414 parent_rev_2=p2r, |
|
8230f0204eb8
revlog: use the new `entry` function in revlog.py
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47400
diff
changeset
|
3415 node_id=node, |
|
8230f0204eb8
revlog: use the new `entry` function in revlog.py
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47400
diff
changeset
|
3416 sidedata_offset=sidedata_offset, |
|
8230f0204eb8
revlog: use the new `entry` function in revlog.py
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47400
diff
changeset
|
3417 sidedata_compressed_length=len(serialized_sidedata), |
|
8230f0204eb8
revlog: use the new `entry` function in revlog.py
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47400
diff
changeset
|
3418 sidedata_compression_mode=sidedata_compression_mode, |
|
48764
2e949ede7350
rank: naive rank property computation and retrieval
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48695
diff
changeset
|
3419 rank=rank, |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3420 ) |
|
46717
913485776542
revlog: introduce v2 format
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46646
diff
changeset
|
3421 |
|
38889
6104b203bec8
index: replace insert(-1, e) method by append(e) method
Martin von Zweigbergk <martinvonz@google.com>
parents:
38888
diff
changeset
|
3422 self.index.append(e) |
|
47078
d57386e5c80e
revlog: have an explicit "pack_header" method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47077
diff
changeset
|
3423 entry = self.index.entry_binary(curr) |
|
47246
6b1eae313b2f
revlogv2: store version information in the docket only
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47245
diff
changeset
|
3424 if curr == 0 and self._docket is None: |
|
47153
f58a13c52726
revlog: split the `version` attribute into its two components
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
3425 header = self._format_flags | self._format_version |
|
f58a13c52726
revlog: split the `version` attribute into its two components
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
3426 header = self.index.pack_header(header) |
|
47078
d57386e5c80e
revlog: have an explicit "pack_header" method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47077
diff
changeset
|
3427 entry = header + entry |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3428 self._writeentry( |
|
46722
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3429 transaction, |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3430 entry, |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3431 deltainfo.data, |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3432 link, |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3433 offset, |
|
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46717
diff
changeset
|
3434 serialized_sidedata, |
|
47395
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
3435 sidedata_offset, |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3436 ) |
|
39360
5d343a24bff5
revlogdeltas: always return a delta info object in finddeltainfo
Boris Feld <boris.feld@octobus.net>
parents:
39359
diff
changeset
|
3437 |
|
5d343a24bff5
revlogdeltas: always return a delta info object in finddeltainfo
Boris Feld <boris.feld@octobus.net>
parents:
39359
diff
changeset
|
3438 rawtext = btext[0] |
|
20217
33394f2e331e
revlog: move file writing to a separate function
Durham Goode <durham@fb.com>
parents:
20180
diff
changeset
|
3439 |
|
31760
ec48d57de110
revlog: make _addrevision only accept rawtext
Jun Wu <quark@fb.com>
parents:
31759
diff
changeset
|
3440 if alwayscache and rawtext is None: |
|
51025
509f0f7fc89e
delta-computer: stop explicitly taking file handle
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51023
diff
changeset
|
3441 rawtext = deltacomputer.buildtext(revinfo) |
|
26243
836291420d53
revlog: optionally cache the full text when adding revisions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26242
diff
changeset
|
3442 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3443 if type(rawtext) == bytes: # only accept immutable objects |
|
51100
8ec2de9c6770
revlog: move the_revisioncache on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51099
diff
changeset
|
3444 self._inner._revisioncache = (node, curr, rawtext) |
|
39360
5d343a24bff5
revlogdeltas: always return a delta info object in finddeltainfo
Boris Feld <boris.feld@octobus.net>
parents:
39359
diff
changeset
|
3445 self._chainbasecache[curr] = deltainfo.chainbase |
|
46558
07984507d553
revlog: change _addrevision to return the new revision
Joerg Sonnenberger <joerg@bec.de>
parents:
46530
diff
changeset
|
3446 return curr |
|
20217
33394f2e331e
revlog: move file writing to a separate function
Durham Goode <durham@fb.com>
parents:
20180
diff
changeset
|
3447 |
|
46723
4cd214c9948d
revlogv2: don't assume that the sidedata of the last rev is right after data
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46722
diff
changeset
|
3448 def _get_data_offset(self, prev): |
|
4cd214c9948d
revlogv2: don't assume that the sidedata of the last rev is right after data
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46722
diff
changeset
|
3449 """Returns the current offset in the (in-transaction) data file. |
|
4cd214c9948d
revlogv2: don't assume that the sidedata of the last rev is right after data
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46722
diff
changeset
|
3450 Versions < 2 of the revlog can get this 0(1), revlog v2 needs a docket |
|
4cd214c9948d
revlogv2: don't assume that the sidedata of the last rev is right after data
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46722
diff
changeset
|
3451 file to store that information: since sidedata can be rewritten to the |
|
4cd214c9948d
revlogv2: don't assume that the sidedata of the last rev is right after data
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46722
diff
changeset
|
3452 end of the data file within a transaction, you can have cases where, for |
|
4cd214c9948d
revlogv2: don't assume that the sidedata of the last rev is right after data
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46722
diff
changeset
|
3453 example, rev `n` does not have sidedata while rev `n - 1` does, leading |
|
4cd214c9948d
revlogv2: don't assume that the sidedata of the last rev is right after data
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46722
diff
changeset
|
3454 to `n - 1`'s sidedata being written after `n`'s data. |
|
4cd214c9948d
revlogv2: don't assume that the sidedata of the last rev is right after data
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46722
diff
changeset
|
3455 |
|
4cd214c9948d
revlogv2: don't assume that the sidedata of the last rev is right after data
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46722
diff
changeset
|
3456 TODO cache this in a docket file before getting out of experimental.""" |
|
47253
4abd474a10af
revlogv2: also keep track for the size of the "data" file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47252
diff
changeset
|
3457 if self._docket is None: |
|
46723
4cd214c9948d
revlogv2: don't assume that the sidedata of the last rev is right after data
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46722
diff
changeset
|
3458 return self.end(prev) |
|
47253
4abd474a10af
revlogv2: also keep track for the size of the "data" file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47252
diff
changeset
|
3459 else: |
|
4abd474a10af
revlogv2: also keep track for the size of the "data" file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47252
diff
changeset
|
3460 return self._docket.data_end |
|
46723
4cd214c9948d
revlogv2: don't assume that the sidedata of the last rev is right after data
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46722
diff
changeset
|
3461 |
|
47395
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
3462 def _writeentry( |
|
51103
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3463 self, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3464 transaction, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3465 entry, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3466 data, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3467 link, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3468 offset, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3469 sidedata, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3470 sidedata_offset, |
|
47395
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
3471 ): |
|
27430
e240e914d226
revlog: seek to end of file before writing (issue4943)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26705
diff
changeset
|
3472 # Files opened in a+ mode have inconsistent behavior on various |
|
e240e914d226
revlog: seek to end of file before writing (issue4943)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26705
diff
changeset
|
3473 # platforms. Windows requires that a file positioning call be made |
|
e240e914d226
revlog: seek to end of file before writing (issue4943)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26705
diff
changeset
|
3474 # when the file handle transitions between reads and writes. See |
|
e240e914d226
revlog: seek to end of file before writing (issue4943)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26705
diff
changeset
|
3475 # 3686fa2b8eee and the mixedfilemodewrapper in windows.py. On other |
|
e240e914d226
revlog: seek to end of file before writing (issue4943)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26705
diff
changeset
|
3476 # platforms, Python or the platform itself can be buggy. Some versions |
|
e240e914d226
revlog: seek to end of file before writing (issue4943)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26705
diff
changeset
|
3477 # of Solaris have been observed to not append at the end of the file |
|
e240e914d226
revlog: seek to end of file before writing (issue4943)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26705
diff
changeset
|
3478 # if the file was seeked to before the end. See issue4943 for more. |
|
e240e914d226
revlog: seek to end of file before writing (issue4943)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26705
diff
changeset
|
3479 # |
|
e240e914d226
revlog: seek to end of file before writing (issue4943)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26705
diff
changeset
|
3480 # We work around this issue by inserting a seek() before writing. |
|
40671
e9293c5f8bb9
revlog: automatically read from opened file handles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40670
diff
changeset
|
3481 # Note: This is likely not necessary on Python 3. However, because |
|
e9293c5f8bb9
revlog: automatically read from opened file handles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40670
diff
changeset
|
3482 # the file handle is reused for reads and may be seeked there, we need |
|
e9293c5f8bb9
revlog: automatically read from opened file handles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40670
diff
changeset
|
3483 # to be careful before changing this. |
|
51103
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3484 index_end = data_end = sidedata_end = None |
|
47249
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
3485 if self._docket is not None: |
|
51103
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3486 index_end = self._docket.index_end |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3487 data_end = self._docket.data_end |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3488 sidedata_end = self._docket.sidedata_end |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3489 |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3490 files_end = self._inner.write_entry( |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3491 transaction, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3492 entry, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3493 data, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3494 link, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3495 offset, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3496 sidedata, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3497 sidedata_offset, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3498 index_end, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3499 data_end, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3500 sidedata_end, |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3501 ) |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3502 self._enforceinlinesize(transaction) |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3503 if self._docket is not None: |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3504 self._docket.index_end = files_end[0] |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3505 self._docket.data_end = files_end[1] |
|
eba138890c64
revlog: move entry writing in the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51102
diff
changeset
|
3506 self._docket.sidedata_end = files_end[2] |
|
47249
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
3507 |
|
44351
5962fd0d1045
nodemap: write nodemap data on disk
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
44073
diff
changeset
|
3508 nodemaputil.setup_persistent_nodemap(transaction, self) |
| 2073 | 3509 |
|
45811
a5206e71c536
revlog: extend addgroup() with callback for duplicates
Joerg Sonnenberger <joerg@bec.de>
parents:
45802
diff
changeset
|
3510 def addgroup( |
|
a5206e71c536
revlog: extend addgroup() with callback for duplicates
Joerg Sonnenberger <joerg@bec.de>
parents:
45802
diff
changeset
|
3511 self, |
|
a5206e71c536
revlog: extend addgroup() with callback for duplicates
Joerg Sonnenberger <joerg@bec.de>
parents:
45802
diff
changeset
|
3512 deltas, |
|
a5206e71c536
revlog: extend addgroup() with callback for duplicates
Joerg Sonnenberger <joerg@bec.de>
parents:
45802
diff
changeset
|
3513 linkmapper, |
|
a5206e71c536
revlog: extend addgroup() with callback for duplicates
Joerg Sonnenberger <joerg@bec.de>
parents:
45802
diff
changeset
|
3514 transaction, |
|
46445
711ba0f1057e
revlog: decouple caching from addrevision callback for addgroup
Joerg Sonnenberger <joerg@bec.de>
parents:
46310
diff
changeset
|
3515 alwayscache=False, |
|
45811
a5206e71c536
revlog: extend addgroup() with callback for duplicates
Joerg Sonnenberger <joerg@bec.de>
parents:
45802
diff
changeset
|
3516 addrevisioncb=None, |
|
a5206e71c536
revlog: extend addgroup() with callback for duplicates
Joerg Sonnenberger <joerg@bec.de>
parents:
45802
diff
changeset
|
3517 duplicaterevisioncb=None, |
|
49739
35d4c2124073
debug: add an option to display statistic about a unbundling operation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49738
diff
changeset
|
3518 debug_info=None, |
|
49877
152d9c011bcd
changegroup: add `delta_base_reuse_policy` argument
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49791
diff
changeset
|
3519 delta_base_reuse_policy=None, |
|
45811
a5206e71c536
revlog: extend addgroup() with callback for duplicates
Joerg Sonnenberger <joerg@bec.de>
parents:
45802
diff
changeset
|
3520 ): |
| 1083 | 3521 """ |
| 3522 add a delta group | |
| 46 | 3523 |
| 1083 | 3524 given a set of deltas, add them to the revision log. the |
| 3525 first delta is against its parent, which should be in our | |
| 3526 log, the rest are against the previous delta. | |
|
25822
00e3f909907f
revlog: add support for a callback whenever revisions are added
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25660
diff
changeset
|
3527 |
|
00e3f909907f
revlog: add support for a callback whenever revisions are added
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25660
diff
changeset
|
3528 If ``addrevisioncb`` is defined, it will be called with arguments of |
|
00e3f909907f
revlog: add support for a callback whenever revisions are added
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25660
diff
changeset
|
3529 this revlog and the node that was added. |
| 1083 | 3530 """ |
| 3531 | |
|
47225
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
3532 if self._adding_group: |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3533 raise error.ProgrammingError(b'cannot nest addgroup() calls') |
|
40671
e9293c5f8bb9
revlog: automatically read from opened file handles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40670
diff
changeset
|
3534 |
|
49877
152d9c011bcd
changegroup: add `delta_base_reuse_policy` argument
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49791
diff
changeset
|
3535 # read the default delta-base reuse policy from revlog config if the |
|
152d9c011bcd
changegroup: add `delta_base_reuse_policy` argument
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49791
diff
changeset
|
3536 # group did not specify one. |
|
152d9c011bcd
changegroup: add `delta_base_reuse_policy` argument
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49791
diff
changeset
|
3537 if delta_base_reuse_policy is None: |
|
51051
f636103c4d67
revlog: remove legacy usage of `_generaldelta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51049
diff
changeset
|
3538 if ( |
|
f636103c4d67
revlog: remove legacy usage of `_generaldelta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51049
diff
changeset
|
3539 self.delta_config.general_delta |
|
f636103c4d67
revlog: remove legacy usage of `_generaldelta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51049
diff
changeset
|
3540 and self.delta_config.lazy_delta_base |
|
f636103c4d67
revlog: remove legacy usage of `_generaldelta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51049
diff
changeset
|
3541 ): |
|
49877
152d9c011bcd
changegroup: add `delta_base_reuse_policy` argument
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49791
diff
changeset
|
3542 delta_base_reuse_policy = DELTA_BASE_REUSE_TRY |
|
152d9c011bcd
changegroup: add `delta_base_reuse_policy` argument
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49791
diff
changeset
|
3543 else: |
|
152d9c011bcd
changegroup: add `delta_base_reuse_policy` argument
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49791
diff
changeset
|
3544 delta_base_reuse_policy = DELTA_BASE_REUSE_NO |
|
152d9c011bcd
changegroup: add `delta_base_reuse_policy` argument
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49791
diff
changeset
|
3545 |
|
47225
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
3546 self._adding_group = True |
|
45811
a5206e71c536
revlog: extend addgroup() with callback for duplicates
Joerg Sonnenberger <joerg@bec.de>
parents:
45802
diff
changeset
|
3547 empty = True |
|
6261
7c8101b5ceb1
revlog: make sure the files are closed after an exception happens
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6228
diff
changeset
|
3548 try: |
|
47225
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
3549 with self._writing(transaction): |
|
49248
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3550 write_debug = None |
|
51059
ab2bc31fa91f
revlog: remove legacy usage of `_debug_delta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51056
diff
changeset
|
3551 if self.delta_config.debug_delta: |
|
49248
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3552 write_debug = transaction._report |
|
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3553 deltacomputer = deltautil.deltacomputer( |
|
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3554 self, |
|
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3555 write_debug=write_debug, |
|
49739
35d4c2124073
debug: add an option to display statistic about a unbundling operation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49738
diff
changeset
|
3556 debug_info=debug_info, |
|
49248
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3557 ) |
|
47223
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3558 # loop through our set of deltas |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3559 for data in deltas: |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3560 ( |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3561 node, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3562 p1, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3563 p2, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3564 linknode, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3565 deltabase, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3566 delta, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3567 flags, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3568 sidedata, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3569 ) = data |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3570 link = linkmapper(linknode) |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3571 flags = flags or REVIDX_DEFAULT_FLAGS |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3572 |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3573 rev = self.index.get_rev(node) |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3574 if rev is not None: |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3575 # this can happen if two branches make the same change |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3576 self._nodeduplicatecallback(transaction, rev) |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3577 if duplicaterevisioncb: |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3578 duplicaterevisioncb(self, rev) |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3579 empty = False |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3580 continue |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3581 |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3582 for p in (p1, p2): |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3583 if not self.index.has_node(p): |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3584 raise error.LookupError( |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3585 p, self.radix, _(b'unknown parent') |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3586 ) |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3587 |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3588 if not self.index.has_node(deltabase): |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3589 raise error.LookupError( |
|
47223
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3590 deltabase, self.display_id, _(b'unknown delta base') |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3591 ) |
|
24120
a450e0a2ba0a
revlog: in addgroup, reject ill-formed deltas based on censored nodes
Mike Edgar <adgar@google.com>
parents:
24118
diff
changeset
|
3592 |
|
47223
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3593 baserev = self.rev(deltabase) |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3594 |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3595 if baserev != nullrev and self.iscensored(baserev): |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3596 # if base is censored, delta must be full replacement in a |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3597 # single patch operation |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3598 hlen = struct.calcsize(b">lll") |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3599 oldlen = self.rawsize(baserev) |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3600 newlen = len(delta) - hlen |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3601 if delta[:hlen] != mdiff.replacediffheader( |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3602 oldlen, newlen |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3603 ): |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3604 raise error.CensoredBaseError( |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3605 self.display_id, self.node(baserev) |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3606 ) |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3607 |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3608 if not flags and self._peek_iscensored(baserev, delta): |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3609 flags |= REVIDX_ISCENSORED |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3610 |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3611 # We assume consumers of addrevisioncb will want to retrieve |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3612 # the added revision, which will require a call to |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3613 # revision(). revision() will fast path if there is a cache |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3614 # hit. So, we tell _addrevision() to always cache in this case. |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3615 # We're only using addgroup() in the context of changegroup |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3616 # generation so the revision data can always be handled as raw |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3617 # by the flagprocessor. |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3618 rev = self._addrevision( |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3619 node, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3620 None, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3621 transaction, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3622 link, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3623 p1, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3624 p2, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3625 flags, |
|
49877
152d9c011bcd
changegroup: add `delta_base_reuse_policy` argument
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49791
diff
changeset
|
3626 (baserev, delta, delta_base_reuse_policy), |
|
47223
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3627 alwayscache=alwayscache, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3628 deltacomputer=deltacomputer, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3629 sidedata=sidedata, |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3630 ) |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3631 |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3632 if addrevisioncb: |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3633 addrevisioncb(self, rev) |
|
0cf537d85f4c
revlog: preindent some code in addgroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47190
diff
changeset
|
3634 empty = False |
|
6261
7c8101b5ceb1
revlog: make sure the files are closed after an exception happens
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6228
diff
changeset
|
3635 finally: |
|
47225
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47224
diff
changeset
|
3636 self._adding_group = False |
|
45811
a5206e71c536
revlog: extend addgroup() with callback for duplicates
Joerg Sonnenberger <joerg@bec.de>
parents:
45802
diff
changeset
|
3637 return not empty |
|
1493
1a216cb4ee64
verify: add check for mismatch of index and data length
Matt Mackall <mpm@selenic.com>
parents:
1469
diff
changeset
|
3638 |
|
24118
76f6ae06ddf5
revlog: add "iscensored()" to revlog public API
Mike Edgar <adgar@google.com>
parents:
24030
diff
changeset
|
3639 def iscensored(self, rev): |
|
76f6ae06ddf5
revlog: add "iscensored()" to revlog public API
Mike Edgar <adgar@google.com>
parents:
24030
diff
changeset
|
3640 """Check if a file revision is censored.""" |
|
51055
0d33f4b0c4cb
revlog: remove legacy usage of `_censorable`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51054
diff
changeset
|
3641 if not self.feature_config.censorable: |
|
37443
65250a66b55c
revlog: move censor logic into main revlog class
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37442
diff
changeset
|
3642 return False |
|
65250a66b55c
revlog: move censor logic into main revlog class
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37442
diff
changeset
|
3643 |
|
65250a66b55c
revlog: move censor logic into main revlog class
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37442
diff
changeset
|
3644 return self.flags(rev) & REVIDX_ISCENSORED |
|
24118
76f6ae06ddf5
revlog: add "iscensored()" to revlog public API
Mike Edgar <adgar@google.com>
parents:
24030
diff
changeset
|
3645 |
|
47180
c9ae2e7fe154
revlog: drop `flush` parameter from `_peek_iscensored`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47179
diff
changeset
|
3646 def _peek_iscensored(self, baserev, delta): |
|
24255
4bfe9f2d9761
revlog: addgroup checks if incoming deltas add censored revs, sets flag bit
Mike Edgar <adgar@google.com>
parents:
24123
diff
changeset
|
3647 """Quickly check if a delta produces a censored revision.""" |
|
51055
0d33f4b0c4cb
revlog: remove legacy usage of `_censorable`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51054
diff
changeset
|
3648 if not self.feature_config.censorable: |
|
37443
65250a66b55c
revlog: move censor logic into main revlog class
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37442
diff
changeset
|
3649 return False |
|
65250a66b55c
revlog: move censor logic into main revlog class
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37442
diff
changeset
|
3650 |
|
40325
b0fbd1792e2d
storageutil: extract most of peek_censored from revlog
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40298
diff
changeset
|
3651 return storageutil.deltaiscensored(delta, baserev, self.rawsize) |
|
24255
4bfe9f2d9761
revlog: addgroup checks if incoming deltas add censored revs, sets flag bit
Mike Edgar <adgar@google.com>
parents:
24123
diff
changeset
|
3652 |
|
20074
5fc2ae1c631b
strip: add faster revlog strip computation
Durham Goode <durham@fb.com>
parents:
20073
diff
changeset
|
3653 def getstrippoint(self, minlink): |
|
5fc2ae1c631b
strip: add faster revlog strip computation
Durham Goode <durham@fb.com>
parents:
20073
diff
changeset
|
3654 """find the minimum rev that must be stripped to strip the linkrev |
|
5fc2ae1c631b
strip: add faster revlog strip computation
Durham Goode <durham@fb.com>
parents:
20073
diff
changeset
|
3655 |
|
5fc2ae1c631b
strip: add faster revlog strip computation
Durham Goode <durham@fb.com>
parents:
20073
diff
changeset
|
3656 Returns a tuple containing the minimum rev and a set of all revs that |
|
5fc2ae1c631b
strip: add faster revlog strip computation
Durham Goode <durham@fb.com>
parents:
20073
diff
changeset
|
3657 have linkrevs that will be broken by this strip. |
|
5fc2ae1c631b
strip: add faster revlog strip computation
Durham Goode <durham@fb.com>
parents:
20073
diff
changeset
|
3658 """ |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3659 return storageutil.resolvestripinfo( |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3660 minlink, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3661 len(self) - 1, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3662 self.headrevs(), |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3663 self.linkrev, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3664 self.parentrevs, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3665 ) |
|
20074
5fc2ae1c631b
strip: add faster revlog strip computation
Durham Goode <durham@fb.com>
parents:
20073
diff
changeset
|
3666 |
|
8073
e8a28556a0a8
strip: make repair.strip transactional to avoid repository corruption
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
8017
diff
changeset
|
3667 def strip(self, minlink, transaction): |
|
5910
b9a830fa10f6
simplify revlog.strip interface and callers; add docstring
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5909
diff
changeset
|
3668 """truncate the revlog on the first revision with a linkrev >= minlink |
|
b9a830fa10f6
simplify revlog.strip interface and callers; add docstring
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5909
diff
changeset
|
3669 |
|
b9a830fa10f6
simplify revlog.strip interface and callers; add docstring
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5909
diff
changeset
|
3670 This function is called when we're stripping revision minlink and |
|
b9a830fa10f6
simplify revlog.strip interface and callers; add docstring
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5909
diff
changeset
|
3671 its descendants from the repository. |
|
b9a830fa10f6
simplify revlog.strip interface and callers; add docstring
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5909
diff
changeset
|
3672 |
|
b9a830fa10f6
simplify revlog.strip interface and callers; add docstring
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5909
diff
changeset
|
3673 We have to remove all revisions with linkrev >= minlink, because |
|
b9a830fa10f6
simplify revlog.strip interface and callers; add docstring
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5909
diff
changeset
|
3674 the equivalent changelog revisions will be renumbered after the |
|
b9a830fa10f6
simplify revlog.strip interface and callers; add docstring
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5909
diff
changeset
|
3675 strip. |
|
b9a830fa10f6
simplify revlog.strip interface and callers; add docstring
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5909
diff
changeset
|
3676 |
|
b9a830fa10f6
simplify revlog.strip interface and callers; add docstring
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5909
diff
changeset
|
3677 So we truncate the revlog on the first of these revisions, and |
|
b9a830fa10f6
simplify revlog.strip interface and callers; add docstring
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5909
diff
changeset
|
3678 trust that the caller has saved the revisions that shouldn't be |
|
15827
1dacf7672556
revlog: clarify strip docstring "readd" -> "re-add"
Steven Brown <StevenGBrown@gmail.com>
parents:
15407
diff
changeset
|
3679 removed and that it'll re-add them after this truncation. |
|
5910
b9a830fa10f6
simplify revlog.strip interface and callers; add docstring
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5909
diff
changeset
|
3680 """ |
|
6750
fb42030d79d6
add __len__ and __iter__ methods to repo and revlog
Matt Mackall <mpm@selenic.com>
parents:
6703
diff
changeset
|
3681 if len(self) == 0: |
|
1535
7ae0ce7a3dc4
Add revlog.strip to truncate away revisions.
mason@suse.com
parents:
1533
diff
changeset
|
3682 return |
|
7ae0ce7a3dc4
Add revlog.strip to truncate away revisions.
mason@suse.com
parents:
1533
diff
changeset
|
3683 |
|
20074
5fc2ae1c631b
strip: add faster revlog strip computation
Durham Goode <durham@fb.com>
parents:
20073
diff
changeset
|
3684 rev, _ = self.getstrippoint(minlink) |
|
5fc2ae1c631b
strip: add faster revlog strip computation
Durham Goode <durham@fb.com>
parents:
20073
diff
changeset
|
3685 if rev == len(self): |
|
5909
f45f7390c1c5
strip: calculate list of extra nodes to save and pass it to changegroupsubset
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5659
diff
changeset
|
3686 return |
|
1535
7ae0ce7a3dc4
Add revlog.strip to truncate away revisions.
mason@suse.com
parents:
1533
diff
changeset
|
3687 |
|
7ae0ce7a3dc4
Add revlog.strip to truncate away revisions.
mason@suse.com
parents:
1533
diff
changeset
|
3688 # first truncate the files on disk |
|
47253
4abd474a10af
revlogv2: also keep track for the size of the "data" file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47252
diff
changeset
|
3689 data_end = self.start(rev) |
|
4982
9672e3c42b0c
revlog: change _inline from a function to a variable
Matt Mackall <mpm@selenic.com>
parents:
4981
diff
changeset
|
3690 if not self._inline: |
|
47253
4abd474a10af
revlogv2: also keep track for the size of the "data" file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47252
diff
changeset
|
3691 transaction.add(self._datafile, data_end) |
|
46974
3c9208702db3
revlog: replace revlog._io.size with a new revlog.index.entry_size
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46859
diff
changeset
|
3692 end = rev * self.index.entry_size |
| 2073 | 3693 else: |
|
47253
4abd474a10af
revlogv2: also keep track for the size of the "data" file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47252
diff
changeset
|
3694 end = data_end + (rev * self.index.entry_size) |
| 2072 | 3695 |
|
47395
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
3696 if self._sidedatafile: |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
3697 sidedata_end = self.sidedata_cut_off(rev) |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
3698 transaction.add(self._sidedatafile, sidedata_end) |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
3699 |
|
47162
a07d5cb03a85
revlog: rename `indexfile` to `_indexfile`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47159
diff
changeset
|
3700 transaction.add(self._indexfile, end) |
|
47249
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
3701 if self._docket is not None: |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
3702 # XXX we could, leverage the docket while stripping. However it is |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
3703 # not powerfull enough at the time of this comment |
|
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
3704 self._docket.index_end = end |
|
47253
4abd474a10af
revlogv2: also keep track for the size of the "data" file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47252
diff
changeset
|
3705 self._docket.data_end = data_end |
|
47395
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
3706 self._docket.sidedata_end = sidedata_end |
|
47249
6597255a4f94
revlogv2: track current index size in the docket
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47246
diff
changeset
|
3707 self._docket.write(transaction, stripping=True) |
|
1535
7ae0ce7a3dc4
Add revlog.strip to truncate away revisions.
mason@suse.com
parents:
1533
diff
changeset
|
3708 |
|
7ae0ce7a3dc4
Add revlog.strip to truncate away revisions.
mason@suse.com
parents:
1533
diff
changeset
|
3709 # then reset internal state in memory to forget those revisions |
|
45802
8719a5b68419
revlog: use LRU for the chain cache
Joerg Sonnenberger <joerg@bec.de>
parents:
45735
diff
changeset
|
3710 self._chaininfocache = util.lrucachedict(500) |
|
51105
045b5f745f93
revlog: consolidate cache invalidation within the inner objet
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51103
diff
changeset
|
3711 self._inner.clear_cache() |
|
1535
7ae0ce7a3dc4
Add revlog.strip to truncate away revisions.
mason@suse.com
parents:
1533
diff
changeset
|
3712 |
|
4979
06abdaf78788
revlog: add a magic null revision to our index
Matt Mackall <mpm@selenic.com>
parents:
4978
diff
changeset
|
3713 del self.index[rev:-1] |
|
1535
7ae0ce7a3dc4
Add revlog.strip to truncate away revisions.
mason@suse.com
parents:
1533
diff
changeset
|
3714 |
|
1493
1a216cb4ee64
verify: add check for mismatch of index and data length
Matt Mackall <mpm@selenic.com>
parents:
1469
diff
changeset
|
3715 def checksize(self): |
|
41877
3f3f962457b2
revlog: add some documentation to the `checksize` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41862
diff
changeset
|
3716 """Check size of index and data files |
|
3f3f962457b2
revlog: add some documentation to the `checksize` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41862
diff
changeset
|
3717 |
|
3f3f962457b2
revlog: add some documentation to the `checksize` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41862
diff
changeset
|
3718 return a (dd, di) tuple. |
|
3f3f962457b2
revlog: add some documentation to the `checksize` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41862
diff
changeset
|
3719 - dd: extra bytes for the "data" file |
|
3f3f962457b2
revlog: add some documentation to the `checksize` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41862
diff
changeset
|
3720 - di: extra bytes for the "index" file |
|
3f3f962457b2
revlog: add some documentation to the `checksize` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41862
diff
changeset
|
3721 |
|
3f3f962457b2
revlog: add some documentation to the `checksize` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41862
diff
changeset
|
3722 A healthy revlog will return (0, 0). |
|
3f3f962457b2
revlog: add some documentation to the `checksize` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41862
diff
changeset
|
3723 """ |
|
1493
1a216cb4ee64
verify: add check for mismatch of index and data length
Matt Mackall <mpm@selenic.com>
parents:
1469
diff
changeset
|
3724 expected = 0 |
|
6750
fb42030d79d6
add __len__ and __iter__ methods to repo and revlog
Matt Mackall <mpm@selenic.com>
parents:
6703
diff
changeset
|
3725 if len(self): |
|
fb42030d79d6
add __len__ and __iter__ methods to repo and revlog
Matt Mackall <mpm@selenic.com>
parents:
6703
diff
changeset
|
3726 expected = max(0, self.end(len(self) - 1)) |
|
1667
daff3ef0de8d
verify: notice extra data in indices
Matt Mackall <mpm@selenic.com>
parents:
1660
diff
changeset
|
3727 |
|
1494
249ca10d37f4
Handle empty logs in repo.checksize
Matt Mackall <mpm@selenic.com>
parents:
1493
diff
changeset
|
3728 try: |
|
36011
82afb1a5ed94
revlog: use context manager for data file lifetime in checksize
Boris Feld <boris.feld@octobus.net>
parents:
36010
diff
changeset
|
3729 with self._datafp() as f: |
|
42567
4eaf7197a740
cleanup: use named constants for second arg to .seek()
Augie Fackler <augie@google.com>
parents:
42478
diff
changeset
|
3730 f.seek(0, io.SEEK_END) |
|
36011
82afb1a5ed94
revlog: use context manager for data file lifetime in checksize
Boris Feld <boris.feld@octobus.net>
parents:
36010
diff
changeset
|
3731 actual = f.tell() |
|
1667
daff3ef0de8d
verify: notice extra data in indices
Matt Mackall <mpm@selenic.com>
parents:
1660
diff
changeset
|
3732 dd = actual - expected |
|
49314
2e726c934fcd
py3: catch FileNotFoundError instead of checking errno == ENOENT
Manuel Jacob <me@manueljacob.de>
parents:
49292
diff
changeset
|
3733 except FileNotFoundError: |
|
1667
daff3ef0de8d
verify: notice extra data in indices
Matt Mackall <mpm@selenic.com>
parents:
1660
diff
changeset
|
3734 dd = 0 |
|
daff3ef0de8d
verify: notice extra data in indices
Matt Mackall <mpm@selenic.com>
parents:
1660
diff
changeset
|
3735 |
|
daff3ef0de8d
verify: notice extra data in indices
Matt Mackall <mpm@selenic.com>
parents:
1660
diff
changeset
|
3736 try: |
|
47162
a07d5cb03a85
revlog: rename `indexfile` to `_indexfile`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47159
diff
changeset
|
3737 f = self.opener(self._indexfile) |
|
42567
4eaf7197a740
cleanup: use named constants for second arg to .seek()
Augie Fackler <augie@google.com>
parents:
42478
diff
changeset
|
3738 f.seek(0, io.SEEK_END) |
|
1667
daff3ef0de8d
verify: notice extra data in indices
Matt Mackall <mpm@selenic.com>
parents:
1660
diff
changeset
|
3739 actual = f.tell() |
|
13400
14f3795a5ed7
explicitly close files
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
13284
diff
changeset
|
3740 f.close() |
|
46974
3c9208702db3
revlog: replace revlog._io.size with a new revlog.index.entry_size
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46859
diff
changeset
|
3741 s = self.index.entry_size |
|
9029
0001e49f1c11
compat: use // for integer division
Alejandro Santos <alejolp@alejolp.com>
parents:
8658
diff
changeset
|
3742 i = max(0, actual // s) |
|
1667
daff3ef0de8d
verify: notice extra data in indices
Matt Mackall <mpm@selenic.com>
parents:
1660
diff
changeset
|
3743 di = actual - (i * s) |
|
4982
9672e3c42b0c
revlog: change _inline from a function to a variable
Matt Mackall <mpm@selenic.com>
parents:
4981
diff
changeset
|
3744 if self._inline: |
| 2073 | 3745 databytes = 0 |
|
6750
fb42030d79d6
add __len__ and __iter__ methods to repo and revlog
Matt Mackall <mpm@selenic.com>
parents:
6703
diff
changeset
|
3746 for r in self: |
|
5312
fb070713ff36
revlog: more robust for damaged indexes
Matt Mackall <mpm@selenic.com>
parents:
5007
diff
changeset
|
3747 databytes += max(0, self.length(r)) |
| 2073 | 3748 dd = 0 |
|
6750
fb42030d79d6
add __len__ and __iter__ methods to repo and revlog
Matt Mackall <mpm@selenic.com>
parents:
6703
diff
changeset
|
3749 di = actual - len(self) * s - databytes |
|
49314
2e726c934fcd
py3: catch FileNotFoundError instead of checking errno == ENOENT
Manuel Jacob <me@manueljacob.de>
parents:
49292
diff
changeset
|
3750 except FileNotFoundError: |
|
1667
daff3ef0de8d
verify: notice extra data in indices
Matt Mackall <mpm@selenic.com>
parents:
1660
diff
changeset
|
3751 di = 0 |
|
daff3ef0de8d
verify: notice extra data in indices
Matt Mackall <mpm@selenic.com>
parents:
1660
diff
changeset
|
3752 |
|
daff3ef0de8d
verify: notice extra data in indices
Matt Mackall <mpm@selenic.com>
parents:
1660
diff
changeset
|
3753 return (dd, di) |
|
6891
22cb82433842
revlog: add files method
Adrian Buehlmann <adrian@cadifra.com>
parents:
6872
diff
changeset
|
3754 |
|
22cb82433842
revlog: add files method
Adrian Buehlmann <adrian@cadifra.com>
parents:
6872
diff
changeset
|
3755 def files(self): |
|
51086
808f1e38cd1d
revlog: small doc to the `files` method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51085
diff
changeset
|
3756 """return list of files that compose this revlog""" |
|
47162
a07d5cb03a85
revlog: rename `indexfile` to `_indexfile`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47159
diff
changeset
|
3757 res = [self._indexfile] |
|
47456
9cecc222c536
revlogv2: fix `hg verify` with revlog v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47432
diff
changeset
|
3758 if self._docket_file is None: |
|
9cecc222c536
revlogv2: fix `hg verify` with revlog v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47432
diff
changeset
|
3759 if not self._inline: |
|
9cecc222c536
revlogv2: fix `hg verify` with revlog v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47432
diff
changeset
|
3760 res.append(self._datafile) |
|
9cecc222c536
revlogv2: fix `hg verify` with revlog v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47432
diff
changeset
|
3761 else: |
|
9cecc222c536
revlogv2: fix `hg verify` with revlog v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47432
diff
changeset
|
3762 res.append(self._docket_file) |
|
47461
f93a867a6486
revlog: list older-but-still-around file in `files`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47458
diff
changeset
|
3763 res.extend(self._docket.old_index_filepaths(include_empty=False)) |
|
47456
9cecc222c536
revlogv2: fix `hg verify` with revlog v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47432
diff
changeset
|
3764 if self._docket.data_end: |
|
9cecc222c536
revlogv2: fix `hg verify` with revlog v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47432
diff
changeset
|
3765 res.append(self._datafile) |
|
47461
f93a867a6486
revlog: list older-but-still-around file in `files`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47458
diff
changeset
|
3766 res.extend(self._docket.old_data_filepaths(include_empty=False)) |
|
47456
9cecc222c536
revlogv2: fix `hg verify` with revlog v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47432
diff
changeset
|
3767 if self._docket.sidedata_end: |
|
9cecc222c536
revlogv2: fix `hg verify` with revlog v2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47432
diff
changeset
|
3768 res.append(self._sidedatafile) |
|
47461
f93a867a6486
revlog: list older-but-still-around file in `files`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47458
diff
changeset
|
3769 res.extend(self._docket.old_sidedata_filepaths(include_empty=False)) |
|
6891
22cb82433842
revlog: add files method
Adrian Buehlmann <adrian@cadifra.com>
parents:
6872
diff
changeset
|
3770 return res |
|
30778
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3771 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3772 def emitrevisions( |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3773 self, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3774 nodes, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3775 nodesorder=None, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3776 revisiondata=False, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3777 assumehaveparentrevisions=False, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3778 deltamode=repository.CG_DELTAMODE_STD, |
|
46728
45f0d5297698
changegroupv4: add sidedata helpers
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46725
diff
changeset
|
3779 sidedata_helpers=None, |
|
49738
9cac281eb9c0
debug: add an option to display statistic about a bundling operation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49712
diff
changeset
|
3780 debug_info=None, |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3781 ): |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3782 if nodesorder not in (b'nodes', b'storage', b'linear', None): |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3783 raise error.ProgrammingError( |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3784 b'unhandled value for nodesorder: %s' % nodesorder |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3785 ) |
|
39867
5a9ab91e0a45
revlog: new API to emit revision data
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39850
diff
changeset
|
3786 |
|
51051
f636103c4d67
revlog: remove legacy usage of `_generaldelta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51049
diff
changeset
|
3787 if nodesorder is None and not self.delta_config.general_delta: |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3788 nodesorder = b'storage' |
|
39867
5a9ab91e0a45
revlog: new API to emit revision data
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39850
diff
changeset
|
3789 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3790 if ( |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3791 not self._storedeltachains |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3792 and deltamode != repository.CG_DELTAMODE_PREV |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3793 ): |
|
40495
59a870a4ad6e
changegroup: refactor emitrevision to use a `deltamode` argument
Boris Feld <boris.feld@octobus.net>
parents:
40325
diff
changeset
|
3794 deltamode = repository.CG_DELTAMODE_FULL |
|
59a870a4ad6e
changegroup: refactor emitrevision to use a `deltamode` argument
Boris Feld <boris.feld@octobus.net>
parents:
40325
diff
changeset
|
3795 |
|
40009
842ffcf1d42f
storageutil: extract most of emitrevisions() to standalone function
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40005
diff
changeset
|
3796 return storageutil.emitrevisions( |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3797 self, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3798 nodes, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3799 nodesorder, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3800 revlogrevisiondelta, |
|
40009
842ffcf1d42f
storageutil: extract most of emitrevisions() to standalone function
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40005
diff
changeset
|
3801 deltaparentfn=self.deltaparent, |
|
51009
39fa0b948f5a
revlog: make the `candelta` method private
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51008
diff
changeset
|
3802 candeltafn=self._candelta, |
|
40009
842ffcf1d42f
storageutil: extract most of emitrevisions() to standalone function
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40005
diff
changeset
|
3803 rawsizefn=self.rawsize, |
|
842ffcf1d42f
storageutil: extract most of emitrevisions() to standalone function
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40005
diff
changeset
|
3804 revdifffn=self.revdiff, |
|
842ffcf1d42f
storageutil: extract most of emitrevisions() to standalone function
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40005
diff
changeset
|
3805 flagsfn=self.flags, |
|
40495
59a870a4ad6e
changegroup: refactor emitrevision to use a `deltamode` argument
Boris Feld <boris.feld@octobus.net>
parents:
40325
diff
changeset
|
3806 deltamode=deltamode, |
|
40009
842ffcf1d42f
storageutil: extract most of emitrevisions() to standalone function
Gregory Szorc <gregory.szorc@gmail.com>
parents:
40005
diff
changeset
|
3807 revisiondata=revisiondata, |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3808 assumehaveparentrevisions=assumehaveparentrevisions, |
|
46728
45f0d5297698
changegroupv4: add sidedata helpers
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46725
diff
changeset
|
3809 sidedata_helpers=sidedata_helpers, |
|
49738
9cac281eb9c0
debug: add an option to display statistic about a bundling operation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49712
diff
changeset
|
3810 debug_info=debug_info, |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3811 ) |
|
39867
5a9ab91e0a45
revlog: new API to emit revision data
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39850
diff
changeset
|
3812 |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3813 DELTAREUSEALWAYS = b'always' |
|
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3814 DELTAREUSESAMEREVS = b'samerevs' |
|
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3815 DELTAREUSENEVER = b'never' |
|
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3816 |
|
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3817 DELTAREUSEFULLADD = b'fulladd' |
|
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3818 |
|
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3819 DELTAREUSEALL = {b'always', b'samerevs', b'never', b'fulladd'} |
|
30778
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3820 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3821 def clone( |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3822 self, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3823 tr, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3824 destrevlog, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3825 addrevisioncb=None, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3826 deltareuse=DELTAREUSESAMEREVS, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3827 forcedeltabothparents=None, |
|
47098
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3828 sidedata_helpers=None, |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3829 ): |
|
30778
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3830 """Copy this revlog to another, possibly with format changes. |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3831 |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3832 The destination revlog will contain the same revisions and nodes. |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3833 However, it may not be bit-for-bit identical due to e.g. delta encoding |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3834 differences. |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3835 |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3836 The ``deltareuse`` argument control how deltas from the existing revlog |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3837 are preserved in the destination revlog. The argument can have the |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3838 following values: |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3839 |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3840 DELTAREUSEALWAYS |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3841 Deltas will always be reused (if possible), even if the destination |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3842 revlog would not select the same revisions for the delta. This is the |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3843 fastest mode of operation. |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3844 DELTAREUSESAMEREVS |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3845 Deltas will be reused if the destination revlog would pick the same |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3846 revisions for the delta. This mode strikes a balance between speed |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3847 and optimization. |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3848 DELTAREUSENEVER |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3849 Deltas will never be reused. This is the slowest mode of execution. |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3850 This mode can be used to recompute deltas (e.g. if the diff/delta |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3851 algorithm changes). |
|
42999
6510c7830838
upgrade: document DELTAREUSEFULLADD in revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42998
diff
changeset
|
3852 DELTAREUSEFULLADD |
|
6510c7830838
upgrade: document DELTAREUSEFULLADD in revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42998
diff
changeset
|
3853 Revision will be re-added as if their were new content. This is |
|
6510c7830838
upgrade: document DELTAREUSEFULLADD in revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42998
diff
changeset
|
3854 slower than DELTAREUSEALWAYS but allow more mechanism to kicks in. |
|
6510c7830838
upgrade: document DELTAREUSEFULLADD in revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42998
diff
changeset
|
3855 eg: large file detection and handling. |
|
30778
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3856 |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3857 Delta computation can be slow, so the choice of delta reuse policy can |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3858 significantly affect run time. |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3859 |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3860 The default policy (``DELTAREUSESAMEREVS``) strikes a balance between |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3861 two extremes. Deltas will be reused if they are appropriate. But if the |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3862 delta could choose a better revision, it will do so. This means if you |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3863 are converting a non-generaldelta revlog to a generaldelta revlog, |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3864 deltas will be recomputed if the delta's parent isn't a parent of the |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3865 revision. |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3866 |
|
40855
64051af15596
upgrade: clarify "aggressivemergedelta" handling
Boris Feld <boris.feld@octobus.net>
parents:
40772
diff
changeset
|
3867 In addition to the delta policy, the ``forcedeltabothparents`` |
|
64051af15596
upgrade: clarify "aggressivemergedelta" handling
Boris Feld <boris.feld@octobus.net>
parents:
40772
diff
changeset
|
3868 argument controls whether to force compute deltas against both parents |
|
64051af15596
upgrade: clarify "aggressivemergedelta" handling
Boris Feld <boris.feld@octobus.net>
parents:
40772
diff
changeset
|
3869 for merges. By default, the current default is used. |
|
43133
3de4d13f22be
revlog: add a way to control sidedata changes during revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43117
diff
changeset
|
3870 |
|
47100
8bd769b5c941
sidedata: move documentation about sidedata helpers to sidedata module
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47099
diff
changeset
|
3871 See `revlogutil.sidedata.get_sidedata_helpers` for the doc on |
|
8bd769b5c941
sidedata: move documentation about sidedata helpers to sidedata module
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47099
diff
changeset
|
3872 `sidedata_helpers`. |
|
30778
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3873 """ |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3874 if deltareuse not in self.DELTAREUSEALL: |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3875 raise ValueError( |
|
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3876 _(b'value for deltareuse invalid: %s') % deltareuse |
|
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3877 ) |
|
30778
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3878 |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3879 if len(destrevlog): |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3880 raise ValueError(_(b'destination revlog is not empty')) |
|
30778
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3881 |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3882 if getattr(self, 'filteredrevs', None): |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3883 raise ValueError(_(b'source revlog has filtered revisions')) |
|
30778
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3884 if getattr(destrevlog, 'filteredrevs', None): |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
3885 raise ValueError(_(b'destination revlog has filtered revisions')) |
|
30778
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3886 |
|
41862
afd37ed731f1
revlog: preserve `_lazydelta` attribute in `revlog.clone`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41824
diff
changeset
|
3887 # lazydelta and lazydeltabase controls whether to reuse a cached delta, |
|
afd37ed731f1
revlog: preserve `_lazydelta` attribute in `revlog.clone`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41824
diff
changeset
|
3888 # if possible. |
|
51035
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
3889 old_delta_config = destrevlog.delta_config |
|
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
3890 destrevlog.delta_config = destrevlog.delta_config.copy() |
|
30778
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3891 |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3892 try: |
|
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3893 if deltareuse == self.DELTAREUSEALWAYS: |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
3894 destrevlog.delta_config.lazy_delta_base = True |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
3895 destrevlog.delta_config.lazy_delta = True |
|
30778
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3896 elif deltareuse == self.DELTAREUSESAMEREVS: |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
3897 destrevlog.delta_config.lazy_delta_base = False |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
3898 destrevlog.delta_config.lazy_delta = True |
|
41862
afd37ed731f1
revlog: preserve `_lazydelta` attribute in `revlog.clone`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41824
diff
changeset
|
3899 elif deltareuse == self.DELTAREUSENEVER: |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
3900 destrevlog.delta_config.lazy_delta_base = False |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
3901 destrevlog.delta_config.lazy_delta = False |
|
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
3902 |
|
51035
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
3903 delta_both_parents = ( |
|
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
3904 forcedeltabothparents or old_delta_config.delta_both_parents |
|
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
3905 ) |
|
51034
498afb627f78
revlog: move configuration attribute into dedicated object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51031
diff
changeset
|
3906 destrevlog.delta_config.delta_both_parents = delta_both_parents |
|
30778
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3907 |
|
50792
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
3908 with self.reading(), destrevlog._writing(tr): |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
3909 self._clone( |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
3910 tr, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
3911 destrevlog, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
3912 addrevisioncb, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
3913 deltareuse, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
3914 forcedeltabothparents, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
3915 sidedata_helpers, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
3916 ) |
|
42998
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3917 |
|
30778
1c7368d1a25f
revlog: add clone method
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30746
diff
changeset
|
3918 finally: |
|
51035
177e7d6bf875
revlog: overwrite revlog config through copy of the config object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51034
diff
changeset
|
3919 destrevlog.delta_config = old_delta_config |
|
39794
a6b3c4c1019f
revlog: move censor logic out of censor extension
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39791
diff
changeset
|
3920 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3921 def _clone( |
|
43133
3de4d13f22be
revlog: add a way to control sidedata changes during revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43117
diff
changeset
|
3922 self, |
|
3de4d13f22be
revlog: add a way to control sidedata changes during revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43117
diff
changeset
|
3923 tr, |
|
3de4d13f22be
revlog: add a way to control sidedata changes during revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43117
diff
changeset
|
3924 destrevlog, |
|
3de4d13f22be
revlog: add a way to control sidedata changes during revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43117
diff
changeset
|
3925 addrevisioncb, |
|
3de4d13f22be
revlog: add a way to control sidedata changes during revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43117
diff
changeset
|
3926 deltareuse, |
|
3de4d13f22be
revlog: add a way to control sidedata changes during revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43117
diff
changeset
|
3927 forcedeltabothparents, |
|
47098
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3928 sidedata_helpers, |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3929 ): |
|
42998
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3930 """perform the core duty of `revlog.clone` after parameter processing""" |
|
49248
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3931 write_debug = None |
|
51059
ab2bc31fa91f
revlog: remove legacy usage of `_debug_delta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51056
diff
changeset
|
3932 if self.delta_config.debug_delta: |
|
49248
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3933 write_debug = tr._report |
|
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3934 deltacomputer = deltautil.deltacomputer( |
|
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3935 destrevlog, |
|
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3936 write_debug=write_debug, |
|
2bcf5e14bb7e
deltas: add a `debug.revlog.debug-delta` config option enable output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49077
diff
changeset
|
3937 ) |
|
42998
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3938 index = self.index |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3939 for rev in self: |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3940 entry = index[rev] |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3941 |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3942 # Some classes override linkrev to take filtered revs into |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3943 # account. Use raw entry from index. |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3944 flags = entry[0] & 0xFFFF |
|
42998
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3945 linkrev = entry[4] |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3946 p1 = index[entry[5]][7] |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3947 p2 = index[entry[6]][7] |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3948 node = entry[7] |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3949 |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3950 # (Possibly) reuse the delta from the revlog if allowed and |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3951 # the revlog chunk is a delta. |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3952 cachedelta = None |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3953 rawtext = None |
|
47098
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3954 if deltareuse == self.DELTAREUSEFULLADD: |
|
47391
9d9eb22b9b69
revlog: no longer return sidedata from `_revisiondata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47390
diff
changeset
|
3955 text = self._revisiondata(rev) |
|
47390
fec306b05328
revlog: use `self.sidedata` directly in `revlog.clone`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47388
diff
changeset
|
3956 sidedata = self.sidedata(rev) |
|
47098
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3957 |
|
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3958 if sidedata_helpers is not None: |
|
47099
3aab2330b7d3
sidedata: move sidedata-related utils to the dedicated module
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47098
diff
changeset
|
3959 (sidedata, new_flags) = sidedatautil.run_sidedata_helpers( |
|
47098
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3960 self, sidedata_helpers, sidedata, rev |
|
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3961 ) |
|
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3962 flags = flags | new_flags[0] & ~new_flags[1] |
|
45735
edf4fa06df94
upgrade: allow sidedata upgrade to modify revision flag
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45671
diff
changeset
|
3963 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3964 destrevlog.addrevision( |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3965 text, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3966 tr, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3967 linkrev, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3968 p1, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3969 p2, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3970 cachedelta=cachedelta, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3971 node=node, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3972 flags=flags, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3973 deltacomputer=deltacomputer, |
|
43133
3de4d13f22be
revlog: add a way to control sidedata changes during revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43117
diff
changeset
|
3974 sidedata=sidedata, |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
3975 ) |
|
42998
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
3976 else: |
|
51071
b79c73a7afce
revlog: remove legacy usage of `_lazydelta`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51070
diff
changeset
|
3977 if destrevlog.delta_config.lazy_delta: |
|
43000
8a31294fa25c
upgrade: fix DELTAREUSEFULLADD implementation in revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42999
diff
changeset
|
3978 dp = self.deltaparent(rev) |
|
8a31294fa25c
upgrade: fix DELTAREUSEFULLADD implementation in revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42999
diff
changeset
|
3979 if dp != nullrev: |
|
51096
9c8df10ea6e0
revlog: move the `_chunk` method on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51095
diff
changeset
|
3980 cachedelta = (dp, bytes(self._inner._chunk(rev))) |
|
43000
8a31294fa25c
upgrade: fix DELTAREUSEFULLADD implementation in revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42999
diff
changeset
|
3981 |
|
47098
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3982 sidedata = None |
|
43000
8a31294fa25c
upgrade: fix DELTAREUSEFULLADD implementation in revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42999
diff
changeset
|
3983 if not cachedelta: |
|
50791
2dec23658969
censor: accept censored revision during upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50789
diff
changeset
|
3984 try: |
|
2dec23658969
censor: accept censored revision during upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50789
diff
changeset
|
3985 rawtext = self._revisiondata(rev) |
|
2dec23658969
censor: accept censored revision during upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50789
diff
changeset
|
3986 except error.CensoredNodeError as censored: |
|
2dec23658969
censor: accept censored revision during upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50789
diff
changeset
|
3987 assert flags & REVIDX_ISCENSORED |
|
2dec23658969
censor: accept censored revision during upgrade
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50789
diff
changeset
|
3988 rawtext = censored.tombstone |
|
47390
fec306b05328
revlog: use `self.sidedata` directly in `revlog.clone`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47388
diff
changeset
|
3989 sidedata = self.sidedata(rev) |
|
47098
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3990 if sidedata is None: |
|
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3991 sidedata = self.sidedata(rev) |
|
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3992 |
|
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3993 if sidedata_helpers is not None: |
|
47099
3aab2330b7d3
sidedata: move sidedata-related utils to the dedicated module
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47098
diff
changeset
|
3994 (sidedata, new_flags) = sidedatautil.run_sidedata_helpers( |
|
47098
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3995 self, sidedata_helpers, sidedata, rev |
|
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3996 ) |
|
27f1191b1305
sidedata: replace sidedata upgrade mechanism with the new one
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47095
diff
changeset
|
3997 flags = flags | new_flags[0] & ~new_flags[1] |
|
43000
8a31294fa25c
upgrade: fix DELTAREUSEFULLADD implementation in revlog.clone
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42999
diff
changeset
|
3998 |
|
50792
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
3999 destrevlog._addrevision( |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
4000 node, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
4001 rawtext, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
4002 tr, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
4003 linkrev, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
4004 p1, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
4005 p2, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
4006 flags, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
4007 cachedelta, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
4008 deltacomputer=deltacomputer, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
4009 sidedata=sidedata, |
|
315c74911993
revlog: avoid opening and closing the file for each cloned revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50791
diff
changeset
|
4010 ) |
|
42998
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
4011 |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
4012 if addrevisioncb: |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
4013 addrevisioncb(self, rev, node) |
|
4f2315cce1db
upgrade: move most of revlog.clone method into a _clone method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42997
diff
changeset
|
4014 |
|
51290
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51283
diff
changeset
|
4015 def censorrevision(self, tr, censor_nodes, tombstone=b''): |
|
47153
f58a13c52726
revlog: split the `version` attribute into its two components
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
4016 if self._format_version == REVLOGV0: |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4017 raise error.RevlogError( |
|
47153
f58a13c52726
revlog: split the `version` attribute into its two components
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
4018 _(b'cannot censor with version %d revlogs') |
|
f58a13c52726
revlog: split the `version` attribute into its two components
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
4019 % self._format_version |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4020 ) |
|
47397
33d626910374
revlog: move censoring code in a dedicated module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47395
diff
changeset
|
4021 elif self._format_version == REVLOGV1: |
|
51290
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51283
diff
changeset
|
4022 rewrite.v1_censor(self, tr, censor_nodes, tombstone) |
|
47397
33d626910374
revlog: move censoring code in a dedicated module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47395
diff
changeset
|
4023 else: |
|
51290
ceeb8fa23cc8
censor: accept multiple revision in a single call
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51283
diff
changeset
|
4024 rewrite.v2_censor(self, tr, censor_nodes, tombstone) |
|
39794
a6b3c4c1019f
revlog: move censor logic out of censor extension
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39791
diff
changeset
|
4025 |
|
52497
4ef6dbc27a99
revlog: subclass the new `repository.iverifyproblem` Protocol class
Matt Harbison <matt_harbison@yahoo.com>
parents:
52446
diff
changeset
|
4026 def verifyintegrity(self, state) -> Iterable[repository.iverifyproblem]: |
|
39847
97986c9c69d3
verify: start to abstract file verification
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39836
diff
changeset
|
4027 """Verifies the integrity of the revlog. |
|
97986c9c69d3
verify: start to abstract file verification
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39836
diff
changeset
|
4028 |
|
97986c9c69d3
verify: start to abstract file verification
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39836
diff
changeset
|
4029 Yields ``revlogproblem`` instances describing problems that are |
|
97986c9c69d3
verify: start to abstract file verification
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39836
diff
changeset
|
4030 found. |
|
97986c9c69d3
verify: start to abstract file verification
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39836
diff
changeset
|
4031 """ |
|
97986c9c69d3
verify: start to abstract file verification
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39836
diff
changeset
|
4032 dd, di = self.checksize() |
|
97986c9c69d3
verify: start to abstract file verification
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39836
diff
changeset
|
4033 if dd: |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4034 yield revlogproblem(error=_(b'data length off by %d bytes') % dd) |
|
39847
97986c9c69d3
verify: start to abstract file verification
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39836
diff
changeset
|
4035 if di: |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4036 yield revlogproblem(error=_(b'index contains %d extra bytes') % di) |
|
39847
97986c9c69d3
verify: start to abstract file verification
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39836
diff
changeset
|
4037 |
|
47153
f58a13c52726
revlog: split the `version` attribute into its two components
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
4038 version = self._format_version |
|
39850
e6d3d39cc1c7
revlog: use proper version comparison during verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39847
diff
changeset
|
4039 |
|
e6d3d39cc1c7
revlog: use proper version comparison during verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39847
diff
changeset
|
4040 # The verifier tells us what version revlog we should be. |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4041 if version != state[b'expectedversion']: |
|
39850
e6d3d39cc1c7
revlog: use proper version comparison during verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39847
diff
changeset
|
4042 yield revlogproblem( |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4043 warning=_(b"warning: '%s' uses revlog format %d; expected %d") |
|
47171
3a9f3470922c
revlog: use revlog.display_id in format related errors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47169
diff
changeset
|
4044 % (self.display_id, version, state[b'expectedversion']) |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4045 ) |
|
39874
14e500b58263
revlog: add method for obtaining storage info (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39871
diff
changeset
|
4046 |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4047 state[b'skipread'] = set() |
|
44073
b9e174d4ed11
verify: allow the storage to signal when renames can be tested on `skipread`
Matt Harbison <matt_harbison@yahoo.com>
parents:
44054
diff
changeset
|
4048 state[b'safe_renamed'] = set() |
|
39877
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4049 |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4050 for rev in self: |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4051 node = self.node(rev) |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4052 |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4053 # Verify contents. 4 cases to care about: |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4054 # |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4055 # common: the most common case |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4056 # rename: with a rename |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4057 # meta: file content starts with b'\1\n', the metadata |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4058 # header defined in filelog.py, but without a rename |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4059 # ext: content stored externally |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4060 # |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4061 # More formally, their differences are shown below: |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4062 # |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4063 # | common | rename | meta | ext |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4064 # ------------------------------------------------------- |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4065 # flags() | 0 | 0 | 0 | not 0 |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4066 # renamed() | False | True | False | ? |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4067 # rawtext[0:2]=='\1\n'| False | True | True | ? |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4068 # |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4069 # "rawtext" means the raw text stored in revlog data, which |
|
42784
5a8f2c8edff6
rawdata: update caller in revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42749
diff
changeset
|
4070 # could be retrieved by "rawdata(rev)". "text" |
|
5a8f2c8edff6
rawdata: update caller in revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42749
diff
changeset
|
4071 # mentioned below is "revision(rev)". |
|
39877
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4072 # |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4073 # There are 3 different lengths stored physically: |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4074 # 1. L1: rawsize, stored in revlog index |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4075 # 2. L2: len(rawtext), stored in revlog data |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4076 # 3. L3: len(text), stored in revlog data if flags==0, or |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4077 # possibly somewhere else if flags!=0 |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4078 # |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4079 # L1 should be equal to L2. L3 could be different from them. |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4080 # "text" may or may not affect commit hash depending on flag |
|
42749
6d61be152c55
flagutil: move addflagprocessor to the new module (API)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42748
diff
changeset
|
4081 # processors (see flagutil.addflagprocessor). |
|
39877
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4082 # |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4083 # | common | rename | meta | ext |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4084 # ------------------------------------------------- |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4085 # rawsize() | L1 | L1 | L1 | L1 |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4086 # size() | L1 | L2-LM | L1(*) | L1 (?) |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4087 # len(rawtext) | L2 | L2 | L2 | L2 |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4088 # len(text) | L2 | L2 | L2 | L3 |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4089 # len(read()) | L2 | L2-LM | L2-LM | L3 (?) |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4090 # |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4091 # LM: length of metadata, depending on rawtext |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4092 # (*): not ideal, see comment in filelog.size |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4093 # (?): could be "- len(meta)" if the resolved content has |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4094 # rename metadata |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4095 # |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4096 # Checks needed to be done: |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4097 # 1. length check: L1 == L2, in all cases. |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4098 # 2. hash check: depending on flag processor, we may need to |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4099 # use either "text" (external), or "rawtext" (in revlog). |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4100 |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4101 try: |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4102 skipflags = state.get(b'skipflags', 0) |
|
39877
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4103 if skipflags: |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4104 skipflags &= self.flags(rev) |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4105 |
|
43962
7c3118b9a9db
revlog: split the content verification of a node into a separate method
Matt Harbison <matt_harbison@yahoo.com>
parents:
43799
diff
changeset
|
4106 _verify_revision(self, skipflags, state, node) |
|
39877
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4107 |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4108 l1 = self.rawsize(rev) |
|
42784
5a8f2c8edff6
rawdata: update caller in revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42749
diff
changeset
|
4109 l2 = len(self.rawdata(node)) |
|
39877
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4110 |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4111 if l1 != l2: |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4112 yield revlogproblem( |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4113 error=_(b'unpacked size is %d, %d expected') % (l2, l1), |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4114 node=node, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4115 ) |
|
39877
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4116 |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4117 except error.CensoredNodeError: |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4118 if state[b'erroroncensored']: |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4119 yield revlogproblem( |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4120 error=_(b'censored file data'), node=node |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4121 ) |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4122 state[b'skipread'].add(node) |
|
39877
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4123 except Exception as e: |
|
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4124 yield revlogproblem( |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4125 error=_(b'unpacking %s: %s') |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4126 % (short(node), stringutil.forcebytestr(e)), |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4127 node=node, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4128 ) |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4129 state[b'skipread'].add(node) |
|
39877
733db72f0f54
revlog: move revision verification out of verify
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39874
diff
changeset
|
4130 |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4131 def storageinfo( |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4132 self, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4133 exclusivefiles=False, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4134 sharedfiles=False, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4135 revisionscount=False, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4136 trackedsize=False, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4137 storedsize=False, |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4138 ): |
|
39874
14e500b58263
revlog: add method for obtaining storage info (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39871
diff
changeset
|
4139 d = {} |
|
14e500b58263
revlog: add method for obtaining storage info (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39871
diff
changeset
|
4140 |
|
14e500b58263
revlog: add method for obtaining storage info (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39871
diff
changeset
|
4141 if exclusivefiles: |
|
47162
a07d5cb03a85
revlog: rename `indexfile` to `_indexfile`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47159
diff
changeset
|
4142 d[b'exclusivefiles'] = [(self.opener, self._indexfile)] |
|
39874
14e500b58263
revlog: add method for obtaining storage info (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39871
diff
changeset
|
4143 if not self._inline: |
|
47163
396442cd7e6a
revlog: rename `datafile` to `datafile`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47162
diff
changeset
|
4144 d[b'exclusivefiles'].append((self.opener, self._datafile)) |
|
39874
14e500b58263
revlog: add method for obtaining storage info (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39871
diff
changeset
|
4145 |
|
14e500b58263
revlog: add method for obtaining storage info (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39871
diff
changeset
|
4146 if sharedfiles: |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4147 d[b'sharedfiles'] = [] |
|
39874
14e500b58263
revlog: add method for obtaining storage info (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39871
diff
changeset
|
4148 |
|
14e500b58263
revlog: add method for obtaining storage info (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39871
diff
changeset
|
4149 if revisionscount: |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4150 d[b'revisionscount'] = len(self) |
|
39874
14e500b58263
revlog: add method for obtaining storage info (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39871
diff
changeset
|
4151 |
|
14e500b58263
revlog: add method for obtaining storage info (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39871
diff
changeset
|
4152 if trackedsize: |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4153 d[b'trackedsize'] = sum(map(self.rawsize, iter(self))) |
|
39874
14e500b58263
revlog: add method for obtaining storage info (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39871
diff
changeset
|
4154 |
|
14e500b58263
revlog: add method for obtaining storage info (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39871
diff
changeset
|
4155 if storedsize: |
|
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
4156 d[b'storedsize'] = sum( |
|
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4157 self.opener.stat(path).st_size for path in self.files() |
|
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
43039
diff
changeset
|
4158 ) |
|
39874
14e500b58263
revlog: add method for obtaining storage info (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39871
diff
changeset
|
4159 |
|
14e500b58263
revlog: add method for obtaining storage info (API)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39871
diff
changeset
|
4160 return d |
|
46731
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4161 |
|
47227
2bd4b5218918
revlog: pass a transaction object to `rewrite_sidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47226
diff
changeset
|
4162 def rewrite_sidedata(self, transaction, helpers, startrev, endrev): |
|
51066
7c2dc75cdc0f
revlog: remove legacy usage of `hassidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51065
diff
changeset
|
4163 if not self.feature_config.has_side_data: |
|
46731
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4164 return |
|
47245
616b8f412676
revlogv2: introduce a very basic docket file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47242
diff
changeset
|
4165 # revlog formats with sidedata support does not support inline |
|
46731
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4166 assert not self._inline |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4167 if not helpers[1] and not helpers[2]: |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4168 # Nothing to generate or remove |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4169 return |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4170 |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4171 new_entries = [] |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4172 # append the new sidedata |
|
47229
b3acefded601
revlog: use `_writing` in `rewrite_sidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47228
diff
changeset
|
4173 with self._writing(transaction): |
|
51090
c3748f38dcd0
revlog: create a iteration of a _InnerRevlog object within the revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51089
diff
changeset
|
4174 ifh, dfh, sdfh = self._inner._writinghandles |
|
47395
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
4175 dfh.seek(self._docket.sidedata_end, os.SEEK_SET) |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
4176 |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
4177 current_offset = sdfh.tell() |
|
46731
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4178 for rev in range(startrev, endrev + 1): |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4179 entry = self.index[rev] |
|
47099
3aab2330b7d3
sidedata: move sidedata-related utils to the dedicated module
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47098
diff
changeset
|
4180 new_sidedata, flags = sidedatautil.run_sidedata_helpers( |
|
46731
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4181 store=self, |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4182 sidedata_helpers=helpers, |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4183 sidedata={}, |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4184 rev=rev, |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4185 ) |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4186 |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4187 serialized_sidedata = sidedatautil.serialize_sidedata( |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4188 new_sidedata |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4189 ) |
|
47270
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4190 |
|
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4191 sidedata_compression_mode = COMP_MODE_INLINE |
|
51066
7c2dc75cdc0f
revlog: remove legacy usage of `hassidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51065
diff
changeset
|
4192 if serialized_sidedata and self.feature_config.has_side_data: |
|
47270
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4193 sidedata_compression_mode = COMP_MODE_PLAIN |
|
51095
a82704902db8
revlog: move the compression/decompression logic on the inner object
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
51094
diff
changeset
|
4194 h, comp_sidedata = self._inner.compress(serialized_sidedata) |
|
47270
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4195 if ( |
|
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4196 h != b'u' |
|
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4197 and comp_sidedata[0] != b'\0' |
|
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4198 and len(comp_sidedata) < len(serialized_sidedata) |
|
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4199 ): |
|
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4200 assert not h |
|
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4201 if ( |
|
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4202 comp_sidedata[0] |
|
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4203 == self._docket.default_compression_header |
|
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4204 ): |
|
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4205 sidedata_compression_mode = COMP_MODE_DEFAULT |
|
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4206 serialized_sidedata = comp_sidedata |
|
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4207 else: |
|
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4208 sidedata_compression_mode = COMP_MODE_INLINE |
|
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4209 serialized_sidedata = comp_sidedata |
|
46731
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4210 if entry[8] != 0 or entry[9] != 0: |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4211 # rewriting entries that already have sidedata is not |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4212 # supported yet, because it introduces garbage data in the |
|
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4213 # revlog. |
|
47239
e51392acd70c
revlog: fix capitalisation of an error
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47233
diff
changeset
|
4214 msg = b"rewriting existing sidedata is not supported yet" |
|
46731
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4215 raise error.Abort(msg) |
|
47095
223b47235d1c
sidedata: enable sidedata computers to optionally rewrite flags
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47094
diff
changeset
|
4216 |
|
223b47235d1c
sidedata: enable sidedata computers to optionally rewrite flags
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47094
diff
changeset
|
4217 # Apply (potential) flags to add and to remove after running |
|
223b47235d1c
sidedata: enable sidedata computers to optionally rewrite flags
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47094
diff
changeset
|
4218 # the sidedata helpers |
|
223b47235d1c
sidedata: enable sidedata computers to optionally rewrite flags
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47094
diff
changeset
|
4219 new_offset_flags = entry[0] | flags[0] & ~flags[1] |
|
47256
de63be070e02
revlog: simplify entry update logic in `rewrite_sidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47253
diff
changeset
|
4220 entry_update = ( |
|
de63be070e02
revlog: simplify entry update logic in `rewrite_sidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47253
diff
changeset
|
4221 current_offset, |
|
de63be070e02
revlog: simplify entry update logic in `rewrite_sidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47253
diff
changeset
|
4222 len(serialized_sidedata), |
|
de63be070e02
revlog: simplify entry update logic in `rewrite_sidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47253
diff
changeset
|
4223 new_offset_flags, |
|
47270
07641bafa646
revlog: compress sidedata when doing "post-pull" sidedata update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47269
diff
changeset
|
4224 sidedata_compression_mode, |
|
47256
de63be070e02
revlog: simplify entry update logic in `rewrite_sidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47253
diff
changeset
|
4225 ) |
|
46731
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4226 |
|
47228
8f6165c90163
revlog: open files in 'r+' instead of 'a+'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47227
diff
changeset
|
4227 # the sidedata computation might have move the file cursors around |
|
47395
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
4228 sdfh.seek(current_offset, os.SEEK_SET) |
|
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
4229 sdfh.write(serialized_sidedata) |
|
47256
de63be070e02
revlog: simplify entry update logic in `rewrite_sidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47253
diff
changeset
|
4230 new_entries.append(entry_update) |
|
46731
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4231 current_offset += len(serialized_sidedata) |
|
47395
e6292eb33384
revlog: store sidedata in their own file
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47393
diff
changeset
|
4232 self._docket.sidedata_end = sdfh.tell() |
|
46731
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4233 |
|
47229
b3acefded601
revlog: use `_writing` in `rewrite_sidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47228
diff
changeset
|
4234 # rewrite the new index entries |
|
b3acefded601
revlog: use `_writing` in `rewrite_sidedata`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47228
diff
changeset
|
4235 ifh.seek(startrev * self.index.entry_size) |
|
47095
223b47235d1c
sidedata: enable sidedata computers to optionally rewrite flags
Rapha?l Gom?s <rgomes@octobus.net>
parents:
47094
diff
changeset
|
4236 for i, e in enumerate(new_entries): |
|
46731
ba8e508a8e69
sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Rapha?l Gom?s <rgomes@octobus.net>
parents:
46729
diff
changeset
|
4237 rev = startrev + i |
|
52293
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
4238 self.index.replace_sidedata_info( |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
4239 rev, *e |
|
7346f93be7a4
revlog: add the glue to use the Rust `InnerRevlog` from Python
Rapha?l Gom?s <rgomes@octobus.net>
parents:
52292
diff
changeset
|
4240 ) # pytype: disable=attribute-error |
|
47078
d57386e5c80e
revlog: have an explicit "pack_header" method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47077
diff
changeset
|
4241 packed = self.index.entry_binary(rev) |
|
47246
6b1eae313b2f
revlogv2: store version information in the docket only
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47245
diff
changeset
|
4242 if rev == 0 and self._docket is None: |
|
47153
f58a13c52726
revlog: split the `version` attribute into its two components
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
4243 header = self._format_flags | self._format_version |
|
f58a13c52726
revlog: split the `version` attribute into its two components
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
4244 header = self.index.pack_header(header) |
|
47078
d57386e5c80e
revlog: have an explicit "pack_header" method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47077
diff
changeset
|
4245 packed = header + packed |
|
47226
042388bba644
revlog: rename variable in `rewrite_sidedata` to match other code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47225
diff
changeset
|
4246 ifh.write(packed) |