| Alphare |
| hg-reviewers |
This will allow for cleaner check than assuming each version has a different
size. Unsurprisingly I am planning to use this to introduce more format variant.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cext/revlog.c (9 lines) |
| nodetree nt; /* base-16 trie */ | nodetree nt; /* base-16 trie */ | ||||
| int ntinitialized; /* 0 or 1 */ | int ntinitialized; /* 0 or 1 */ | ||||
| int ntrev; /* last rev scanned */ | int ntrev; /* last rev scanned */ | ||||
| int ntlookups; /* # lookups */ | int ntlookups; /* # lookups */ | ||||
| int ntmisses; /* # lookups that miss the cache */ | int ntmisses; /* # lookups that miss the cache */ | ||||
| int inlined; | int inlined; | ||||
| long entry_size; /* size of index headers. Differs in v1 v.s. v2 format | long entry_size; /* size of index headers. Differs in v1 v.s. v2 format | ||||
| */ | */ | ||||
| char format_version; /* size of index headers. Differs in v1 v.s. v2 | |||||
| format */ | |||||
| }; | }; | ||||
| static Py_ssize_t index_length(const indexObject *self) | static Py_ssize_t index_length(const indexObject *self) | ||||
| { | { | ||||
| return self->length + self->new_length; | return self->length + self->new_length; | ||||
| } | } | ||||
| static const char nullid[32] = {0}; | static const char nullid[32] = {0}; | ||||
| #endif | #endif | ||||
| /* A RevlogNG v1 index entry is 64 bytes long. */ | /* A RevlogNG v1 index entry is 64 bytes long. */ | ||||
| static const long v1_entry_size = 64; | static const long v1_entry_size = 64; | ||||
| /* A Revlogv2 index entry is 96 bytes long. */ | /* A Revlogv2 index entry is 96 bytes long. */ | ||||
| static const long v2_entry_size = 96; | static const long v2_entry_size = 96; | ||||
| static const long format_v1 = 1; /* Internal only, could be any number */ | |||||
| static const long format_v2 = 2; /* Internal only, could be any number */ | |||||
| static void raise_revlog_error(void) | static void raise_revlog_error(void) | ||||
| { | { | ||||
| PyObject *mod = NULL, *dict = NULL, *errclass = NULL; | PyObject *mod = NULL, *dict = NULL, *errclass = NULL; | ||||
| mod = PyImport_ImportModule("mercurial.error"); | mod = PyImport_ImportModule("mercurial.error"); | ||||
| if (mod == NULL) { | if (mod == NULL) { | ||||
| goto cleanup; | goto cleanup; | ||||
| } | } | ||||
| return -1; | return -1; | ||||
| } | } | ||||
| if (self->nodelen < 20 || self->nodelen > (Py_ssize_t)sizeof(nullid)) { | if (self->nodelen < 20 || self->nodelen > (Py_ssize_t)sizeof(nullid)) { | ||||
| PyErr_SetString(PyExc_RuntimeError, "unsupported node size"); | PyErr_SetString(PyExc_RuntimeError, "unsupported node size"); | ||||
| return -1; | return -1; | ||||
| } | } | ||||
| if (revlogv2 && PyObject_IsTrue(revlogv2)) { | if (revlogv2 && PyObject_IsTrue(revlogv2)) { | ||||
| self->format_version = format_v2; | |||||
| self->entry_size = v2_entry_size; | self->entry_size = v2_entry_size; | ||||
| } else { | } else { | ||||
| self->format_version = format_v1; | |||||
| self->entry_size = v1_entry_size; | self->entry_size = v1_entry_size; | ||||
| } | } | ||||
| if (self->entry_size == v1_entry_size) { | if (self->format_version == format_v1) { | ||||
| self->nullentry = | self->nullentry = | ||||
| Py_BuildValue(PY23("iiiiiiis#", "iiiiiiiy#"), 0, 0, 0, -1, | Py_BuildValue(PY23("iiiiiiis#", "iiiiiiiy#"), 0, 0, 0, -1, | ||||
| -1, -1, -1, nullid, self->nodelen); | -1, -1, -1, nullid, self->nodelen); | ||||
| } else { | } else { | ||||
| self->nullentry = | self->nullentry = | ||||
| Py_BuildValue(PY23("iiiiiiis#ii", "iiiiiiiy#ii"), 0, 0, 0, | Py_BuildValue(PY23("iiiiiiis#ii", "iiiiiiiy#ii"), 0, 0, 0, | ||||
| -1, -1, -1, -1, nullid, self->nodelen, 0, 0); | -1, -1, -1, -1, nullid, self->nodelen, 0, 0); | ||||
| } | } | ||||