Mercurial > hg
annotate tests/test-revlog-raw.py @ 50329:3dbc7b1ecaba stable
typing: correct the signature of error.CommandError
There's a place in `mercurial.dispatch._parse()` that passes None if a parse
error happens before the command can be parsed out, and casting the error to
bytes works fine because the command and message fields are apparently ignored.
Likewise, TortoiseHg similarly passes None for the same reason.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 24 Mar 2023 02:22:12 -0400 |
parents | b670eb3dd6c9 |
children | 39fa0b948f5a |
rev | line source |
---|---|
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
1 # test revlog interaction about raw data (flagprocessor) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
2 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
3 |
41035
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
4 import hashlib |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
5 import sys |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
6 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
7 from mercurial import ( |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
8 encoding, |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
9 revlog, |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
10 transaction, |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
11 vfs, |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
12 ) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
13 |
41034
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
14 from mercurial.revlogutils import ( |
47072
4c041c71ec01
revlog: introduce an explicit tracking of what the revlog is about
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47012
diff
changeset
|
15 constants, |
41034
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
16 deltas, |
42732
6d61be152c55
flagutil: move addflagprocessor to the new module (API)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41365
diff
changeset
|
17 flagutil, |
41034
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
18 ) |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
19 |
47214
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
20 |
48946
642e31cb55f0
py3: use class X: instead of class X(object):
Gregory Szorc <gregory.szorc@gmail.com>
parents:
48875
diff
changeset
|
21 class _NoTransaction: |
47214
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
22 """transaction like object to update the nodemap outside a transaction""" |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
23 |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
24 def __init__(self): |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
25 self._postclose = {} |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
26 |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
27 def addpostclose(self, callback_id, callback_func): |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
28 self._postclose[callback_id] = callback_func |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
29 |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
30 def registertmp(self, *args, **kwargs): |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
31 pass |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
32 |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
33 def addbackup(self, *args, **kwargs): |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
34 pass |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
35 |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
36 def add(self, *args, **kwargs): |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
37 pass |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
38 |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
39 def addabort(self, *args, **kwargs): |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
40 pass |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
41 |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
42 def _report(self, *args): |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
43 pass |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
44 |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
45 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
46 # TESTTMP is optional. This makes it convenient to run without run-tests.py |
37896
03a09579c854
tests: port test-revlog-raw.py to Python 3
Augie Fackler <augie@google.com>
parents:
36744
diff
changeset
|
47 tvfs = vfs.vfs(encoding.environ.get(b'TESTTMP', b'/tmp')) |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
48 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
49 # Enable generaldelta otherwise revlog won't use delta as expected by the test |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
50 tvfs.options = { |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
51 b'generaldelta': True, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
52 b'revlogv1': True, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
53 b'sparse-revlog': True, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
54 } |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
55 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
56 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
57 def abort(msg): |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
58 print('abort: %s' % msg) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
59 # Return 0 so run-tests.py could compare the output. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
60 sys.exit() |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
61 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
62 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
63 # Register a revlog processor for flag EXTSTORED. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
64 # |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
65 # It simply prepends a fixed header, and replaces '1' to 'i'. So it has |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
66 # insertion and replacement, and may be interesting to test revlog's line-based |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
67 # deltas. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
68 _extheader = b'E\n' |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
69 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
70 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
71 def readprocessor(self, rawtext): |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
72 # True: the returned text could be used to verify hash |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
73 text = rawtext[len(_extheader) :].replace(b'i', b'1') |
46709
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Raphaël Gomès <rgomes@octobus.net>
parents:
46113
diff
changeset
|
74 return text, True |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
75 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
76 |
46709
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Raphaël Gomès <rgomes@octobus.net>
parents:
46113
diff
changeset
|
77 def writeprocessor(self, text): |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
78 # False: the returned rawtext shouldn't be used to verify hash |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
79 rawtext = _extheader + text.replace(b'1', b'i') |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
80 return rawtext, False |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
81 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
82 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
83 def rawprocessor(self, rawtext): |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
84 # False: do not verify hash. Only the content returned by "readprocessor" |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
85 # can be used to verify hash. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
86 return False |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
87 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
88 |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
89 flagutil.addflagprocessor( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
90 revlog.REVIDX_EXTSTORED, (readprocessor, writeprocessor, rawprocessor) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
91 ) |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
92 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
93 # Utilities about reading and appending revlog |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
94 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
95 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
96 def newtransaction(): |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
97 # A transaction is required to write revlogs |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
98 report = lambda msg: None |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
99 return transaction.transaction(report, tvfs, {'plain': tvfs}, b'journal') |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
100 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
101 |
47150
8d3c2f9d4af7
revlog: use a "radix" to address revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47149
diff
changeset
|
102 def newrevlog(name=b'_testrevlog', recreate=False): |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
103 if recreate: |
47150
8d3c2f9d4af7
revlog: use a "radix" to address revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47149
diff
changeset
|
104 tvfs.tryunlink(name + b'.i') |
8d3c2f9d4af7
revlog: use a "radix" to address revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47149
diff
changeset
|
105 target = (constants.KIND_OTHER, b'test') |
8d3c2f9d4af7
revlog: use a "radix" to address revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47149
diff
changeset
|
106 rlog = revlog.revlog(tvfs, target=target, radix=name) |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
107 return rlog |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
108 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
109 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
110 def appendrev(rlog, text, tr, isext=False, isdelta=True): |
45942
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
44452
diff
changeset
|
111 """Append a revision. If isext is True, set the EXTSTORED flag so flag |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
112 processor will be used (and rawtext is different from text). If isdelta is |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
113 True, force the revision to be a delta, otherwise it's full text. |
45942
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
44452
diff
changeset
|
114 """ |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
115 nextrev = len(rlog) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
116 p1 = rlog.node(nextrev - 1) |
47012
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46711
diff
changeset
|
117 p2 = rlog.nullid |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
118 if isext: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
119 flags = revlog.REVIDX_EXTSTORED |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
120 else: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
121 flags = revlog.REVIDX_DEFAULT_FLAGS |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
122 # Change storedeltachains temporarily, to override revlog's delta decision |
39232
0a5b20c107a6
repository: remove storedeltachains from ifilestorage
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37896
diff
changeset
|
123 rlog._storedeltachains = isdelta |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
124 try: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
125 rlog.addrevision(text, tr, nextrev, p1, p2, flags=flags) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
126 return nextrev |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
127 except Exception as ex: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
128 abort('rev %d: failed to append: %s' % (nextrev, ex)) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
129 finally: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
130 # Restore storedeltachains. It is always True, see revlog.__init__ |
39232
0a5b20c107a6
repository: remove storedeltachains from ifilestorage
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37896
diff
changeset
|
131 rlog._storedeltachains = True |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
132 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
133 |
47150
8d3c2f9d4af7
revlog: use a "radix" to address revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47149
diff
changeset
|
134 def addgroupcopy(rlog, tr, destname=b'_destrevlog', optimaldelta=True): |
45942
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
44452
diff
changeset
|
135 """Copy revlog to destname using revlog.addgroup. Return the copied revlog. |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
136 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
137 This emulates push or pull. They use changegroup. Changegroup requires |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
138 repo to work. We don't have a repo, so a dummy changegroup is used. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
139 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
140 If optimaldelta is True, use optimized delta parent, so the destination |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
141 revlog could probably reuse it. Otherwise it builds sub-optimal delta, and |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
142 the destination revlog needs more work to use it. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
143 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
144 This exercises some revlog.addgroup (and revlog._addrevision(text=None)) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
145 code path, which is not covered by "appendrev" alone. |
45942
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
44452
diff
changeset
|
146 """ |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
147 |
48946
642e31cb55f0
py3: use class X: instead of class X(object):
Gregory Szorc <gregory.szorc@gmail.com>
parents:
48875
diff
changeset
|
148 class dummychangegroup: |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
149 @staticmethod |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
150 def deltachunk(pnode): |
47012
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46711
diff
changeset
|
151 pnode = pnode or rlog.nullid |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
152 parentrev = rlog.rev(pnode) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
153 r = parentrev + 1 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
154 if r >= len(rlog): |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
155 return {} |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
156 if optimaldelta: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
157 deltaparent = parentrev |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
158 else: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
159 # suboptimal deltaparent |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
160 deltaparent = min(0, parentrev) |
36744
33275ab5e837
revlog: do not use delta for lfs revisions
Jun Wu <quark@fb.com>
parents:
35638
diff
changeset
|
161 if not rlog.candelta(deltaparent, r): |
33275ab5e837
revlog: do not use delta for lfs revisions
Jun Wu <quark@fb.com>
parents:
35638
diff
changeset
|
162 deltaparent = -1 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
163 return { |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
164 b'node': rlog.node(r), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
165 b'p1': pnode, |
47012
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46711
diff
changeset
|
166 b'p2': rlog.nullid, |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
167 b'cs': rlog.node(rlog.linkrev(r)), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
168 b'flags': rlog.flags(r), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
169 b'deltabase': rlog.node(deltaparent), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
170 b'delta': rlog.revdiff(deltaparent, r), |
46711
a41565bef69f
changegroup: add v4 changegroup for revlog v2 exchange
Raphaël Gomès <rgomes@octobus.net>
parents:
46709
diff
changeset
|
171 b'sidedata': rlog.sidedata(r), |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
172 } |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
173 |
34291
1db9abf407c5
revlog: add revmap back to revlog.addgroup
Durham Goode <durham@fb.com>
parents:
34148
diff
changeset
|
174 def deltaiter(self): |
34148
c8b6ed51386b
changegroup: remove changegroup dependency from revlog.addgroup
Durham Goode <durham@fb.com>
parents:
33625
diff
changeset
|
175 chain = None |
c8b6ed51386b
changegroup: remove changegroup dependency from revlog.addgroup
Durham Goode <durham@fb.com>
parents:
33625
diff
changeset
|
176 for chunkdata in iter(lambda: self.deltachunk(chain), {}): |
37896
03a09579c854
tests: port test-revlog-raw.py to Python 3
Augie Fackler <augie@google.com>
parents:
36744
diff
changeset
|
177 node = chunkdata[b'node'] |
03a09579c854
tests: port test-revlog-raw.py to Python 3
Augie Fackler <augie@google.com>
parents:
36744
diff
changeset
|
178 p1 = chunkdata[b'p1'] |
03a09579c854
tests: port test-revlog-raw.py to Python 3
Augie Fackler <augie@google.com>
parents:
36744
diff
changeset
|
179 p2 = chunkdata[b'p2'] |
03a09579c854
tests: port test-revlog-raw.py to Python 3
Augie Fackler <augie@google.com>
parents:
36744
diff
changeset
|
180 cs = chunkdata[b'cs'] |
03a09579c854
tests: port test-revlog-raw.py to Python 3
Augie Fackler <augie@google.com>
parents:
36744
diff
changeset
|
181 deltabase = chunkdata[b'deltabase'] |
03a09579c854
tests: port test-revlog-raw.py to Python 3
Augie Fackler <augie@google.com>
parents:
36744
diff
changeset
|
182 delta = chunkdata[b'delta'] |
03a09579c854
tests: port test-revlog-raw.py to Python 3
Augie Fackler <augie@google.com>
parents:
36744
diff
changeset
|
183 flags = chunkdata[b'flags'] |
46711
a41565bef69f
changegroup: add v4 changegroup for revlog v2 exchange
Raphaël Gomès <rgomes@octobus.net>
parents:
46709
diff
changeset
|
184 sidedata = chunkdata[b'sidedata'] |
34148
c8b6ed51386b
changegroup: remove changegroup dependency from revlog.addgroup
Durham Goode <durham@fb.com>
parents:
33625
diff
changeset
|
185 |
c8b6ed51386b
changegroup: remove changegroup dependency from revlog.addgroup
Durham Goode <durham@fb.com>
parents:
33625
diff
changeset
|
186 chain = node |
c8b6ed51386b
changegroup: remove changegroup dependency from revlog.addgroup
Durham Goode <durham@fb.com>
parents:
33625
diff
changeset
|
187 |
46711
a41565bef69f
changegroup: add v4 changegroup for revlog v2 exchange
Raphaël Gomès <rgomes@octobus.net>
parents:
46709
diff
changeset
|
188 yield (node, p1, p2, cs, deltabase, delta, flags, sidedata) |
34148
c8b6ed51386b
changegroup: remove changegroup dependency from revlog.addgroup
Durham Goode <durham@fb.com>
parents:
33625
diff
changeset
|
189 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
190 def linkmap(lnode): |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
191 return rlog.rev(lnode) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
192 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
193 dlog = newrevlog(destname, recreate=True) |
34291
1db9abf407c5
revlog: add revmap back to revlog.addgroup
Durham Goode <durham@fb.com>
parents:
34148
diff
changeset
|
194 dummydeltas = dummychangegroup().deltaiter() |
1db9abf407c5
revlog: add revmap back to revlog.addgroup
Durham Goode <durham@fb.com>
parents:
34148
diff
changeset
|
195 dlog.addgroup(dummydeltas, linkmap, tr) |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
196 return dlog |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
197 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
198 |
47150
8d3c2f9d4af7
revlog: use a "radix" to address revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47149
diff
changeset
|
199 def lowlevelcopy(rlog, tr, destname=b'_destrevlog'): |
45942
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
44452
diff
changeset
|
200 """Like addgroupcopy, but use the low level revlog._addrevision directly. |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
201 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
202 It exercises some code paths that are hard to reach easily otherwise. |
45942
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
44452
diff
changeset
|
203 """ |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
204 dlog = newrevlog(destname, recreate=True) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
205 for r in rlog: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
206 p1 = rlog.node(r - 1) |
47012
d55b71393907
node: replace nullid and friends with nodeconstants class
Joerg Sonnenberger <joerg@bec.de>
parents:
46711
diff
changeset
|
207 p2 = rlog.nullid |
36744
33275ab5e837
revlog: do not use delta for lfs revisions
Jun Wu <quark@fb.com>
parents:
35638
diff
changeset
|
208 if r == 0 or (rlog.flags(r) & revlog.REVIDX_EXTSTORED): |
42777
740450677221
rawdata: update callers in test-revlog-raw
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42732
diff
changeset
|
209 text = rlog.rawdata(r) |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
210 cachedelta = None |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
211 else: |
36744
33275ab5e837
revlog: do not use delta for lfs revisions
Jun Wu <quark@fb.com>
parents:
35638
diff
changeset
|
212 # deltaparent cannot have EXTSTORED flag. |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
213 deltaparent = max( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
214 [-1] |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
215 + [ |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
216 p |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
217 for p in range(r) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
218 if rlog.flags(p) & revlog.REVIDX_EXTSTORED == 0 |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
219 ] |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
220 ) |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
221 text = None |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
222 cachedelta = (deltaparent, rlog.revdiff(deltaparent, r)) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
223 flags = rlog.flags(r) |
47214
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
224 with dlog._writing(_NoTransaction()): |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
225 dlog._addrevision( |
47214
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
226 rlog.node(r), |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
227 text, |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
228 tr, |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
229 r, |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
230 p1, |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
231 p2, |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
232 flags, |
906a7bcaac86
revlog: introduce a mandatory `_writing` context to update revlog content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47150
diff
changeset
|
233 cachedelta, |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
234 ) |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
235 return dlog |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
236 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
237 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
238 # Utilities to generate revisions for testing |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
239 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
240 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
241 def genbits(n): |
45942
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
44452
diff
changeset
|
242 """Given a number n, generate (2 ** (n * 2) + 1) numbers in range(2 ** n). |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
243 i.e. the generated numbers have a width of n bits. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
244 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
245 The combination of two adjacent numbers will cover all possible cases. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
246 That is to say, given any x, y where both x, and y are in range(2 ** n), |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
247 there is an x followed immediately by y in the generated sequence. |
45942
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
44452
diff
changeset
|
248 """ |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
249 m = 2 ** n |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
250 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
251 # Gray Code. See https://en.wikipedia.org/wiki/Gray_code |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
252 gray = lambda x: x ^ (x >> 1) |
44452
9d2b2df2c2ba
cleanup: run pyupgrade on our source tree to clean up varying things
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
253 reversegray = {gray(i): i for i in range(m)} |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
254 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
255 # Generate (n * 2) bit gray code, yield lower n bits as X, and look for |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
256 # the next unused gray code where higher n bits equal to X. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
257 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
258 # For gray codes whose higher bits are X, a[X] of them have been used. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
259 a = [0] * m |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
260 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
261 # Iterate from 0. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
262 x = 0 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
263 yield x |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
264 for i in range(m * m): |
31763
8a0c47982ade
test-revlog-raw: fix "genbits" implementation
Jun Wu <quark@fb.com>
parents:
31748
diff
changeset
|
265 x = reversegray[x] |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
266 y = gray(a[x] + x * m) & (m - 1) |
31763
8a0c47982ade
test-revlog-raw: fix "genbits" implementation
Jun Wu <quark@fb.com>
parents:
31748
diff
changeset
|
267 assert a[x] < m |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
268 a[x] += 1 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
269 x = y |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
270 yield x |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
271 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
272 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
273 def gentext(rev): |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
274 '''Given a revision number, generate dummy text''' |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
275 return b''.join(b'%d\n' % j for j in range(-1, rev % 5)) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
276 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
277 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
278 def writecases(rlog, tr): |
45942
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
44452
diff
changeset
|
279 """Write some revisions interested to the test. |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
280 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
281 The test is interested in 3 properties of a revision: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
282 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
283 - Is it a delta or a full text? (isdelta) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
284 This is to catch some delta application issues. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
285 - Does it have a flag of EXTSTORED? (isext) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
286 This is to catch some flag processor issues. Especially when |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
287 interacted with revlog deltas. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
288 - Is its text empty? (isempty) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
289 This is less important. It is intended to try to catch some careless |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
290 checks like "if text" instead of "if text is None". Note: if flag |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
291 processor is involved, raw text may be not empty. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
292 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
293 Write 65 revisions. So that all combinations of the above flags for |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
294 adjacent revisions are covered. That is to say, |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
295 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
296 len(set( |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
297 (r.delta, r.ext, r.empty, (r+1).delta, (r+1).ext, (r+1).empty) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
298 for r in range(len(rlog) - 1) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
299 )) is 64. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
300 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
301 Where "r.delta", "r.ext", and "r.empty" are booleans matching properties |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
302 mentioned above. |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
303 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
304 Return expected [(text, rawtext)]. |
45942
89a2afe31e82
formating: upgrade to black 20.8b1
Augie Fackler <raf@durin42.com>
parents:
44452
diff
changeset
|
305 """ |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
306 result = [] |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
307 for i, x in enumerate(genbits(3)): |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
308 isdelta, isext, isempty = bool(x & 1), bool(x & 2), bool(x & 4) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
309 if isempty: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
310 text = b'' |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
311 else: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
312 text = gentext(i) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
313 rev = appendrev(rlog, text, tr, isext=isext, isdelta=isdelta) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
314 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
315 # Verify text, rawtext, and rawsize |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
316 if isext: |
46709
3d740058b467
sidedata: move to new sidedata storage in revlogv2
Raphaël Gomès <rgomes@octobus.net>
parents:
46113
diff
changeset
|
317 rawtext = writeprocessor(None, text)[0] |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
318 else: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
319 rawtext = text |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
320 if rlog.rawsize(rev) != len(rawtext): |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
321 abort('rev %d: wrong rawsize' % rev) |
48529
c514936d92b4
revlog: remove deprecated APIs
Raphaël Gomès <rgomes@octobus.net>
parents:
47214
diff
changeset
|
322 if rlog.revision(rev) != text: |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
323 abort('rev %d: wrong text' % rev) |
42777
740450677221
rawdata: update callers in test-revlog-raw
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42732
diff
changeset
|
324 if rlog.rawdata(rev) != rawtext: |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
325 abort('rev %d: wrong rawtext' % rev) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
326 result.append((text, rawtext)) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
327 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
328 # Verify flags like isdelta, isext work as expected |
36744
33275ab5e837
revlog: do not use delta for lfs revisions
Jun Wu <quark@fb.com>
parents:
35638
diff
changeset
|
329 # isdelta can be overridden to False if this or p1 has isext set |
33275ab5e837
revlog: do not use delta for lfs revisions
Jun Wu <quark@fb.com>
parents:
35638
diff
changeset
|
330 if bool(rlog.deltaparent(rev) > -1) and not isdelta: |
33275ab5e837
revlog: do not use delta for lfs revisions
Jun Wu <quark@fb.com>
parents:
35638
diff
changeset
|
331 abort('rev %d: isdelta is unexpected' % rev) |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
332 if bool(rlog.flags(rev)) != isext: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
333 abort('rev %d: isext is ineffective' % rev) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
334 return result |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
335 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
336 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
337 # Main test and checking |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
338 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
339 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
340 def checkrevlog(rlog, expected): |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
341 '''Check if revlog has expected contents. expected is [(text, rawtext)]''' |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
342 # Test using different access orders. This could expose some issues |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
343 # depending on revlog caching (see revlog._cache). |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
344 for r0 in range(len(rlog) - 1): |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
345 r1 = r0 + 1 |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
346 for revorder in [[r0, r1], [r1, r0]]: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
347 for raworder in [[True], [False], [True, False], [False, True]]: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
348 nlog = newrevlog() |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
349 for rev in revorder: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
350 for raw in raworder: |
42777
740450677221
rawdata: update callers in test-revlog-raw
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42732
diff
changeset
|
351 if raw: |
740450677221
rawdata: update callers in test-revlog-raw
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42732
diff
changeset
|
352 t = nlog.rawdata(rev) |
740450677221
rawdata: update callers in test-revlog-raw
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42732
diff
changeset
|
353 else: |
740450677221
rawdata: update callers in test-revlog-raw
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42732
diff
changeset
|
354 t = nlog.revision(rev) |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
355 if t != expected[rev][int(raw)]: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
356 abort( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
357 'rev %d: corrupted %stext' |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
358 % (rev, raw and 'raw' or '') |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
359 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
360 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
361 |
41034
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
362 slicingdata = [ |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
363 ([0, 1, 2, 3, 55, 56, 58, 59, 60], [[0, 1], [2], [58], [59, 60]], 10), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
364 ([0, 1, 2, 3, 55, 56, 58, 59, 60], [[0, 1], [2], [58], [59, 60]], 10), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
365 ( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
366 [-1, 0, 1, 2, 3, 55, 56, 58, 59, 60], |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
367 [[-1, 0, 1], [2], [58], [59, 60]], |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
368 10, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
369 ), |
41034
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
370 ] |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
371 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
372 |
41034
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
373 def slicingtest(rlog): |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
374 oldmin = rlog._srmingapsize |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
375 try: |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
376 # the test revlog is small, we remove the floor under which we |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
377 # slicing is diregarded. |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
378 rlog._srmingapsize = 0 |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
379 for item in slicingdata: |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
380 chain, expected, target = item |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
381 result = deltas.slicechunk(rlog, chain, targetsize=target) |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
382 result = list(result) |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
383 if result != expected: |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
384 print('slicing differ:') |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
385 print(' chain: %s' % chain) |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
386 print(' target: %s' % target) |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
387 print(' expected: %s' % expected) |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
388 print(' result: %s' % result) |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
389 finally: |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
390 rlog._srmingapsize = oldmin |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
391 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
392 |
41035
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
393 def md5sum(s): |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
394 return hashlib.md5(s).digest() |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
395 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
396 |
41035
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
397 def _maketext(*coord): |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
398 """create piece of text according to range of integers |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
399 |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
400 The test returned use a md5sum of the integer to make it less |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
401 compressible""" |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
402 pieces = [] |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
403 for start, size in coord: |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
404 num = range(start, start + size) |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
405 p = [md5sum(b'%d' % r) for r in num] |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
406 pieces.append(b'\n'.join(p)) |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
407 return b'\n'.join(pieces) + b'\n' |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
408 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
409 |
41035
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
410 data = [ |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
411 _maketext((0, 120), (456, 60)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
412 _maketext((0, 120), (345, 60)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
413 _maketext((0, 120), (734, 60)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
414 _maketext((0, 120), (734, 60), (923, 45)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
415 _maketext((0, 120), (734, 60), (234, 45)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
416 _maketext((0, 120), (734, 60), (564, 45)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
417 _maketext((0, 120), (734, 60), (361, 45)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
418 _maketext((0, 120), (734, 60), (489, 45)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
419 _maketext((0, 120), (123, 60)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
420 _maketext((0, 120), (145, 60)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
421 _maketext((0, 120), (104, 60)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
422 _maketext((0, 120), (430, 60)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
423 _maketext((0, 120), (430, 60), (923, 45)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
424 _maketext((0, 120), (430, 60), (234, 45)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
425 _maketext((0, 120), (430, 60), (564, 45)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
426 _maketext((0, 120), (430, 60), (361, 45)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
427 _maketext((0, 120), (430, 60), (489, 45)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
428 _maketext((0, 120), (249, 60)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
429 _maketext((0, 120), (832, 60)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
430 _maketext((0, 120), (891, 60)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
431 _maketext((0, 120), (543, 60)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
432 _maketext((0, 120), (120, 60)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
433 _maketext((0, 120), (60, 60), (768, 30)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
434 _maketext((0, 120), (60, 60), (260, 30)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
435 _maketext((0, 120), (60, 60), (450, 30)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
436 _maketext((0, 120), (60, 60), (361, 30)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
437 _maketext((0, 120), (60, 60), (886, 30)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
438 _maketext((0, 120), (60, 60), (116, 30)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
439 _maketext((0, 120), (60, 60), (567, 30), (629, 40)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
440 _maketext((0, 120), (60, 60), (569, 30), (745, 40)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
441 _maketext((0, 120), (60, 60), (777, 30), (700, 40)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
442 _maketext((0, 120), (60, 60), (618, 30), (398, 40), (158, 10)), |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
443 ] |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
444 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
445 |
41035
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
446 def makesnapshot(tr): |
47150
8d3c2f9d4af7
revlog: use a "radix" to address revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47149
diff
changeset
|
447 rl = newrevlog(name=b'_snaprevlog3', recreate=True) |
41035
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
448 for i in data: |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
449 appendrev(rl, i, tr) |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
450 return rl |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
451 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
452 |
41035
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
453 snapshots = [-1, 0, 6, 8, 11, 17, 19, 21, 25, 30] |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
454 |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
455 |
41035
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
456 def issnapshottest(rlog): |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
457 result = [] |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
458 if rlog.issnapshot(-1): |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
459 result.append(-1) |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
460 for rev in rlog: |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
461 if rlog.issnapshot(rev): |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
462 result.append(rev) |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
463 if snapshots != result: |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
464 print('snapshot differ:') |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
465 print(' expected: %s' % snapshots) |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
466 print(' got: %s' % result) |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
467 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
468 |
49679
b670eb3dd6c9
delta-find: use sets instead of list in the snapshot cache
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49678
diff
changeset
|
469 snapshotmapall = {0: {6, 8, 11, 17, 19, 25}, 8: {21}, -1: {0, 30}} |
b670eb3dd6c9
delta-find: use sets instead of list in the snapshot cache
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49678
diff
changeset
|
470 snapshotmap15 = {0: {17, 19, 25}, 8: {21}, -1: {30}} |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
471 |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
472 |
41087
797a416a91bd
revlog: add test case for _findsnapshots
Boris Feld <boris.feld@octobus.net>
parents:
41035
diff
changeset
|
473 def findsnapshottest(rlog): |
49678
efbbc2f9121e
delta-find: use a smarter object for snapshot caching
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49673
diff
changeset
|
474 cache = deltas.SnapshotCache() |
efbbc2f9121e
delta-find: use a smarter object for snapshot caching
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49673
diff
changeset
|
475 cache.update(rlog) |
efbbc2f9121e
delta-find: use a smarter object for snapshot caching
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49673
diff
changeset
|
476 resultall = dict(cache.snapshots) |
41087
797a416a91bd
revlog: add test case for _findsnapshots
Boris Feld <boris.feld@octobus.net>
parents:
41035
diff
changeset
|
477 if resultall != snapshotmapall: |
797a416a91bd
revlog: add test case for _findsnapshots
Boris Feld <boris.feld@octobus.net>
parents:
41035
diff
changeset
|
478 print('snapshot map differ:') |
797a416a91bd
revlog: add test case for _findsnapshots
Boris Feld <boris.feld@octobus.net>
parents:
41035
diff
changeset
|
479 print(' expected: %s' % snapshotmapall) |
797a416a91bd
revlog: add test case for _findsnapshots
Boris Feld <boris.feld@octobus.net>
parents:
41035
diff
changeset
|
480 print(' got: %s' % resultall) |
49678
efbbc2f9121e
delta-find: use a smarter object for snapshot caching
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49673
diff
changeset
|
481 cache15 = deltas.SnapshotCache() |
efbbc2f9121e
delta-find: use a smarter object for snapshot caching
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49673
diff
changeset
|
482 cache15.update(rlog, 15) |
efbbc2f9121e
delta-find: use a smarter object for snapshot caching
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49673
diff
changeset
|
483 result15 = dict(cache15.snapshots) |
41087
797a416a91bd
revlog: add test case for _findsnapshots
Boris Feld <boris.feld@octobus.net>
parents:
41035
diff
changeset
|
484 if result15 != snapshotmap15: |
797a416a91bd
revlog: add test case for _findsnapshots
Boris Feld <boris.feld@octobus.net>
parents:
41035
diff
changeset
|
485 print('snapshot map differ:') |
797a416a91bd
revlog: add test case for _findsnapshots
Boris Feld <boris.feld@octobus.net>
parents:
41035
diff
changeset
|
486 print(' expected: %s' % snapshotmap15) |
797a416a91bd
revlog: add test case for _findsnapshots
Boris Feld <boris.feld@octobus.net>
parents:
41035
diff
changeset
|
487 print(' got: %s' % result15) |
797a416a91bd
revlog: add test case for _findsnapshots
Boris Feld <boris.feld@octobus.net>
parents:
41035
diff
changeset
|
488 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
489 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
490 def maintest(): |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
491 with newtransaction() as tr: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
492 rl = newrevlog(recreate=True) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
493 expected = writecases(rl, tr) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
494 checkrevlog(rl, expected) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
495 print('local test passed') |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
496 # Copy via revlog.addgroup |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
497 rl1 = addgroupcopy(rl, tr) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
498 checkrevlog(rl1, expected) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
499 rl2 = addgroupcopy(rl, tr, optimaldelta=False) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
500 checkrevlog(rl2, expected) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
501 print('addgroupcopy test passed') |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
502 # Copy via revlog.clone |
47150
8d3c2f9d4af7
revlog: use a "radix" to address revlog
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47149
diff
changeset
|
503 rl3 = newrevlog(name=b'_destrevlog3', recreate=True) |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
504 rl.clone(tr, rl3) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
505 checkrevlog(rl3, expected) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
506 print('clone test passed') |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
507 # Copy via low-level revlog._addrevision |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
508 rl4 = lowlevelcopy(rl, tr) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
509 checkrevlog(rl4, expected) |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
510 print('lowlevelcopy test passed') |
41034
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
511 slicingtest(rl) |
cca12a31ede5
revlog: add some direct testing of the slicing logic
Boris Feld <boris.feld@octobus.net>
parents:
39232
diff
changeset
|
512 print('slicing test passed') |
41035
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
513 rl5 = makesnapshot(tr) |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
514 issnapshottest(rl5) |
15f78383d3c8
revlog: add an explicit test for `issnapshot`
Boris Feld <boris.feld@octobus.net>
parents:
41034
diff
changeset
|
515 print('issnapshot test passed') |
41087
797a416a91bd
revlog: add test case for _findsnapshots
Boris Feld <boris.feld@octobus.net>
parents:
41035
diff
changeset
|
516 findsnapshottest(rl5) |
797a416a91bd
revlog: add test case for _findsnapshots
Boris Feld <boris.feld@octobus.net>
parents:
41035
diff
changeset
|
517 print('findsnapshot test passed') |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
518 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42988
diff
changeset
|
519 |
31748
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
520 try: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
521 maintest() |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
522 except Exception as ex: |
985de02b5b9d
revlog: add a stronger test for raw processing
Jun Wu <quark@fb.com>
parents:
diff
changeset
|
523 abort('crashed: %s' % ex) |