This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11464

dirstate: Remove the `state == ' '` special case
ClosedPublic

Authored by SimonSapin on Sep 20 2021, 6:17 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG631f6b445a77: dirstate: Remove the `state == ' '` special case
Summary

Previously this was used to create a DirstateItem representing dirstate tree
nodes that semantically don’t have an associated DirtateItem.
This isn’t used anymore now that dirstatemap.debug_iter yields plain tuples.

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

SimonSapin created this revision.Sep 20 2021, 6:17 PM
Alphare accepted this revision.Sep 22 2021, 4:08 AM
This revision is now accepted and ready to land.Sep 22 2021, 4:08 AM
SimonSapin added a commit: rHG631f6b445a77: dirstate: Remove the `state == ' '` special case.Sep 22 2021, 4:55 AM
Closed by commit rHG631f6b445a77: dirstate: Remove the `state == ' '` special case (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30376

mercurial/cext/parsers.c

if (!dirstate_item_c_removed(self)) { if (!dirstate_item_c_removed(self)) {
return false; return false;
} }
return (self->flags & dirstate_flag_clean_p2); return (self->flags & dirstate_flag_clean_p2);
} }
static inline char dirstate_item_c_v1_state(dirstateItemObject *self) static inline char dirstate_item_c_v1_state(dirstateItemObject *self)
{ {
if (self->flags & dirstate_flag_rust_special) { if (dirstate_item_c_removed(self)) {
return ' ';
} else if (dirstate_item_c_removed(self)) {
return 'r'; return 'r';
} else if (dirstate_item_c_merged(self)) { } else if (dirstate_item_c_merged(self)) {
return 'm'; return 'm';
} else if (dirstate_item_c_added(self)) { } else if (dirstate_item_c_added(self)) {
return 'a'; return 'a';
} else { } else {
return 'n'; return 'n';
} }
} }
static inline int dirstate_item_c_v1_mode(dirstateItemObject *self) static inline int dirstate_item_c_v1_mode(dirstateItemObject *self)
{ {
return self->mode; return self->mode;
} }
static inline int dirstate_item_c_v1_size(dirstateItemObject *self) static inline int dirstate_item_c_v1_size(dirstateItemObject *self)
{ {
if (self->flags & dirstate_flag_rust_special) { if (dirstate_item_c_merged_removed(self)) {
return self->size;
} else if (dirstate_item_c_merged_removed(self)) {
return dirstate_v1_nonnormal; return dirstate_v1_nonnormal;
} else if (dirstate_item_c_from_p2_removed(self)) { } else if (dirstate_item_c_from_p2_removed(self)) {
return dirstate_v1_from_p2; return dirstate_v1_from_p2;
} else if (dirstate_item_c_removed(self)) { } else if (dirstate_item_c_removed(self)) {
return 0; return 0;
} else if (dirstate_item_c_merged(self)) { } else if (dirstate_item_c_merged(self)) {
return dirstate_v1_from_p2; return dirstate_v1_from_p2;
} else if (dirstate_item_c_added(self)) { } else if (dirstate_item_c_added(self)) {
return dirstate_v1_nonnormal; return dirstate_v1_nonnormal;
} else if (dirstate_item_c_from_p2(self)) { } else if (dirstate_item_c_from_p2(self)) {
return dirstate_v1_from_p2; return dirstate_v1_from_p2;
} else if (self->flags & dirstate_flag_possibly_dirty) { } else if (self->flags & dirstate_flag_possibly_dirty) {
return self->size; /* NON NORMAL ? */ return self->size; /* NON NORMAL ? */
} else { } else {
return self->size; return self->size;
} }
} }
static inline int dirstate_item_c_v1_mtime(dirstateItemObject *self) static inline int dirstate_item_c_v1_mtime(dirstateItemObject *self)
{ {
if (self->flags & dirstate_flag_rust_special) { if (dirstate_item_c_removed(self)) {
return self->mtime;
} else if (dirstate_item_c_removed(self)) {
return 0; return 0;
} else if (self->flags & dirstate_flag_possibly_dirty) { } else if (self->flags & dirstate_flag_possibly_dirty) {
return ambiguous_time; return ambiguous_time;
} else if (dirstate_item_c_merged(self)) { } else if (dirstate_item_c_merged(self)) {
return ambiguous_time; return ambiguous_time;
} else if (dirstate_item_c_added(self)) { } else if (dirstate_item_c_added(self)) {
return ambiguous_time; return ambiguous_time;
} else if (dirstate_item_c_from_p2(self)) { } else if (dirstate_item_c_from_p2(self)) {
t->mtime = 0; t->mtime = 0;
} else { } else {
t->flags = (dirstate_flag_wc_tracked | t->flags = (dirstate_flag_wc_tracked |
dirstate_flag_p1_tracked); dirstate_flag_p1_tracked);
t->mode = mode; t->mode = mode;
t->size = size; t->size = size;
t->mtime = mtime; t->mtime = mtime;
} }
} else if (state == ' ') {
/* XXX Rust is using this special case, it should be clean up
* later. */
t->flags = dirstate_flag_rust_special;
t->mode = mode;
t->size = size;
t->mtime = mtime;
} else { } else {
PyErr_Format(PyExc_RuntimeError, PyErr_Format(PyExc_RuntimeError,
"unknown state: `%c` (%d, %d, %d)", state, mode, "unknown state: `%c` (%d, %d, %d)", state, mode,
size, mtime, NULL); size, mtime, NULL);
return NULL; return NULL;
} }
return t; return t;

