Mercurial > hg-stable
diff mercurial/cext/parsers.c @ 47921:3853e6ee160d
dirstatemap: replace `removefile` by an explicit `entry.set_untracked()`
All the other caller goes through `reset_state`, so we can safely have an
explicit method on `DirstateItem` object.
This means that all the logic to preserve the previous state (from p2, merged,
etc) is now properly encapsulated within the DirstateItem. This pave the way to
using different storage for these information.
Differential Revision: https://phab.mercurial-scm.org/D11315
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Aug 2021 11:27:01 +0200 |
parents | e43128ee436f |
children | 37bffc450897 |
line wrap: on
line diff
--- a/mercurial/cext/parsers.c Fri Aug 20 11:23:52 2021 +0200 +++ b/mercurial/cext/parsers.c Fri Aug 20 11:27:01 2021 +0200 @@ -223,6 +223,21 @@ Py_RETURN_NONE; } +static PyObject *dirstate_item_set_untracked(dirstateItemObject *self) +{ + if (self->state == 'm') { + self->size = dirstate_v1_nonnormal; + } else if (self->state == 'n' && self->size == dirstate_v1_from_p2) { + self->size = dirstate_v1_from_p2; + } else { + self->size = 0; + } + self->state = 'r'; + self->mode = 0; + self->mtime = 0; + Py_RETURN_NONE; +} + static PyMethodDef dirstate_item_methods[] = { {"v1_state", (PyCFunction)dirstate_item_v1_state, METH_NOARGS, "return a \"state\" suitable for v1 serialization"}, @@ -238,6 +253,8 @@ "build a new DirstateItem object from V1 data"}, {"set_possibly_dirty", (PyCFunction)dirstate_item_set_possibly_dirty, METH_NOARGS, "mark a file as \"possibly dirty\""}, + {"set_untracked", (PyCFunction)dirstate_item_set_untracked, METH_NOARGS, + "mark a file as \"untracked\""}, {"dm_nonnormal", (PyCFunction)dm_nonnormal, METH_NOARGS, "True is the entry is non-normal in the dirstatemap sense"}, {"dm_otherparent", (PyCFunction)dm_otherparent, METH_NOARGS,