ref-filter: add deltabase option
Add new formatting option: deltabase. If the object is stored as a delta on-disk, this expands to the 40-hex sha1 of the delta base object. Otherwise, expands to the null sha1 (40 zeroes). We have same option in cat-file command. Hopefully, in the end I will remove formatting code from cat-file and reuse formatting parts from ref-filter. Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Olga Telezhnaya committed
Dec 24, 2018 at 13:24 UTC
33311fa1ade8ca955f0e56e521f7d759d30a3da0
1 file changed
+15
-1
ref-filter.c
+15
-1
@@ -246,6 +246,18 @@ static int objectsize_atom_parser(const struct ref_format *format, struct used_a
246
return 0;
247
}
248
249
+static int deltabase_atom_parser(const struct ref_format *format, struct used_atom *atom,
250
+ const char *arg, struct strbuf *err)
251
+{
252
+ if (arg)
253
+ return strbuf_addf_ret(err, -1, _("%%(deltabase) does not take arguments"));
254
+ if (*atom->name == '*')
255
+ oi_deref.info.delta_base_sha1 = oi_deref.delta_base_oid.hash;
256
+ else
257
+ oi.info.delta_base_sha1 = oi.delta_base_oid.hash;
258
+ return 0;
259
+}
260
+
261
static int body_atom_parser(const struct ref_format *format, struct used_atom *atom,
262
const char *arg, struct strbuf *err)
263
{
@@ -437,6 +449,7 @@ static struct {
449
{ "objecttype", SOURCE_OTHER, FIELD_STR, objecttype_atom_parser },
450
{ "objectsize", SOURCE_OTHER, FIELD_ULONG, objectsize_atom_parser },
451
{ "objectname", SOURCE_OTHER, FIELD_STR, objectname_atom_parser },
452
+ { "deltabase", SOURCE_OTHER, FIELD_STR, deltabase_atom_parser },
453
{ "tree", SOURCE_OBJ },
454
{ "parent", SOURCE_OBJ },
455
{ "numparent", SOURCE_OBJ, FIELD_ULONG },
@@ -888,7 +901,8 @@ static void grab_common_values(struct atom_value *val, int deref, struct expand_
901
} else if (!strcmp(name, "objectsize")) {
902
v->value = oi->size;
903
v->s = xstrfmt("%lu", oi->size);
891
- }
904
+ } else if (!strcmp(name, "deltabase"))
905
+ v->s = xstrdup(oid_to_hex(&oi->delta_base_oid));
906
else if (deref)
907
grab_objectname(name, &oi->oid, v, &used_atom[i]);
908
}