mercurial/cext/util.h

static const unsigned char dirstate_flag_wc_tracked = 1; static const unsigned char dirstate_flag_wc_tracked = 1;
static const unsigned char dirstate_flag_p1_tracked = 1 << 1; static const unsigned char dirstate_flag_p1_tracked = 1 << 1;
static const unsigned char dirstate_flag_p2_tracked = 1 << 2; static const unsigned char dirstate_flag_p2_tracked = 1 << 2;
static const unsigned char dirstate_flag_possibly_dirty = 1 << 3; static const unsigned char dirstate_flag_possibly_dirty = 1 << 3;
static const unsigned char dirstate_flag_merged = 1 << 4; static const unsigned char dirstate_flag_merged = 1 << 4;
static const unsigned char dirstate_flag_clean_p1 = 1 << 5; static const unsigned char dirstate_flag_clean_p1 = 1 << 5;
static const unsigned char dirstate_flag_clean_p2 = 1 << 6; static const unsigned char dirstate_flag_clean_p2 = 1 << 6;
static const unsigned char dirstate_flag_rust_special = 1 << 7;
extern PyTypeObject dirstateItemType; extern PyTypeObject dirstateItemType;
#define dirstate_tuple_check(op) (Py_TYPE(op) == &dirstateItemType) #define dirstate_tuple_check(op) (Py_TYPE(op) == &dirstateItemType)
#ifndef MIN #ifndef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b)) #define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif #endif
/* VC9 doesn't include bool and lacks stdbool.h based on my searching */ /* VC9 doesn't include bool and lacks stdbool.h based on my searching */

rust/hg-cpython/src/dirstate.rs

pub fn make_dirstate_item( pub fn make_dirstate_item(
py: Python, py: Python,
entry: &DirstateEntry, entry: &DirstateEntry,
) -> PyResult<PyObject> { ) -> PyResult<PyObject> {
// Explicitly go through u8 first, then cast to platform-specific `c_char` // Explicitly go through u8 first, then cast to platform-specific `c_char`
// because Into<u8> has a specific implementation while `as c_char` would // because Into<u8> has a specific implementation while `as c_char` would
// just do a naive enum cast. // just do a naive enum cast.
let state_code: u8 = entry.state().into(); let state_code: u8 = entry.state().into();
make_dirstate_item_raw(
py,
state_code,
entry.mode(),
entry.size(),
entry.mtime(),
)
}
pub fn make_dirstate_item_raw(
py: Python,
state: u8,
mode: i32,
size: i32,
mtime: i32,
) -> PyResult<PyObject> {
let make = make_dirstate_item_capi::retrieve(py)?; let make = make_dirstate_item_capi::retrieve(py)?;
let maybe_obj = unsafe { let maybe_obj = unsafe {
let ptr = make(state as c_char, mode, size, mtime); let ptr = make(
state_code as c_char,
entry.mode(),
entry.size(),
entry.mtime(),
);
PyObject::from_owned_ptr_opt(py, ptr) PyObject::from_owned_ptr_opt(py, ptr)
}; };
maybe_obj.ok_or_else(|| PyErr::fetch(py)) maybe_obj.ok_or_else(|| PyErr::fetch(py))
} }
/// Create the module, with `__package__` given from parent /// Create the module, with `__package__` given from parent
pub fn init_module(py: Python, package: &str) -> PyResult<PyModule> { pub fn init_module(py: Python, package: &str) -> PyResult<PyModule> {
let dotted_name = &format!("{}.dirstate", package); let dotted_name = &format!("{}.dirstate", package);