This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12414

dirstate-cext: properly invalidate mtime and data in `set_untracked`
ClosedPublic

Authored by Alphare on Mar 28 2022, 11:29 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9bb700223f00: dirstate-cext: properly invalidate mtime and data in `set_untracked`
Summary

This was forgotten about in the initial implementation and was revealed while
adding the dirstate-v2 variant of test-issue660.t. Neither the existing
Python implementation nor the upcoming Rust implementation suffer from this
bug since they respectively have None and Option<T> to represent the lack
of information.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Mar 28 2022, 11:29 AM

Pending CI refresh

Alphare added a commit: rHG9bb700223f00: dirstate-cext: properly invalidate mtime and data in `set_untracked`.Mar 28 2022, 12:05 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG9bb700223f00: dirstate-cext: properly invalidate mtime and data in `set_untracked` (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 32721.Mar 28 2022, 12:24 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/parsers.c (2 lines)

Diff 32720

mercurial/cext/parsers.c

self->flags |= dirstate_flag_wc_tracked; self->flags |= dirstate_flag_wc_tracked;
self->flags &= ~dirstate_flag_has_mtime; self->flags &= ~dirstate_flag_has_mtime;
Py_RETURN_NONE; Py_RETURN_NONE;
} }
static PyObject *dirstate_item_set_untracked(dirstateItemObject *self) static PyObject *dirstate_item_set_untracked(dirstateItemObject *self)
{ {
self->flags &= ~dirstate_flag_wc_tracked; self->flags &= ~dirstate_flag_wc_tracked;
self->flags &= ~dirstate_flag_has_meaningful_data;
self->flags &= ~dirstate_flag_has_mtime;
self->mode = 0; self->mode = 0;
self->size = 0; self->size = 0;
self->mtime_s = 0; self->mtime_s = 0;
self->mtime_ns = 0; self->mtime_ns = 0;
Py_RETURN_NONE; Py_RETURN_NONE;
} }
static PyObject *dirstate_item_drop_merge_data(dirstateItemObject *self) static PyObject *dirstate_item_drop_merge_data(dirstateItemObject *self)