Mercurial > hg
view mercurial/cffi/osutilbuild.py @ 45214:6063c1857d0a stable
exchange: backout changeset c26335fa4225
Changeset c26335fa4225 has good intends but introduce significant behavior
regressions for multiple important cases. In short there are many case where
push would have caught instability creation/propagation that are no longer
covered. These behavior have been covered for many years and even if some
related case are not currently caught, the covered one should not be regressed.
The next four changesets introduce tests for some of these cases. However we
could produce many more tests cases since the area is wide and they are many
possible combination. (And we should cover them when getting back to this issue)
Since 5.5 is one week away, the most reasonable approach seems to back this out
while we devise a new way to move forward that preserve the current behavior,
catch more issues and also improves the situation that c26335fa4225 target.
In addition to the behavior change, c26335fa4225 also introduced output
changes. These output changes does not requires a backout per-se, but are part of
the same changeset. However they come with a couple of issues that also requires
attention:
1) the bulk of the error message have been shoehorned into a multiple line abort
message. This seems quite different from what we usually do. The abort message
should be a compact and efficient message, with extra details being issued as
normal error output beforehand. (with --verbose/--quiet) support.
2) the current output is unbounded, so if there is many (tens, hundreds,
thousands, …) of unstable/obsolete changeset involved in the push, the output
can quickly become a scary and un-usuable wall of text. So we need some
limitation here (same as we have with the remote head list that says A, B , C
and # others).
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 23 Jul 2020 16:57:56 +0200 |
parents | 53607fd3ec6c |
children | 6000f5b25c9b |
line wrap: on
line source
from __future__ import absolute_import import cffi ffi = cffi.FFI() ffi.set_source( "mercurial.cffi._osutil", """ #include <sys/attr.h> #include <sys/vnode.h> #include <unistd.h> #include <fcntl.h> #include <time.h> typedef struct val_attrs { uint32_t length; attribute_set_t returned; attrreference_t name_info; fsobj_type_t obj_type; struct timespec mtime; uint32_t accessmask; off_t datalength; } __attribute__((aligned(4), packed)) val_attrs_t; """, include_dirs=['mercurial'], ) ffi.cdef( ''' typedef uint32_t attrgroup_t; typedef struct attrlist { uint16_t bitmapcount; /* number of attr. bit sets in list */ uint16_t reserved; /* (to maintain 4-byte alignment) */ attrgroup_t commonattr; /* common attribute group */ attrgroup_t volattr; /* volume attribute group */ attrgroup_t dirattr; /* directory attribute group */ attrgroup_t fileattr; /* file attribute group */ attrgroup_t forkattr; /* fork attribute group */ ...; }; typedef struct attribute_set { ...; } attribute_set_t; typedef struct attrreference { int attr_dataoffset; int attr_length; ...; } attrreference_t; typedef int ... off_t; typedef struct val_attrs { uint32_t length; attribute_set_t returned; attrreference_t name_info; uint32_t obj_type; struct timespec mtime; uint32_t accessmask; off_t datalength; ...; } val_attrs_t; /* the exact layout of the above struct will be figured out during build time */ typedef int ... time_t; typedef struct timespec { time_t tv_sec; ...; }; int getattrlist(const char* path, struct attrlist * attrList, void * attrBuf, size_t attrBufSize, unsigned int options); int getattrlistbulk(int dirfd, struct attrlist * attrList, void * attrBuf, size_t attrBufSize, uint64_t options); #define ATTR_BIT_MAP_COUNT ... #define ATTR_CMN_NAME ... #define ATTR_CMN_OBJTYPE ... #define ATTR_CMN_MODTIME ... #define ATTR_CMN_ACCESSMASK ... #define ATTR_CMN_ERROR ... #define ATTR_CMN_RETURNED_ATTRS ... #define ATTR_FILE_DATALENGTH ... #define VREG ... #define VDIR ... #define VLNK ... #define VBLK ... #define VCHR ... #define VFIFO ... #define VSOCK ... #define S_IFMT ... int open(const char *path, int oflag, int perm); int close(int); #define O_RDONLY ... ''' ) if __name__ == '__main__': ffi.compile()