Show More
@@ -1,5 +1,9 | |||||
1 | from __future__ import annotations |
|
1 | from __future__ import annotations | |
2 |
|
2 | |||
|
3 | from typing import ( | |||
|
4 | Iterator, | |||
|
5 | ) | |||
|
6 | ||||
3 | from mercurial.i18n import _ |
|
7 | from mercurial.i18n import _ | |
4 |
|
8 | |||
5 | from mercurial.node import ( |
|
9 | from mercurial.node import ( | |
@@ -34,7 +38,7 class baselog: # revlog.revlog): | |||||
34 | self.gitrepo = gr |
|
38 | self.gitrepo = gr | |
35 | self._db = db |
|
39 | self._db = db | |
36 |
|
40 | |||
37 | def __len__(self): |
|
41 | def __len__(self) -> int: | |
38 | return int( |
|
42 | return int( | |
39 | self._db.execute('SELECT COUNT(*) FROM changelog').fetchone()[0] |
|
43 | self._db.execute('SELECT COUNT(*) FROM changelog').fetchone()[0] | |
40 | ) |
|
44 | ) | |
@@ -500,7 +504,7 class filelog(baselog): | |||||
500 | assert not meta # Should we even try to handle this? |
|
504 | assert not meta # Should we even try to handle this? | |
501 | return self.gitrepo.create_blob(text).raw |
|
505 | return self.gitrepo.create_blob(text).raw | |
502 |
|
506 | |||
503 | def __iter__(self): |
|
507 | def __iter__(self) -> Iterator[int]: | |
504 | for clrev in self._db.execute( |
|
508 | for clrev in self._db.execute( | |
505 | ''' |
|
509 | ''' | |
506 | SELECT rev FROM changelog |
|
510 | SELECT rev FROM changelog |
@@ -52,6 +52,8 import typing | |||||
52 | import zlib |
|
52 | import zlib | |
53 |
|
53 | |||
54 | from typing import ( |
|
54 | from typing import ( | |
|
55 | Iterable, | |||
|
56 | Iterator, | |||
55 | Optional, |
|
57 | Optional, | |
56 | ) |
|
58 | ) | |
57 |
|
59 | |||
@@ -402,10 +404,10 class sqlitefilestore: | |||||
402 |
|
404 | |||
403 | # Start of ifileindex interface. |
|
405 | # Start of ifileindex interface. | |
404 |
|
406 | |||
405 | def __len__(self): |
|
407 | def __len__(self) -> int: | |
406 | return len(self._revisions) |
|
408 | return len(self._revisions) | |
407 |
|
409 | |||
408 | def __iter__(self): |
|
410 | def __iter__(self) -> Iterator[int]: | |
409 | return iter(range(len(self._revisions))) |
|
411 | return iter(range(len(self._revisions))) | |
410 |
|
412 | |||
411 | def hasnode(self, node): |
|
413 | def hasnode(self, node): | |
@@ -986,7 +988,7 class sqlitefilestore: | |||||
986 |
|
988 | |||
987 | return d |
|
989 | return d | |
988 |
|
990 | |||
989 | def verifyintegrity(self, state): |
|
991 | def verifyintegrity(self, state) -> Iterable[repository.iverifyproblem]: | |
990 | state[b'skipread'] = set() |
|
992 | state[b'skipread'] = set() | |
991 |
|
993 | |||
992 | for rev in self: |
|
994 | for rev in self: |
@@ -15,6 +15,8 from typing import ( | |||||
15 | Any, |
|
15 | Any, | |
16 | Callable, |
|
16 | Callable, | |
17 | Collection, |
|
17 | Collection, | |
|
18 | Iterable, | |||
|
19 | Iterator, | |||
18 | Mapping, |
|
20 | Mapping, | |
19 | Protocol, |
|
21 | Protocol, | |
20 | ) |
|
22 | ) | |
@@ -608,10 +610,10 class ifileindex(Protocol): | |||||
608 | nullid: bytes |
|
610 | nullid: bytes | |
609 | """node for the null revision for use as delta base.""" |
|
611 | """node for the null revision for use as delta base.""" | |
610 |
|
612 | |||
611 | def __len__(self): |
|
613 | def __len__(self) -> int: | |
612 | """Obtain the number of revisions stored for this file.""" |
|
614 | """Obtain the number of revisions stored for this file.""" | |
613 |
|
615 | |||
614 | def __iter__(self): |
|
616 | def __iter__(self) -> Iterator[int]: | |
615 | """Iterate over revision numbers for this file.""" |
|
617 | """Iterate over revision numbers for this file.""" | |
616 |
|
618 | |||
617 | def hasnode(self, node): |
|
619 | def hasnode(self, node): | |
@@ -967,7 +969,7 class ifilestorage(ifileindex, ifiledata | |||||
967 | callers are expected to handle this special value. |
|
969 | callers are expected to handle this special value. | |
968 | """ |
|
970 | """ | |
969 |
|
971 | |||
970 | def verifyintegrity(self, state): |
|
972 | def verifyintegrity(self, state) -> Iterable[iverifyproblem]: | |
971 | """Verifies the integrity of file storage. |
|
973 | """Verifies the integrity of file storage. | |
972 |
|
974 | |||
973 | ``state`` is a dict holding state of the verifier process. It can be |
|
975 | ``state`` is a dict holding state of the verifier process. It can be |
@@ -14,6 +14,8 | |||||
14 | import stat |
|
14 | import stat | |
15 |
|
15 | |||
16 | from typing import ( |
|
16 | from typing import ( | |
|
17 | Iterable, | |||
|
18 | Iterator, | |||
17 | Optional, |
|
19 | Optional, | |
18 | ) |
|
20 | ) | |
19 |
|
21 | |||
@@ -164,10 +166,10 class filestorage: | |||||
164 |
|
166 | |||
165 | self._index.append((0, 0, 0, -1, -1, -1, -1, self._repo.nullid)) |
|
167 | self._index.append((0, 0, 0, -1, -1, -1, -1, self._repo.nullid)) | |
166 |
|
168 | |||
167 | def __len__(self): |
|
169 | def __len__(self) -> int: | |
168 | return len(self._indexdata) |
|
170 | return len(self._indexdata) | |
169 |
|
171 | |||
170 | def __iter__(self): |
|
172 | def __iter__(self) -> Iterator[int]: | |
171 | return iter(range(len(self))) |
|
173 | return iter(range(len(self))) | |
172 |
|
174 | |||
173 | def revs(self, start=0, stop=None): |
|
175 | def revs(self, start=0, stop=None): | |
@@ -431,7 +433,7 class filestorage: | |||||
431 | 'storedsize': None, |
|
433 | 'storedsize': None, | |
432 | } |
|
434 | } | |
433 |
|
435 | |||
434 | def verifyintegrity(self, state): |
|
436 | def verifyintegrity(self, state) -> Iterable[repository.iverifyproblem]: | |
435 | state['skipread'] = set() |
|
437 | state['skipread'] = set() | |
436 | for rev in self: |
|
438 | for rev in self: | |
437 | node = self.node(rev) |
|
439 | node = self.node(rev) |
General Comments 0
You need to be logged in to leave comments.
Login now