[PATCH v2 05/10] split-index.c: dump "link" extension as json
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
json-writer.c | 14 ++++++++++++++
json-writer.h | 3 +++
split-index.c | 9 ++++++++-
t/t3011-ls-files-json.sh | 14 ++++++++++++++
t/t3011/split-index (new) | 39 +++++++++++++++++++++++++++++++++++++++
5 files changed, 78 insertions(+), 1 deletion(-)
diff --git a/json-writer.c b/json-writer.c
index 0608726512..c0bd302e4e 100644
--- a/json-writer.c
+++ b/json-writer.c
@@ -1,4 +1,5 @@
#include "cache.h"
+#include "ewah/ewok.h"
#include "json-writer.h"
void jw_init(struct json_writer *jw)
@@ -224,6 +225,19 @@ void jw_object_stat_data(struct json_writer *jw, const char *name,
jw_end(jw);
}
+static void dump_ewah_one(size_t pos, void *jw)
+{
+ jw_array_intmax(jw, pos);
+}
+
+void jw_object_ewah(struct json_writer *jw, const char *key,
+ struct ewah_bitmap *ewah)
+{
+ jw_object_inline_begin_array(jw, key);
+ ewah_each_bit(ewah, dump_ewah_one, jw);
+ jw_end(jw);
+}
+
static void increase_indent(struct strbuf *sb,
const struct json_writer *jw,
int indent)
diff --git a/json-writer.h b/json-writer.h
index c3d0fbd1ef..07d841d52a 100644
--- a/json-writer.h
+++ b/json-writer.h
@@ -45,6 +45,7 @@
#include "git-compat-util.h"
#include "strbuf.h"
+struct ewah_bitmap;
struct stat_data;
struct json_writer
@@ -87,6 +88,8 @@ void jw_object_null(struct json_writer *jw, const char *key);
void jw_object_filemode(struct json_writer *jw, const char *key, mode_t value);
void jw_object_stat_data(struct json_writer *jw, const char *key,
const struct stat_data *sd);
+void jw_object_ewah(struct json_writer *jw, const char *key,
+ struct ewah_bitmap *ewah);
void jw_object_sub_jw(struct json_writer *jw, const char *key,
const struct json_writer *value);
diff --git a/split-index.c b/split-index.c
index e6154e4ea9..41552bf771 100644
--- a/split-index.c
+++ b/split-index.c
@@ -1,4 +1,5 @@
#include "cache.h"
+#include "json-writer.h"
#include "split-index.h"
#include "ewah/ewok.h"
@@ -25,7 +26,7 @@ int read_link_extension(struct index_state *istate,
data += the_hash_algo->rawsz;
sz -= the_hash_algo->rawsz;
if (!sz)
- return 0;
+ goto done;
si->delete_bitmap = ewah_new();
ret = ewah_read_mmap(si->delete_bitmap, data, sz);
if (ret < 0)
@@ -38,6 +39,12 @@ int read_link_extension(struct index_state *istate,
return error("corrupt replace bitmap in link extension");
if (ret != sz)
return error("garbage at the end of link extension");
+done:
+ if (istate->jw) {
+ jw_object_string(istate->jw, "oid", oid_to_hex(&si->base_oid));
+ jw_object_ewah(istate->jw, "delete_bitmap", si->delete_bitmap);
+ jw_object_ewah(istate->jw, "replace_bitmap", si->replace_bitmap);
+ }
return 0;
}
diff --git a/t/t3011-ls-files-json.sh b/t/t3011-ls-files-json.sh
index 082fe8e966..dbb572ce9d 100755
--- a/t/t3011-ls-files-json.sh
+++ b/t/t3011-ls-files-json.sh
@@ -44,4 +44,18 @@ test_expect_success 'ls-files --json, main entries, UNTR and TREE' '
compare_json basic
'
+test_expect_success 'ls-files --json, split index' '
+ git init split &&
+ (
+ cd split &&
+ echo one >one &&
+ git add one &&
+ git update-index --split-index &&
+ echo updated >>one &&
+ test_must_fail git -c splitIndex.maxPercentChange=100 update-index --refresh &&
+ cp ../filter.sed . &&
+ compare_json split-index
+ )
+'
+
test_done
diff --git a/t/t3011/split-index b/t/t3011/split-index
new file mode 100644
index 0000000000..cdcc4ddded
--- /dev/null
+++ b/t/t3011/split-index
@@ -0,0 +1,39 @@
+{
+ "version": 2,
+ "oid": <string>,
+ "mtime_sec": <number>,
+ "mtime_nsec": <number>,
+ "entries": [
+ {
+ "id": 0,
+ "name": "",
+ "mode": "100644",
+ "flags": 0,
+ "oid": <string>,
+ "stat": {
+ "ctime_sec": <number>,
+ "ctime_nsec": <number>,
+ "mtime_sec": <number>,
+ "mtime_nsec": <number>,
+ "device": <number>,
+ "inode": <number>,
+ "uid": <number>,
+ "gid": <number>,
+ "size": 4
+ },
+ "file_offset": <number>
+ }
+ ],
+ "extensions": {
+ "link": {
+ "file_offset": <number>,
+ "ext_size": <number>,
+ "oid": <string>,
+ "delete_bitmap": [
+ ],
+ "replace_bitmap": [
+ 0
+ ]
+ }
+ }
+}
--
2.22.0.rc0.322.g2b0371e29a
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>