| Alphare | |
| pulkit |
| hg-reviewers |
See inline documentation for details.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cext/parsers.c (11 lines) | |||
| M | mercurial/dirstatemap.py (6 lines) | |||
| M | mercurial/pure/parsers.py (8 lines) |
| return PyInt_FromLong(self->size); | return PyInt_FromLong(self->size); | ||||
| }; | }; | ||||
| static PyObject *dirstate_item_v1_mtime(dirstateItemObject *self) | static PyObject *dirstate_item_v1_mtime(dirstateItemObject *self) | ||||
| { | { | ||||
| return PyInt_FromLong(self->mtime); | return PyInt_FromLong(self->mtime); | ||||
| }; | }; | ||||
| static PyObject *dm_nonnormal(dirstateItemObject *self) | |||||
| { | |||||
| if (self->state != 'n' || self->mtime == ambiguous_time) { | |||||
| Py_RETURN_TRUE; | |||||
| } else { | |||||
| Py_RETURN_FALSE; | |||||
| } | |||||
| }; | |||||
| static PyObject *dirstate_item_need_delay(dirstateItemObject *self, | static PyObject *dirstate_item_need_delay(dirstateItemObject *self, | ||||
| PyObject *value) | PyObject *value) | ||||
| { | { | ||||
| long now; | long now; | ||||
| if (!pylong_to_long(value, &now)) { | if (!pylong_to_long(value, &now)) { | ||||
| return NULL; | return NULL; | ||||
| } | } | ||||
| if (self->state == 'n' && self->mtime == now) { | if (self->state == 'n' && self->mtime == now) { | ||||
| {"v1_mtime", (PyCFunction)dirstate_item_v1_mtime, METH_NOARGS, | {"v1_mtime", (PyCFunction)dirstate_item_v1_mtime, METH_NOARGS, | ||||
| "return a \"mtime\" suitable for v1 serialization"}, | "return a \"mtime\" suitable for v1 serialization"}, | ||||
| {"need_delay", (PyCFunction)dirstate_item_need_delay, METH_O, | {"need_delay", (PyCFunction)dirstate_item_need_delay, METH_O, | ||||
| "True if the stored mtime would be ambiguous with the current time"}, | "True if the stored mtime would be ambiguous with the current time"}, | ||||
| {"from_v1_data", (PyCFunction)dirstate_item_from_v1_meth, METH_O, | {"from_v1_data", (PyCFunction)dirstate_item_from_v1_meth, METH_O, | ||||
| "build a new DirstateItem object from V1 data"}, | "build a new DirstateItem object from V1 data"}, | ||||
| {"set_possibly_dirty", (PyCFunction)dirstate_item_set_possibly_dirty, | {"set_possibly_dirty", (PyCFunction)dirstate_item_set_possibly_dirty, | ||||
| METH_NOARGS, "mark a file as \"possibly dirty\""}, | METH_NOARGS, "mark a file as \"possibly dirty\""}, | ||||
| {"dm_nonnormal", (PyCFunction)dm_nonnormal, METH_NOARGS, | |||||
| "True is the entry is non-normal in the dirstatemap sense"}, | |||||
| {NULL} /* Sentinel */ | {NULL} /* Sentinel */ | ||||
| }; | }; | ||||
| static PyObject *dirstate_item_get_mode(dirstateItemObject *self) | static PyObject *dirstate_item_get_mode(dirstateItemObject *self) | ||||
| { | { | ||||
| return PyInt_FromLong(self->mode); | return PyInt_FromLong(self->mode); | ||||
| }; | }; | ||||
| assert mtime is not None | assert mtime is not None | ||||
| old_entry = self.get(f) | old_entry = self.get(f) | ||||
| if ( | if ( | ||||
| old_entry is None or old_entry.removed | old_entry is None or old_entry.removed | ||||
| ) and "_dirs" in self.__dict__: | ) and "_dirs" in self.__dict__: | ||||
| self._dirs.addpath(f) | self._dirs.addpath(f) | ||||
| if old_entry is None and "_alldirs" in self.__dict__: | if old_entry is None and "_alldirs" in self.__dict__: | ||||
| self._alldirs.addpath(f) | self._alldirs.addpath(f) | ||||
| self._map[f] = DirstateItem(state, mode, size, mtime) | e = self._map[f] = DirstateItem(state, mode, size, mtime) | ||||
| if state != b'n' or mtime == AMBIGUOUS_TIME: | if e.dm_nonnormal: | ||||
| self.nonnormalset.add(f) | self.nonnormalset.add(f) | ||||
| if size == FROM_P2: | if size == FROM_P2: | ||||
| self.otherparentset.add(f) | self.otherparentset.add(f) | ||||
| def removefile(self, f, in_merge=False): | def removefile(self, f, in_merge=False): | ||||
| """ | """ | ||||
| Mark a file as removed in the dirstate. | Mark a file as removed in the dirstate. | ||||
| def nonnormalentries(self): | def nonnormalentries(self): | ||||
| '''Compute the nonnormal dirstate entries from the dmap''' | '''Compute the nonnormal dirstate entries from the dmap''' | ||||
| try: | try: | ||||
| return parsers.nonnormalotherparententries(self._map) | return parsers.nonnormalotherparententries(self._map) | ||||
| except AttributeError: | except AttributeError: | ||||
| nonnorm = set() | nonnorm = set() | ||||
| otherparent = set() | otherparent = set() | ||||
| for fname, e in pycompat.iteritems(self._map): | for fname, e in pycompat.iteritems(self._map): | ||||
| if e.state != b'n' or e.mtime == AMBIGUOUS_TIME: | if e.dm_nonnormal: | ||||
| nonnorm.add(fname) | nonnorm.add(fname) | ||||
| if e.from_p2: | if e.from_p2: | ||||
| otherparent.add(fname) | otherparent.add(fname) | ||||
| return nonnorm, otherparent | return nonnorm, otherparent | ||||
| @propertycache | @propertycache | ||||
| def filefoldmap(self): | def filefoldmap(self): | ||||
| """Returns a dictionary mapping normalized case paths to their | """Returns a dictionary mapping normalized case paths to their | ||||
| def merged_removed(self): | def merged_removed(self): | ||||
| """True if the file has been removed, but was "merged" initially | """True if the file has been removed, but was "merged" initially | ||||
| This property seems like an abstraction leakage and should probably be | This property seems like an abstraction leakage and should probably be | ||||
| dealt in this class (or maybe the dirstatemap) directly. | dealt in this class (or maybe the dirstatemap) directly. | ||||
| """ | """ | ||||
| return self._state == b'r' and self._size == NONNORMAL | return self._state == b'r' and self._size == NONNORMAL | ||||
| @property | |||||
| def dm_nonnormal(self): | |||||
| """True is the entry is non-normal in the dirstatemap sense | |||||
| There is no reason for any code, but the dirstatemap one to use this. | |||||
| """ | |||||
| return self.state != b'n' or self.mtime == AMBIGUOUS_TIME | |||||
| def v1_state(self): | def v1_state(self): | ||||
| """return a "state" suitable for v1 serialization""" | """return a "state" suitable for v1 serialization""" | ||||
| return self._state | return self._state | ||||
| def v1_mode(self): | def v1_mode(self): | ||||
| """return a "mode" suitable for v1 serialization""" | """return a "mode" suitable for v1 serialization""" | ||||
| return self._mode | return self._mode | ||||