[PATCH 0/6] various: remove dead code

[PATCH 0/6] various: remove dead code

[Ævar Arnfjörð Bjarmason]

Remove various bits of dead code. These are unrelated things that I've
spotted here & there recently. Submitted now to clear out this batch
of dead code removal before it gets any larger.

Ævar Arnfjörð Bjarmason (6):
  xdiff/xmacros.h: remove unused XDL_PTRFREE
  pack-bitmap-write: remove unused bitmap_reset() function
  object-store.h: remove unused has_sha1_file*()
  alloc.[ch]: remove alloc_report() function
  strbuf: remove unused istarts_with() function
  json-writer.[ch]: remove unused formatting functions

 alloc.c                                       | 19 ---------------
 alloc.h                                       |  1 -
 .../coccinelle/the_repository.pending.cocci   | 15 ------------
 ewah/bitmap.c                                 |  5 ----
 ewah/ewok.h                                   |  1 -
 git-compat-util.h                             |  1 -
 json-writer.c                                 | 24 -------------------
 json-writer.h                                 |  3 ---
 object-store.h                                |  4 ----
 strbuf.c                                      |  9 -------
 xdiff/xmacros.h                               |  1 -
 11 files changed, 83 deletions(-)

-- 
2.34.0.817.gb03b3d32691

[PATCH 1/6] xdiff/xmacros.h: remove unused XDL_PTRFREE

[Ævar Arnfjörð Bjarmason]

This macro was added in 3443546f6ef (Use a *real* built-in diff
generator, 2006-03-24), but none of the xdiff code uses it, it uses
xdl_free() directly.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 xdiff/xmacros.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xdiff/xmacros.h b/xdiff/xmacros.h
index 2809a28ca96..ae4636c2477 100644
--- a/xdiff/xmacros.h
+++ b/xdiff/xmacros.h
@@ -34,7 +34,6 @@
 #define XDL_ADDBITS(v,b)	((v) + ((v) >> (b)))
 #define XDL_MASKBITS(b)		((1UL << (b)) - 1)
 #define XDL_HASHLONG(v,b)	(XDL_ADDBITS((unsigned long)(v), b) & XDL_MASKBITS(b))
-#define XDL_PTRFREE(p) do { if (p) { xdl_free(p); (p) = NULL; } } while (0)
 #define XDL_LE32_PUT(p, v) \
 do { \
 	unsigned char *__p = (unsigned char *) (p); \
-- 
2.34.0.817.gb03b3d32691

[PATCH 2/6] pack-bitmap-write: remove unused bitmap_reset() function

[Ævar Arnfjörð Bjarmason]

This function hasn't been used since 449fa5ee069 (pack-bitmap-write:
ignore BITMAP_FLAG_REUSE, 2020-12-08), which was a cleanup commit
intending to get rid of the code around the resetting of bitmaps.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 ewah/bitmap.c | 5 -----
 ewah/ewok.h   | 1 -
 2 files changed, 6 deletions(-)

diff --git a/ewah/bitmap.c b/ewah/bitmap.c
index 38a47c44db4..87d5cc8fa30 100644
--- a/ewah/bitmap.c
+++ b/ewah/bitmap.c
@@ -216,11 +216,6 @@ int bitmap_is_subset(struct bitmap *self, struct bitmap *other)
 	return 0;
 }
 
-void bitmap_reset(struct bitmap *bitmap)
-{
-	memset(bitmap->words, 0x0, bitmap->word_alloc * sizeof(eword_t));
-}
-
 void bitmap_free(struct bitmap *bitmap)
 {
 	if (bitmap == NULL)
diff --git a/ewah/ewok.h b/ewah/ewok.h
index 66920965da1..7eb8b9b6301 100644
--- a/ewah/ewok.h
+++ b/ewah/ewok.h
@@ -177,7 +177,6 @@ struct bitmap *bitmap_dup(const struct bitmap *src);
 void bitmap_set(struct bitmap *self, size_t pos);
 void bitmap_unset(struct bitmap *self, size_t pos);
 int bitmap_get(struct bitmap *self, size_t pos);
-void bitmap_reset(struct bitmap *self);
 void bitmap_free(struct bitmap *self);
 int bitmap_equals(struct bitmap *self, struct bitmap *other);
 int bitmap_is_subset(struct bitmap *self, struct bitmap *other);
-- 
2.34.0.817.gb03b3d32691

[PATCH 3/6] object-store.h: remove unused has_sha1_file*()

[Ævar Arnfjörð Bjarmason]

These macros were last used in 5d3679ee023 (sha1-file: drop
has_sha1_file(), 2019-01-07), so let's remove coccinelle migration
rules added 9b45f499818 (object-store: prepare has_{sha1, object}_file
to handle any repo, 2018-11-13), along with the compatibility macros
themselves.

The "These functions.." in the diff context and the general comment
about compatibility macros still applies to
"NO_THE_REPOSITORY_COMPATIBILITY_MACROS" use just a few lines below
this, so let's keep the comment.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 contrib/coccinelle/the_repository.pending.cocci | 15 ---------------
 object-store.h                                  |  4 ----
 2 files changed, 19 deletions(-)

diff --git a/contrib/coccinelle/the_repository.pending.cocci b/contrib/coccinelle/the_repository.pending.cocci
index 2ee702ecf7f..072ea0d9228 100644
--- a/contrib/coccinelle/the_repository.pending.cocci
+++ b/contrib/coccinelle/the_repository.pending.cocci
@@ -11,21 +11,6 @@ expression G;
 + repo_read_object_file(the_repository,
   E, F, G)
 
-@@
-expression E;
-@@
-- has_sha1_file(
-+ repo_has_sha1_file(the_repository,
-  E)
-
-@@
-expression E;
-expression F;
-@@
-- has_sha1_file_with_flags(
-+ repo_has_sha1_file_with_flags(the_repository,
-  E)
-
 @@
 expression E;
 @@
diff --git a/object-store.h b/object-store.h
index 952efb6a4be..1717f73eea3 100644
--- a/object-store.h
+++ b/object-store.h
@@ -286,10 +286,6 @@ int has_object(struct repository *r, const struct object_id *oid,
  * These functions can be removed once all callers have migrated to
  * has_object() and/or oid_object_info_extended().
  */
-#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
-#define has_sha1_file_with_flags(sha1, flags) repo_has_sha1_file_with_flags(the_repository, sha1, flags)
-#define has_sha1_file(sha1) repo_has_sha1_file(the_repository, sha1)
-#endif
 int repo_has_object_file(struct repository *r, const struct object_id *oid);
 int repo_has_object_file_with_flags(struct repository *r,
 				    const struct object_id *oid, int flags);
-- 
2.34.0.817.gb03b3d32691

[PATCH 4/6] alloc.[ch]: remove alloc_report() function

[Ævar Arnfjörð Bjarmason]

The alloc_report() function has been orphaned since its introduction
in 855419f764a (Add specialized object allocator, 2006-06-19), it
appears to have been used for demonstration purposes in that commit
message.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 alloc.c | 19 -------------------
 alloc.h |  1 -
 2 files changed, 20 deletions(-)

diff --git a/alloc.c b/alloc.c
index 957a0af3626..bf7982712f1 100644
--- a/alloc.c
+++ b/alloc.c
@@ -122,22 +122,3 @@ void *alloc_commit_node(struct repository *r)
 	init_commit_node(c);
 	return c;
 }
-
-static void report(const char *name, unsigned int count, size_t size)
-{
-	fprintf(stderr, "%10s: %8u (%"PRIuMAX" kB)\n",
-			name, count, (uintmax_t) size);
-}
-
-#define REPORT(name, type)	\
-    report(#name, r->parsed_objects->name##_state->count, \
-		  r->parsed_objects->name##_state->count * sizeof(type) >> 10)
-
-void alloc_report(struct repository *r)
-{
-	REPORT(blob, struct blob);
-	REPORT(tree, struct tree);
-	REPORT(commit, struct commit);
-	REPORT(tag, struct tag);
-	REPORT(object, union any_object);
-}
diff --git a/alloc.h b/alloc.h
index 371d388b552..3f4a0ad310a 100644
--- a/alloc.h
+++ b/alloc.h
@@ -13,7 +13,6 @@ void init_commit_node(struct commit *c);
 void *alloc_commit_node(struct repository *r);
 void *alloc_tag_node(struct repository *r);
 void *alloc_object_node(struct repository *r);
-void alloc_report(struct repository *r);
 
 struct alloc_state *allocate_alloc_state(void);
 void clear_alloc_state(struct alloc_state *s);
-- 
2.34.0.817.gb03b3d32691

[PATCH 5/6] strbuf: remove unused istarts_with() function

[Ævar Arnfjörð Bjarmason]

This function was added in 66b8af3e124 (strbuf: add a case insensitive
starts_with(), 2018-03-09) for use with code added in
2f0c4a362c5 (utf8: teach same_encoding() alternative UTF encoding
names, 2018-04-15).

That use got rewritten in ed283588330 (convert: use skip_iprefix() in
validate_encoding(), 2019-11-08) to use skip_iprefix() instead.

It's arguably slightly odd to have a skip_prefix() and iskip_prefix(),
but not both variants when it comes to starts_with(), but this is easy
enough to resurrect should we ever need it, so let's drop it for now.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 git-compat-util.h | 1 -
 strbuf.c          | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/git-compat-util.h b/git-compat-util.h
index d70ce142861..7117024a28b 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -512,7 +512,6 @@ report_fn get_warn_routine(void);
 void set_die_is_recursing_routine(int (*routine)(void));
 
 int starts_with(const char *str, const char *prefix);
-int istarts_with(const char *str, const char *prefix);
 
 /*
  * If the string "str" begins with the string found in "prefix", return 1.
diff --git a/strbuf.c b/strbuf.c
index b22e9816559..1b52e3c8250 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -12,15 +12,6 @@ int starts_with(const char *str, const char *prefix)
 			return 0;
 }
 
-int istarts_with(const char *str, const char *prefix)
-{
-	for (; ; str++, prefix++)
-		if (!*prefix)
-			return 1;
-		else if (tolower(*str) != tolower(*prefix))
-			return 0;
-}
-
 int skip_to_optional_arg_default(const char *str, const char *prefix,
 				 const char **arg, const char *def)
 {
-- 
2.34.0.817.gb03b3d32691

[PATCH 6/6] json-writer.[ch]: remove unused formatting functions

[Ævar Arnfjörð Bjarmason]

These were added in 75459410edd (json_writer: new routines to create
JSON data, 2018-07-13) for future use with trace2, but have not been
used by anything. These are easy enough to bring back should we need
them, but until then there's no point in carrying them.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 json-writer.c | 24 ------------------------
 json-writer.h |  3 ---
 2 files changed, 27 deletions(-)

diff --git a/json-writer.c b/json-writer.c
index f1cfd8fa8c6..8a81c2d5fce 100644
--- a/json-writer.c
+++ b/json-writer.c
@@ -331,36 +331,12 @@ void jw_array_false(struct json_writer *jw)
 	strbuf_addstr(&jw->json, "false");
 }
 
-void jw_array_bool(struct json_writer *jw, int value)
-{
-	if (value)
-		jw_array_true(jw);
-	else
-		jw_array_false(jw);
-}
-
 void jw_array_null(struct json_writer *jw)
 {
 	array_common(jw);
 	strbuf_addstr(&jw->json, "null");
 }
 
-void jw_array_sub_jw(struct json_writer *jw, const struct json_writer *value)
-{
-	assert_is_terminated(value);
-
-	array_common(jw);
-	append_sub_jw(jw, value);
-}
-
-void jw_array_argc_argv(struct json_writer *jw, int argc, const char **argv)
-{
-	int k;
-
-	for (k = 0; k < argc; k++)
-		jw_array_string(jw, argv[k]);
-}
-
 void jw_array_argv(struct json_writer *jw, const char **argv)
 {
 	while (*argv)
diff --git a/json-writer.h b/json-writer.h
index 209355e0f12..563c7e0e004 100644
--- a/json-writer.h
+++ b/json-writer.h
@@ -95,10 +95,7 @@ void jw_array_intmax(struct json_writer *jw, intmax_t value);
 void jw_array_double(struct json_writer *jw, int precision, double value);
 void jw_array_true(struct json_writer *jw);
 void jw_array_false(struct json_writer *jw);
-void jw_array_bool(struct json_writer *jw, int value);
 void jw_array_null(struct json_writer *jw);
-void jw_array_sub_jw(struct json_writer *jw, const struct json_writer *value);
-void jw_array_argc_argv(struct json_writer *jw, int argc, const char **argv);
 void jw_array_argv(struct json_writer *jw, const char **argv);
 
 void jw_array_inline_begin_object(struct json_writer *jw);
-- 
2.34.0.817.gb03b3d32691

Re: [PATCH 1/6] xdiff/xmacros.h: remove unused XDL_PTRFREE

[Jeff King]

On Fri, Nov 19, 2021 at 01:46:21PM +0100, Ævar Arnfjörð Bjarmason wrote:

> This macro was added in 3443546f6ef (Use a *real* built-in diff
> generator, 2006-03-24), but none of the xdiff code uses it, it uses
> xdl_free() directly.

Makes sense. Even if we wanted to use it, it is equivalent to our own
FREE_AND_NULL() anyway (since xdl_free() is really just an alias for
free()).

-Peff

Re: [PATCH 2/6] pack-bitmap-write: remove unused bitmap_reset() function

[Jeff King]

On Fri, Nov 19, 2021 at 01:46:22PM +0100, Ævar Arnfjörð Bjarmason wrote:

> This function hasn't been used since 449fa5ee069 (pack-bitmap-write:
> ignore BITMAP_FLAG_REUSE, 2020-12-08), which was a cleanup commit
> intending to get rid of the code around the resetting of bitmaps.

Makes sense, though I assume you mean s/resetting/reuse/ in the final
sentence.

-Peff

Re: [PATCH 3/6] object-store.h: remove unused has_sha1_file*()

[Jeff King]

On Fri, Nov 19, 2021 at 01:46:23PM +0100, Ævar Arnfjörð Bjarmason wrote:

> These macros were last used in 5d3679ee023 (sha1-file: drop
> has_sha1_file(), 2019-01-07), so let's remove coccinelle migration
> rules added 9b45f499818 (object-store: prepare has_{sha1, object}_file
> to handle any repo, 2018-11-13), along with the compatibility macros
> themselves.
> 
> The "These functions.." in the diff context and the general comment
> about compatibility macros still applies to
> "NO_THE_REPOSITORY_COMPATIBILITY_MACROS" use just a few lines below
> this, so let's keep the comment.

Yep, makes sense. I cleaned up the object_id.cocci file, but didn't
think to look for the_repository rules or helpers. Nice to see this
going away, too.

-Peff

Re: [PATCH 5/6] strbuf: remove unused istarts_with() function

[Jeff King]

On Fri, Nov 19, 2021 at 01:46:25PM +0100, Ævar Arnfjörð Bjarmason wrote:

> This function was added in 66b8af3e124 (strbuf: add a case insensitive
> starts_with(), 2018-03-09) for use with code added in
> 2f0c4a362c5 (utf8: teach same_encoding() alternative UTF encoding
> names, 2018-04-15).
> 
> That use got rewritten in ed283588330 (convert: use skip_iprefix() in
> validate_encoding(), 2019-11-08) to use skip_iprefix() instead.
> 
> It's arguably slightly odd to have a skip_prefix() and iskip_prefix(),
> but not both variants when it comes to starts_with(), but this is easy
> enough to resurrect should we ever need it, so let's drop it for now.

I have a custom patch that uses istarts_with(), but it's not something
that will ever go upstream. I'll probably just switch it to do:

  skip_iprefix(..., &dummy);

which is equivalent. Not really an objection, but just mentioning that
unused functions may have ripple effects for topics in flight.

-Peff

Re: [PATCH 6/6] json-writer.[ch]: remove unused formatting functions

[Jeff King]

On Fri, Nov 19, 2021 at 01:46:26PM +0100, Ævar Arnfjörð Bjarmason wrote:

> These were added in 75459410edd (json_writer: new routines to create
> JSON data, 2018-07-13) for future use with trace2, but have not been
> used by anything. These are easy enough to bring back should we need
> them, but until then there's no point in carrying them.

This is another one where I could _imagine_ somebody using these in a
custom patch or topic in flight (though I don't have any such case
myself). And they complete the json-writer API, so keeping them is not
that ugly.

But I'm also OK with dropping them under the notion of cleanliness, and
that they're easy-ish to resurrect.

-Peff

Re: [PATCH 0/6] various: remove dead code

[Jeff King]

On Fri, Nov 19, 2021 at 01:46:20PM +0100, Ævar Arnfjörð Bjarmason wrote:

> Remove various bits of dead code. These are unrelated things that I've
> spotted here & there recently. Submitted now to clear out this batch
> of dead code removal before it gets any larger.

These all look fine to me. I gave some light philosophical musings on
the later ones, but I'd be OK to see the code dropped.

-Peff

Re: [PATCH 5/6] strbuf: remove unused istarts_with() function

[Junio C Hamano]

Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:

> It's arguably slightly odd to have a skip_prefix() and iskip_prefix(),
> but not both variants when it comes to starts_with(), but this is easy
> enough to resurrect should we ever need it, so let's drop it for now.

Let's not go there.  It is not easy at all to know that it used to
exist in the first place, which is more important part than knowing
that it is there and resurrect it.  We'd end up hearing from people
that the API is uneven, and seeing a patch that reinvents it, which
we have to review again.

Leaving an unused implementation is not without risk of going it
stale (imagine: when iskip_prefix() learns to honor locale aware
case insensitive comparison, istarts_with() that nobody uses may
be left behind without anybody noticing), so carrying an unused
function is not cost-free, but in this particular case, I think
keeping it is much better economy than removing it, even without
counting the cost of writing this response.

Thanks.

> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
>  git-compat-util.h | 1 -
>  strbuf.c          | 9 ---------
>  2 files changed, 10 deletions(-)
>
> diff --git a/git-compat-util.h b/git-compat-util.h
> index d70ce142861..7117024a28b 100644
> --- a/git-compat-util.h
> +++ b/git-compat-util.h
> @@ -512,7 +512,6 @@ report_fn get_warn_routine(void);
>  void set_die_is_recursing_routine(int (*routine)(void));
>  
>  int starts_with(const char *str, const char *prefix);
> -int istarts_with(const char *str, const char *prefix);
>  
>  /*
>   * If the string "str" begins with the string found in "prefix", return 1.
> diff --git a/strbuf.c b/strbuf.c
> index b22e9816559..1b52e3c8250 100644
> --- a/strbuf.c
> +++ b/strbuf.c
> @@ -12,15 +12,6 @@ int starts_with(const char *str, const char *prefix)
>  			return 0;
>  }
>  
> -int istarts_with(const char *str, const char *prefix)
> -{
> -	for (; ; str++, prefix++)
> -		if (!*prefix)
> -			return 1;
> -		else if (tolower(*str) != tolower(*prefix))
> -			return 0;
> -}
> -
>  int skip_to_optional_arg_default(const char *str, const char *prefix,
>  				 const char **arg, const char *def)
>  {

Re: [PATCH 4/6] alloc.[ch]: remove alloc_report() function

[Junio C Hamano]

Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:

> The alloc_report() function has been orphaned since its introduction
> in 855419f764a (Add specialized object allocator, 2006-06-19), it
> appears to have been used for demonstration purposes in that commit
> message.

Stopping a program in debugger, and calling these functions that
have otherwise no callers, is a fairly handy way to debug.
It is likely that we used it while developing the allocator.

If we truly want to get rid of it, we'd want to lose the "count"
member from the alloc_state structure, which is otherwise unused, I
would think.

Even though I do not think 5/6 and 6/6 in this series are good idea,
I am on the fence on this one, slightly leaning to "lose it" but not
that strongly.

>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
>  alloc.c | 19 -------------------
>  alloc.h |  1 -
>  2 files changed, 20 deletions(-)
>
> diff --git a/alloc.c b/alloc.c
> index 957a0af3626..bf7982712f1 100644
> --- a/alloc.c
> +++ b/alloc.c
> @@ -122,22 +122,3 @@ void *alloc_commit_node(struct repository *r)
>  	init_commit_node(c);
>  	return c;
>  }
> -
> -static void report(const char *name, unsigned int count, size_t size)
> -{
> -	fprintf(stderr, "%10s: %8u (%"PRIuMAX" kB)\n",
> -			name, count, (uintmax_t) size);
> -}
> -
> -#define REPORT(name, type)	\
> -    report(#name, r->parsed_objects->name##_state->count, \
> -		  r->parsed_objects->name##_state->count * sizeof(type) >> 10)
> -
> -void alloc_report(struct repository *r)
> -{
> -	REPORT(blob, struct blob);
> -	REPORT(tree, struct tree);
> -	REPORT(commit, struct commit);
> -	REPORT(tag, struct tag);
> -	REPORT(object, union any_object);
> -}
> diff --git a/alloc.h b/alloc.h
> index 371d388b552..3f4a0ad310a 100644
> --- a/alloc.h
> +++ b/alloc.h
> @@ -13,7 +13,6 @@ void init_commit_node(struct commit *c);
>  void *alloc_commit_node(struct repository *r);
>  void *alloc_tag_node(struct repository *r);
>  void *alloc_object_node(struct repository *r);
> -void alloc_report(struct repository *r);
>  
>  struct alloc_state *allocate_alloc_state(void);
>  void clear_alloc_state(struct alloc_state *s);

[PATCH v2 0/5] various: remove dead code

[Ævar Arnfjörð Bjarmason]

Remove various bits of dead code. Addresses feedback on the v1:
https://lore.kernel.org/git/cover-0.6-00000000000-20211119T124420Z-avarab@gmail.com/

There's the minor commit message changes seen below, and the strbuf
change has been ejected per Junio's request.

Ævar Arnfjörð Bjarmason (5):
  xdiff/xmacros.h: remove unused XDL_PTRFREE
  pack-bitmap-write: remove unused bitmap_reset() function
  object-store.h: remove unused has_sha1_file*()
  alloc.[ch]: remove alloc_report() function
  json-writer.[ch]: remove unused formatting functions

 alloc.c                                       | 19 ---------------
 alloc.h                                       |  1 -
 .../coccinelle/the_repository.pending.cocci   | 15 ------------
 ewah/bitmap.c                                 |  5 ----
 ewah/ewok.h                                   |  1 -
 json-writer.c                                 | 24 -------------------
 json-writer.h                                 |  3 ---
 object-store.h                                |  4 ----
 xdiff/xmacros.h                               |  1 -
 9 files changed, 73 deletions(-)

Range-diff against v1:
1:  32bb8ad4de0 ! 1:  1e7e6d8d482 xdiff/xmacros.h: remove unused XDL_PTRFREE
    @@ Commit message
         generator, 2006-03-24), but none of the xdiff code uses it, it uses
         xdl_free() directly.
     
    +    If we need its functionality again we'll use the FREE_AND_NULL() macro
    +    added in 481df65f4f7 (git-compat-util: add a FREE_AND_NULL() wrapper
    +    around free(ptr); ptr = NULL, 2017-06-15).
    +
         Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
     
      ## xdiff/xmacros.h ##
2:  826027d2cd5 ! 2:  c9026af8953 pack-bitmap-write: remove unused bitmap_reset() function
    @@ Commit message
     
         This function hasn't been used since 449fa5ee069 (pack-bitmap-write:
         ignore BITMAP_FLAG_REUSE, 2020-12-08), which was a cleanup commit
    -    intending to get rid of the code around the resetting of bitmaps.
    +    intending to get rid of the code around the reusing of bitmaps.
     
         Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
     
3:  62ed0ec6077 = 3:  6d0ca249001 object-store.h: remove unused has_sha1_file*()
4:  bd8aa9b1554 = 4:  672bdffde83 alloc.[ch]: remove alloc_report() function
5:  642eec3d77c < -:  ----------- strbuf: remove unused istarts_with() function
6:  e14ee1f8c47 = 5:  818f1a46d66 json-writer.[ch]: remove unused formatting functions
-- 
2.34.0.823.gcc3243ae16c

[PATCH v2 1/5] xdiff/xmacros.h: remove unused XDL_PTRFREE

[Ævar Arnfjörð Bjarmason]

This macro was added in 3443546f6ef (Use a *real* built-in diff
generator, 2006-03-24), but none of the xdiff code uses it, it uses
xdl_free() directly.

If we need its functionality again we'll use the FREE_AND_NULL() macro
added in 481df65f4f7 (git-compat-util: add a FREE_AND_NULL() wrapper
around free(ptr); ptr = NULL, 2017-06-15).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 xdiff/xmacros.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xdiff/xmacros.h b/xdiff/xmacros.h
index 2809a28ca96..ae4636c2477 100644
--- a/xdiff/xmacros.h
+++ b/xdiff/xmacros.h
@@ -34,7 +34,6 @@
 #define XDL_ADDBITS(v,b)	((v) + ((v) >> (b)))
 #define XDL_MASKBITS(b)		((1UL << (b)) - 1)
 #define XDL_HASHLONG(v,b)	(XDL_ADDBITS((unsigned long)(v), b) & XDL_MASKBITS(b))
-#define XDL_PTRFREE(p) do { if (p) { xdl_free(p); (p) = NULL; } } while (0)
 #define XDL_LE32_PUT(p, v) \
 do { \
 	unsigned char *__p = (unsigned char *) (p); \
-- 
2.34.0.823.gcc3243ae16c

[PATCH v2 2/5] pack-bitmap-write: remove unused bitmap_reset() function

[Ævar Arnfjörð Bjarmason]

This function hasn't been used since 449fa5ee069 (pack-bitmap-write:
ignore BITMAP_FLAG_REUSE, 2020-12-08), which was a cleanup commit
intending to get rid of the code around the reusing of bitmaps.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 ewah/bitmap.c | 5 -----
 ewah/ewok.h   | 1 -
 2 files changed, 6 deletions(-)

diff --git a/ewah/bitmap.c b/ewah/bitmap.c
index 38a47c44db4..87d5cc8fa30 100644
--- a/ewah/bitmap.c
+++ b/ewah/bitmap.c
@@ -216,11 +216,6 @@ int bitmap_is_subset(struct bitmap *self, struct bitmap *other)
 	return 0;
 }
 
-void bitmap_reset(struct bitmap *bitmap)
-{
-	memset(bitmap->words, 0x0, bitmap->word_alloc * sizeof(eword_t));
-}
-
 void bitmap_free(struct bitmap *bitmap)
 {
 	if (bitmap == NULL)
diff --git a/ewah/ewok.h b/ewah/ewok.h
index 66920965da1..7eb8b9b6301 100644
--- a/ewah/ewok.h
+++ b/ewah/ewok.h
@@ -177,7 +177,6 @@ struct bitmap *bitmap_dup(const struct bitmap *src);
 void bitmap_set(struct bitmap *self, size_t pos);
 void bitmap_unset(struct bitmap *self, size_t pos);
 int bitmap_get(struct bitmap *self, size_t pos);
-void bitmap_reset(struct bitmap *self);
 void bitmap_free(struct bitmap *self);
 int bitmap_equals(struct bitmap *self, struct bitmap *other);
 int bitmap_is_subset(struct bitmap *self, struct bitmap *other);
-- 
2.34.0.823.gcc3243ae16c

[PATCH v2 3/5] object-store.h: remove unused has_sha1_file*()

[Ævar Arnfjörð Bjarmason]

These macros were last used in 5d3679ee023 (sha1-file: drop
has_sha1_file(), 2019-01-07), so let's remove coccinelle migration
rules added 9b45f499818 (object-store: prepare has_{sha1, object}_file
to handle any repo, 2018-11-13), along with the compatibility macros
themselves.

The "These functions.." in the diff context and the general comment
about compatibility macros still applies to
"NO_THE_REPOSITORY_COMPATIBILITY_MACROS" use just a few lines below
this, so let's keep the comment.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 contrib/coccinelle/the_repository.pending.cocci | 15 ---------------
 object-store.h                                  |  4 ----
 2 files changed, 19 deletions(-)

diff --git a/contrib/coccinelle/the_repository.pending.cocci b/contrib/coccinelle/the_repository.pending.cocci
index 2ee702ecf7f..072ea0d9228 100644
--- a/contrib/coccinelle/the_repository.pending.cocci
+++ b/contrib/coccinelle/the_repository.pending.cocci
@@ -11,21 +11,6 @@ expression G;
 + repo_read_object_file(the_repository,
   E, F, G)
 
-@@
-expression E;
-@@
-- has_sha1_file(
-+ repo_has_sha1_file(the_repository,
-  E)
-
-@@
-expression E;
-expression F;
-@@
-- has_sha1_file_with_flags(
-+ repo_has_sha1_file_with_flags(the_repository,
-  E)
-
 @@
 expression E;
 @@
diff --git a/object-store.h b/object-store.h
index 952efb6a4be..1717f73eea3 100644
--- a/object-store.h
+++ b/object-store.h
@@ -286,10 +286,6 @@ int has_object(struct repository *r, const struct object_id *oid,
  * These functions can be removed once all callers have migrated to
  * has_object() and/or oid_object_info_extended().
  */
-#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
-#define has_sha1_file_with_flags(sha1, flags) repo_has_sha1_file_with_flags(the_repository, sha1, flags)
-#define has_sha1_file(sha1) repo_has_sha1_file(the_repository, sha1)
-#endif
 int repo_has_object_file(struct repository *r, const struct object_id *oid);
 int repo_has_object_file_with_flags(struct repository *r,
 				    const struct object_id *oid, int flags);
-- 
2.34.0.823.gcc3243ae16c

[PATCH v2 4/5] alloc.[ch]: remove alloc_report() function

[Ævar Arnfjörð Bjarmason]

The alloc_report() function has been orphaned since its introduction
in 855419f764a (Add specialized object allocator, 2006-06-19), it
appears to have been used for demonstration purposes in that commit
message.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 alloc.c | 19 -------------------
 alloc.h |  1 -
 2 files changed, 20 deletions(-)

diff --git a/alloc.c b/alloc.c
index 957a0af3626..bf7982712f1 100644
--- a/alloc.c
+++ b/alloc.c
@@ -122,22 +122,3 @@ void *alloc_commit_node(struct repository *r)
 	init_commit_node(c);
 	return c;
 }
-
-static void report(const char *name, unsigned int count, size_t size)
-{
-	fprintf(stderr, "%10s: %8u (%"PRIuMAX" kB)\n",
-			name, count, (uintmax_t) size);
-}
-
-#define REPORT(name, type)	\
-    report(#name, r->parsed_objects->name##_state->count, \
-		  r->parsed_objects->name##_state->count * sizeof(type) >> 10)
-
-void alloc_report(struct repository *r)
-{
-	REPORT(blob, struct blob);
-	REPORT(tree, struct tree);
-	REPORT(commit, struct commit);
-	REPORT(tag, struct tag);
-	REPORT(object, union any_object);
-}
diff --git a/alloc.h b/alloc.h
index 371d388b552..3f4a0ad310a 100644
--- a/alloc.h
+++ b/alloc.h
@@ -13,7 +13,6 @@ void init_commit_node(struct commit *c);
 void *alloc_commit_node(struct repository *r);
 void *alloc_tag_node(struct repository *r);
 void *alloc_object_node(struct repository *r);
-void alloc_report(struct repository *r);
 
 struct alloc_state *allocate_alloc_state(void);
 void clear_alloc_state(struct alloc_state *s);
-- 
2.34.0.823.gcc3243ae16c

[PATCH v2 5/5] json-writer.[ch]: remove unused formatting functions

[Ævar Arnfjörð Bjarmason]

These were added in 75459410edd (json_writer: new routines to create
JSON data, 2018-07-13) for future use with trace2, but have not been
used by anything. These are easy enough to bring back should we need
them, but until then there's no point in carrying them.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 json-writer.c | 24 ------------------------
 json-writer.h |  3 ---
 2 files changed, 27 deletions(-)

diff --git a/json-writer.c b/json-writer.c
index f1cfd8fa8c6..8a81c2d5fce 100644
--- a/json-writer.c
+++ b/json-writer.c
@@ -331,36 +331,12 @@ void jw_array_false(struct json_writer *jw)
 	strbuf_addstr(&jw->json, "false");
 }
 
-void jw_array_bool(struct json_writer *jw, int value)
-{
-	if (value)
-		jw_array_true(jw);
-	else
-		jw_array_false(jw);
-}
-
 void jw_array_null(struct json_writer *jw)
 {
 	array_common(jw);
 	strbuf_addstr(&jw->json, "null");
 }
 
-void jw_array_sub_jw(struct json_writer *jw, const struct json_writer *value)
-{
-	assert_is_terminated(value);
-
-	array_common(jw);
-	append_sub_jw(jw, value);
-}
-
-void jw_array_argc_argv(struct json_writer *jw, int argc, const char **argv)
-{
-	int k;
-
-	for (k = 0; k < argc; k++)
-		jw_array_string(jw, argv[k]);
-}
-
 void jw_array_argv(struct json_writer *jw, const char **argv)
 {
 	while (*argv)
diff --git a/json-writer.h b/json-writer.h
index 209355e0f12..563c7e0e004 100644
--- a/json-writer.h
+++ b/json-writer.h
@@ -95,10 +95,7 @@ void jw_array_intmax(struct json_writer *jw, intmax_t value);
 void jw_array_double(struct json_writer *jw, int precision, double value);
 void jw_array_true(struct json_writer *jw);
 void jw_array_false(struct json_writer *jw);
-void jw_array_bool(struct json_writer *jw, int value);
 void jw_array_null(struct json_writer *jw);
-void jw_array_sub_jw(struct json_writer *jw, const struct json_writer *value);
-void jw_array_argc_argv(struct json_writer *jw, int argc, const char **argv);
 void jw_array_argv(struct json_writer *jw, const char **argv);
 
 void jw_array_inline_begin_object(struct json_writer *jw);
-- 
2.34.0.823.gcc3243ae16c

Re: [PATCH 6/6] json-writer.[ch]: remove unused formatting functions

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

> On Fri, Nov 19, 2021 at 01:46:26PM +0100, Ævar Arnfjörð Bjarmason wrote:
>
>> These were added in 75459410edd (json_writer: new routines to create
>> JSON data, 2018-07-13) for future use with trace2, but have not been
>> used by anything. These are easy enough to bring back should we need
>> them, but until then there's no point in carrying them.
>
> This is another one where I could _imagine_ somebody using these in a
> custom patch or topic in flight (though I don't have any such case
> myself). And they complete the json-writer API, so keeping them is not
> that ugly.

This falls into the same category as 5/6 in my mind.

> But I'm also OK with dropping them under the notion of cleanliness, and
> that they're easy-ish to resurrect.

Again, all the same "resurrecting is the easy part, knowing we used
to have one is hardre", "keeping is not without cost", "apparently
incomplete API is an invitation for future reinvention" apply here.

[PATCH v3 0/7] various: remove dead code, drop i18n not used in-tree

[Ævar Arnfjörð Bjarmason]

An altered version of
https://lore.kernel.org/git/cover-v2-0.5-00000000000-20211119T202455Z-avarab@gmail.com
sent a while ago, I ejected the json-writer.[ch] change, which had
objections (on the v1, but it seems E-Mails were crossed).

A the range-diff shows there's a couple of new trivial patches at the
start.

I then added a patch to the end to remove some i18n-markings that
aren't used anywhere in-tree, let's not waste time translating things
for hypothetical out-of-tree users as we migrate the last bits of
functionality away from shellscripts.

Ævar Arnfjörð Bjarmason (7):
  run-command.h: remove always unused "clean_on_exit_handler_cbdata"
  configure.ac: remove USE_PIC comment
  xdiff/xmacros.h: remove unused XDL_PTRFREE
  pack-bitmap-write: remove unused bitmap_reset() function
  object-store.h: remove unused has_sha1_file*()
  alloc.[ch]: remove alloc_report() function
  git-sh-setup: don't mark trees not used in-tree for i18n

 alloc.c                                       | 21 -------------------
 alloc.h                                       |  1 -
 configure.ac                                  |  3 ---
 .../coccinelle/the_repository.pending.cocci   | 15 -------------
 ewah/bitmap.c                                 |  5 -----
 ewah/ewok.h                                   |  1 -
 git-sh-setup.sh                               | 20 +++++++++++-------
 object-store.h                                |  4 ----
 run-command.h                                 |  1 -
 xdiff/xmacros.h                               |  1 -
 10 files changed, 13 insertions(+), 59 deletions(-)

Range-diff against v2:
-:  ----------- > 1:  bac78566135 run-command.h: remove always unused "clean_on_exit_handler_cbdata"
-:  ----------- > 2:  93dc689e1aa configure.ac: remove USE_PIC comment
1:  1e7e6d8d482 = 3:  05adde5b9e4 xdiff/xmacros.h: remove unused XDL_PTRFREE
2:  c9026af8953 = 4:  6bd89f3cf42 pack-bitmap-write: remove unused bitmap_reset() function
3:  6d0ca249001 = 5:  cf7969f8f67 object-store.h: remove unused has_sha1_file*()
4:  672bdffde83 ! 6:  b60a4c24a28 alloc.[ch]: remove alloc_report() function
    @@ Commit message
         appears to have been used for demonstration purposes in that commit
         message.
     
    +    These might be handy to manually use in a debugger, but keeping them
    +    and the "count" member of "alloc_state" just for that doesn't seem
    +    worth it.
    +
         Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
     
      ## alloc.c ##
    +@@ alloc.c: union any_object {
    + };
    + 
    + struct alloc_state {
    +-	int count; /* total number of nodes allocated */
    + 	int nr;    /* number of nodes left in current allocation */
    + 	void *p;   /* first free node in current allocation */
    + 
    +@@ alloc.c: static inline void *alloc_node(struct alloc_state *s, size_t node_size)
    + 		s->slabs[s->slab_nr++] = s->p;
    + 	}
    + 	s->nr--;
    +-	s->count++;
    + 	ret = s->p;
    + 	s->p = (char *)s->p + node_size;
    + 	memset(ret, 0, node_size);
     @@ alloc.c: void *alloc_commit_node(struct repository *r)
      	init_commit_node(c);
      	return c;
5:  818f1a46d66 < -:  ----------- json-writer.[ch]: remove unused formatting functions
-:  ----------- > 7:  7a82b1fd005 git-sh-setup: don't mark trees not used in-tree for i18n
-- 
2.35.1.1535.gf8d72b9da1e

[PATCH v3 1/7] run-command.h: remove always unused "clean_on_exit_handler_cbdata"

[Ævar Arnfjörð Bjarmason]

Remove a "struct child_process" member added in
ac2fbaa674c (run-command: add clean_on_exit_handler, 2016-10-16), but
which was never used.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 run-command.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/run-command.h b/run-command.h
index 07bed6c31b4..5bd0c933e80 100644
--- a/run-command.h
+++ b/run-command.h
@@ -142,7 +142,6 @@ struct child_process {
 	unsigned clean_on_exit:1;
 	unsigned wait_after_clean:1;
 	void (*clean_on_exit_handler)(struct child_process *process);
-	void *clean_on_exit_handler_cbdata;
 };
 
 #define CHILD_PROCESS_INIT { \
-- 
2.35.1.1535.gf8d72b9da1e

[PATCH v3 2/7] configure.ac: remove USE_PIC comment

[Ævar Arnfjörð Bjarmason]

Remove a comment about a Makefile knob that was removed in
f7661ce0b8e (Remove -fPIC which was only needed for Git.xs,
2006-09-29). The comment had been copied over to configure.ac in
633b423961d (Copy description of build configuration variables to
configure.ac, 2006-07-08).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 configure.ac | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6bd6bef1c44..789dcde3eae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1189,9 +1189,6 @@ AC_COMPILE_IFELSE([BSD_SYSCTL_SRC],
 GIT_CONF_SUBST([HAVE_BSD_SYSCTL])
 
 ## Other checks.
-# Define USE_PIC if you need the main git objects to be built with -fPIC
-# in order to build and link perl/Git.so.  x86-64 seems to need this.
-#
 # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
 # Enable it on Windows.  By default, symrefs are still used.
 #
-- 
2.35.1.1535.gf8d72b9da1e

[PATCH v3 3/7] xdiff/xmacros.h: remove unused XDL_PTRFREE

[Ævar Arnfjörð Bjarmason]

This macro was added in 3443546f6ef (Use a *real* built-in diff
generator, 2006-03-24), but none of the xdiff code uses it, it uses
xdl_free() directly.

If we need its functionality again we'll use the FREE_AND_NULL() macro
added in 481df65f4f7 (git-compat-util: add a FREE_AND_NULL() wrapper
around free(ptr); ptr = NULL, 2017-06-15).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 xdiff/xmacros.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xdiff/xmacros.h b/xdiff/xmacros.h
index 2809a28ca96..ae4636c2477 100644
--- a/xdiff/xmacros.h
+++ b/xdiff/xmacros.h
@@ -34,7 +34,6 @@
 #define XDL_ADDBITS(v,b)	((v) + ((v) >> (b)))
 #define XDL_MASKBITS(b)		((1UL << (b)) - 1)
 #define XDL_HASHLONG(v,b)	(XDL_ADDBITS((unsigned long)(v), b) & XDL_MASKBITS(b))
-#define XDL_PTRFREE(p) do { if (p) { xdl_free(p); (p) = NULL; } } while (0)
 #define XDL_LE32_PUT(p, v) \
 do { \
 	unsigned char *__p = (unsigned char *) (p); \
-- 
2.35.1.1535.gf8d72b9da1e

[PATCH v3 4/7] pack-bitmap-write: remove unused bitmap_reset() function

[Ævar Arnfjörð Bjarmason]

This function hasn't been used since 449fa5ee069 (pack-bitmap-write:
ignore BITMAP_FLAG_REUSE, 2020-12-08), which was a cleanup commit
intending to get rid of the code around the reusing of bitmaps.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 ewah/bitmap.c | 5 -----
 ewah/ewok.h   | 1 -
 2 files changed, 6 deletions(-)

diff --git a/ewah/bitmap.c b/ewah/bitmap.c
index 38a47c44db4..87d5cc8fa30 100644
--- a/ewah/bitmap.c
+++ b/ewah/bitmap.c
@@ -216,11 +216,6 @@ int bitmap_is_subset(struct bitmap *self, struct bitmap *other)
 	return 0;
 }
 
-void bitmap_reset(struct bitmap *bitmap)
-{
-	memset(bitmap->words, 0x0, bitmap->word_alloc * sizeof(eword_t));
-}
-
 void bitmap_free(struct bitmap *bitmap)
 {
 	if (bitmap == NULL)
diff --git a/ewah/ewok.h b/ewah/ewok.h
index 66920965da1..7eb8b9b6301 100644
--- a/ewah/ewok.h
+++ b/ewah/ewok.h
@@ -177,7 +177,6 @@ struct bitmap *bitmap_dup(const struct bitmap *src);
 void bitmap_set(struct bitmap *self, size_t pos);
 void bitmap_unset(struct bitmap *self, size_t pos);
 int bitmap_get(struct bitmap *self, size_t pos);
-void bitmap_reset(struct bitmap *self);
 void bitmap_free(struct bitmap *self);
 int bitmap_equals(struct bitmap *self, struct bitmap *other);
 int bitmap_is_subset(struct bitmap *self, struct bitmap *other);
-- 
2.35.1.1535.gf8d72b9da1e

[PATCH v3 5/7] object-store.h: remove unused has_sha1_file*()

[Ævar Arnfjörð Bjarmason]

These macros were last used in 5d3679ee023 (sha1-file: drop
has_sha1_file(), 2019-01-07), so let's remove coccinelle migration
rules added 9b45f499818 (object-store: prepare has_{sha1, object}_file
to handle any repo, 2018-11-13), along with the compatibility macros
themselves.

The "These functions.." in the diff context and the general comment
about compatibility macros still applies to
"NO_THE_REPOSITORY_COMPATIBILITY_MACROS" use just a few lines below
this, so let's keep the comment.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 contrib/coccinelle/the_repository.pending.cocci | 15 ---------------
 object-store.h                                  |  4 ----
 2 files changed, 19 deletions(-)

diff --git a/contrib/coccinelle/the_repository.pending.cocci b/contrib/coccinelle/the_repository.pending.cocci
index 2ee702ecf7f..072ea0d9228 100644
--- a/contrib/coccinelle/the_repository.pending.cocci
+++ b/contrib/coccinelle/the_repository.pending.cocci
@@ -11,21 +11,6 @@ expression G;
 + repo_read_object_file(the_repository,
   E, F, G)
 
-@@
-expression E;
-@@
-- has_sha1_file(
-+ repo_has_sha1_file(the_repository,
-  E)
-
-@@
-expression E;
-expression F;
-@@
-- has_sha1_file_with_flags(
-+ repo_has_sha1_file_with_flags(the_repository,
-  E)
-
 @@
 expression E;
 @@
diff --git a/object-store.h b/object-store.h
index bd2322ed8ce..53996018c11 100644
--- a/object-store.h
+++ b/object-store.h
@@ -312,10 +312,6 @@ int has_object(struct repository *r, const struct object_id *oid,
  * These functions can be removed once all callers have migrated to
  * has_object() and/or oid_object_info_extended().
  */
-#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
-#define has_sha1_file_with_flags(sha1, flags) repo_has_sha1_file_with_flags(the_repository, sha1, flags)
-#define has_sha1_file(sha1) repo_has_sha1_file(the_repository, sha1)
-#endif
 int repo_has_object_file(struct repository *r, const struct object_id *oid);
 int repo_has_object_file_with_flags(struct repository *r,
 				    const struct object_id *oid, int flags);
-- 
2.35.1.1535.gf8d72b9da1e

[PATCH v3 6/7] alloc.[ch]: remove alloc_report() function

[Ævar Arnfjörð Bjarmason]

The alloc_report() function has been orphaned since its introduction
in 855419f764a (Add specialized object allocator, 2006-06-19), it
appears to have been used for demonstration purposes in that commit
message.

These might be handy to manually use in a debugger, but keeping them
and the "count" member of "alloc_state" just for that doesn't seem
worth it.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 alloc.c | 21 ---------------------
 alloc.h |  1 -
 2 files changed, 22 deletions(-)

diff --git a/alloc.c b/alloc.c
index 957a0af3626..27f697e4c87 100644
--- a/alloc.c
+++ b/alloc.c
@@ -27,7 +27,6 @@ union any_object {
 };
 
 struct alloc_state {
-	int count; /* total number of nodes allocated */
 	int nr;    /* number of nodes left in current allocation */
 	void *p;   /* first free node in current allocation */
 
@@ -63,7 +62,6 @@ static inline void *alloc_node(struct alloc_state *s, size_t node_size)
 		s->slabs[s->slab_nr++] = s->p;
 	}
 	s->nr--;
-	s->count++;
 	ret = s->p;
 	s->p = (char *)s->p + node_size;
 	memset(ret, 0, node_size);
@@ -122,22 +120,3 @@ void *alloc_commit_node(struct repository *r)
 	init_commit_node(c);
 	return c;
 }
-
-static void report(const char *name, unsigned int count, size_t size)
-{
-	fprintf(stderr, "%10s: %8u (%"PRIuMAX" kB)\n",
-			name, count, (uintmax_t) size);
-}
-
-#define REPORT(name, type)	\
-    report(#name, r->parsed_objects->name##_state->count, \
-		  r->parsed_objects->name##_state->count * sizeof(type) >> 10)
-
-void alloc_report(struct repository *r)
-{
-	REPORT(blob, struct blob);
-	REPORT(tree, struct tree);
-	REPORT(commit, struct commit);
-	REPORT(tag, struct tag);
-	REPORT(object, union any_object);
-}
diff --git a/alloc.h b/alloc.h
index 371d388b552..3f4a0ad310a 100644
--- a/alloc.h
+++ b/alloc.h
@@ -13,7 +13,6 @@ void init_commit_node(struct commit *c);
 void *alloc_commit_node(struct repository *r);
 void *alloc_tag_node(struct repository *r);
 void *alloc_object_node(struct repository *r);
-void alloc_report(struct repository *r);
 
 struct alloc_state *allocate_alloc_state(void);
 void clear_alloc_state(struct alloc_state *s);
-- 
2.35.1.1535.gf8d72b9da1e

[PATCH v3 7/7] git-sh-setup: don't mark trees not used in-tree for i18n

[Ævar Arnfjörð Bjarmason]

Partially revert d323c6b6410 (i18n: git-sh-setup.sh: mark strings for
translation, 2016-06-17).

These strings are no longer used in-tree, and we shouldn't be wasting
translator time on them for the benefit of a hypothetical out-of-tree
user of git-sh-setup.sh.

Since d03ebd411c6 (rebase: remove the rebase.useBuiltin setting,
2019-03-18) we've had no in-tree user of require_work_tree_exists(),
and since the more recent c1e10b2dce2 (git-sh-setup: remove messaging
supporting --preserve-merges, 2021-10-21) the only in-tree user of
require_clean_work_tree() is git-filter-branch.sh. Let's only
translate the message it uses, and revert the others to the pre-image
of d323c6b6410.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 git-sh-setup.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index d92df37e992..1abceaac8d3 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -187,8 +187,7 @@ cd_to_toplevel () {
 require_work_tree_exists () {
 	if test "z$(git rev-parse --is-bare-repository)" != zfalse
 	then
-		program_name=$0
-		die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")"
+		die "fatal: $0 cannot be used without a working tree."
 	fi
 }
 
@@ -206,13 +205,13 @@ require_clean_work_tree () {
 
 	if ! git diff-files --quiet --ignore-submodules
 	then
-		action=$1
-		case "$action" in
+		case "$1" in
 		"rewrite branches")
 			gettextln "Cannot rewrite branches: You have unstaged changes." >&2
 			;;
 		*)
-			eval_gettextln "Cannot \$action: You have unstaged changes." >&2
+			# Some out-of-tree user of require_clean_work_tree()
+			echo "Cannot $1: You have unstaged changes." >&2
 			;;
 		esac
 		err=1
@@ -222,8 +221,15 @@ require_clean_work_tree () {
 	then
 		if test $err = 0
 		then
-			action=$1
-			eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
+			case "$1" in
+			"rewrite branches")
+				gettextln "Cannot rewrite branches: You have unstaged changes." >&2
+				;;
+			*)
+				# Some out-of-tree user of require_clean_work_tree()
+				echo "Cannot $1: Your index contains uncommitted changes." >&2
+				;;
+			esac
 		else
 		    gettextln "Additionally, your index contains uncommitted changes." >&2
 		fi
-- 
2.35.1.1535.gf8d72b9da1e

Re: [PATCH v3 7/7] git-sh-setup: don't mark trees not used in-tree for i18n

[Johannes Sixt]

Am 26.03.22 um 18:14 schrieb Ævar Arnfjörð Bjarmason:
> Partially revert d323c6b6410 (i18n: git-sh-setup.sh: mark strings for
> translation, 2016-06-17).
> 
> These strings are no longer used in-tree, and we shouldn't be wasting
> translator time on them for the benefit of a hypothetical out-of-tree
> user of git-sh-setup.sh.

There is public documentation for these functions. Hence, you must
assume that they are used in scripts outside of Git. Castrating their
functionality like this patch does is unacceptable.

-- Hannes

Re: [PATCH v3 7/7] git-sh-setup: don't mark trees not used in-tree for i18n

[Ævar Arnfjörð Bjarmason]

On Sun, Mar 27 2022, Johannes Sixt wrote:

> Am 26.03.22 um 18:14 schrieb Ævar Arnfjörð Bjarmason:
>> Partially revert d323c6b6410 (i18n: git-sh-setup.sh: mark strings for
>> translation, 2016-06-17).
>> 
>> These strings are no longer used in-tree, and we shouldn't be wasting
>> translator time on them for the benefit of a hypothetical out-of-tree
>> user of git-sh-setup.sh.
>
> There is public documentation for these functions. Hence, you must
> assume that they are used in scripts outside of Git. Castrating their
> functionality like this patch does is unacceptable.

For require_clean_work_tree() the public documentation for this function
states that it will emit a specific error message in English, and you're
expected to Lego-interpolate a string that we'll concatenate with it:

	[...]It emits an error message of the form `Cannot
        <action>: <reason>. <hint>`, and dies.  Example:
	+
	----------------
	require_clean_work_tree rebase "Please commit or stash them."

So I think that marking it for translation like this as d323c6b6410 was
always broken in that it broke that documented promise.

But that's just an argument for keeping the require_clean_work_tree()
part of this patch, not require_work_tree_exists().

For that one and others in git-sh-setup we've never said that we'd
provide these translated (and to the extent we've implied anything about
the rest, have strongly implied the opposite with
require_clean_work_tree()'s docs).

Nothing will break for out-of-tree users as a result of this
change. When we added these functions and their documentation their
output wouldn't be translated, then sometimes it was, now it's not
again.

We need also need to be mindful of translator time, it's a *lot* of
strings to go through, and e.g. I've commented in the past on patches
that marked stuff in t/helper/ for translation.

Some hypothetical out-of-tree user is, I think, a much stronger
candidate for skipping translation than that.

Also keep in mind that we don't even translate in-tree contrib stuff
like contrib/subtree/ (the recent "not-really-contrib" scalar being an
exception).

So I really think this is fine as-is, don't you think that if someone
out-of-tree had such strong expectations about the human-readable
strings these emit that they'd have long since stopped using them and
provided their own replacements?

Re: [PATCH v3 7/7] git-sh-setup: don't mark trees not used in-tree for i18n

[Johannes Sixt]

Am 27.03.22 um 13:15 schrieb Ævar Arnfjörð Bjarmason:
> 
> On Sun, Mar 27 2022, Johannes Sixt wrote:
> 
>> Am 26.03.22 um 18:14 schrieb Ævar Arnfjörð Bjarmason:
>>> Partially revert d323c6b6410 (i18n: git-sh-setup.sh: mark strings for
>>> translation, 2016-06-17).
>>>
>>> These strings are no longer used in-tree, and we shouldn't be wasting
>>> translator time on them for the benefit of a hypothetical out-of-tree
>>> user of git-sh-setup.sh.
>>
>> There is public documentation for these functions. Hence, you must
>> assume that they are used in scripts outside of Git. Castrating their
>> functionality like this patch does is unacceptable.
> 
> For require_clean_work_tree() the public documentation for this function
> states that it will emit a specific error message in English, and you're
> expected to Lego-interpolate a string that we'll concatenate with it:
> 
> 	[...]It emits an error message of the form `Cannot
>         <action>: <reason>. <hint>`, and dies.  Example:
> 	+
> 	----------------
> 	require_clean_work_tree rebase "Please commit or stash them."
> 
> So I think that marking it for translation like this as d323c6b6410 was
> always broken in that it broke that documented promise.

I can buy this argument. But then this must be a separate commit with
this justification.

> But that's just an argument for keeping the require_clean_work_tree()
> part of this patch, not require_work_tree_exists().
> 
> For that one and others in git-sh-setup we've never said that we'd
> provide these translated (and to the extent we've implied anything about
> the rest, have strongly implied the opposite with
> require_clean_work_tree()'s docs).
> 
> Nothing will break for out-of-tree users as a result of this
> change. When we added these functions and their documentation their
> output wouldn't be translated, then sometimes it was, now it's not
> again.

This does not sound convincing at all, but rather like "I want the code
to be so, and here is some handwaving to justify it". What is wrong with
the status quo?

> We need also need to be mindful of translator time, it's a *lot* of
> strings to go through, and e.g. I've commented in the past on patches
> that marked stuff in t/helper/ for translation.

Translator's time is your concern? No translator sifts through 5000
strings on every release. There are tools that show only new strings to
translate. A text is translated once and then it lies under the radar
until someone changes it. Don't tell me that is time-consuming. On the
other hand, there is a lot of *reviewer* time that you are spending with
changes like this. *That* should be your concern.

-- Hannes

Re: [PATCH v3 7/7] git-sh-setup: don't mark trees not used in-tree for i18n

[Ævar Arnfjörð Bjarmason]

On Mon, Mar 28 2022, Johannes Sixt wrote:

> Am 27.03.22 um 13:15 schrieb Ævar Arnfjörð Bjarmason:
>> 
>> On Sun, Mar 27 2022, Johannes Sixt wrote:
>> 
>>> Am 26.03.22 um 18:14 schrieb Ævar Arnfjörð Bjarmason:
>>>> Partially revert d323c6b6410 (i18n: git-sh-setup.sh: mark strings for
>>>> translation, 2016-06-17).
>>>>
>>>> These strings are no longer used in-tree, and we shouldn't be wasting
>>>> translator time on them for the benefit of a hypothetical out-of-tree
>>>> user of git-sh-setup.sh.
>>>
>>> There is public documentation for these functions. Hence, you must
>>> assume that they are used in scripts outside of Git. Castrating their
>>> functionality like this patch does is unacceptable.
>> 
>> For require_clean_work_tree() the public documentation for this function
>> states that it will emit a specific error message in English, and you're
>> expected to Lego-interpolate a string that we'll concatenate with it:
>> 
>> 	[...]It emits an error message of the form `Cannot
>>         <action>: <reason>. <hint>`, and dies.  Example:
>> 	+
>> 	----------------
>> 	require_clean_work_tree rebase "Please commit or stash them."
>> 
>> So I think that marking it for translation like this as d323c6b6410 was
>> always broken in that it broke that documented promise.
>
> I can buy this argument. But then this must be a separate commit with
> this justification.

Sure, I can elaborate on that point & split it up.

>> But that's just an argument for keeping the require_clean_work_tree()
>> part of this patch, not require_work_tree_exists().
>> 
>> For that one and others in git-sh-setup we've never said that we'd
>> provide these translated (and to the extent we've implied anything about
>> the rest, have strongly implied the opposite with
>> require_clean_work_tree()'s docs).
>> 
>> Nothing will break for out-of-tree users as a result of this
>> change. When we added these functions and their documentation their
>> output wouldn't be translated, then sometimes it was, now it's not
>> again.
>
> This does not sound convincing at all, but rather like "I want the code
> to be so, and here is some handwaving to justify it". What is wrong with
> the status quo?

The larger context for why I was looking at this again is that I'm
trying to slowly get us to the point where we can remove the
i18n-in-shellscript entirtely.

But I thought that was a rather large digression for the commit message,
and that these being both unused, and not something the "public" API
affected ever promised it would do was sufficient.

>> We need also need to be mindful of translator time, it's a *lot* of
>> strings to go through, and e.g. I've commented in the past on patches
>> that marked stuff in t/helper/ for translation.
>
> Translator's time is your concern? No translator sifts through 5000
> strings on every release. There are tools that show only new strings to
> translate.

Yes, I'm the person who added this entire i18n infrastructure to git, I
know how it works :)

> A text is translated once and then it lies under the radar
> until someone changes it. Don't tell me that is time-consuming.

Yes, individual orphaned strings aren't, but they add up.

Just like having that "USE_PIC" comment in configure.ac isn't much of a
big deal, but it makes sense to clean up unused code, just as we're
adding new code.

I will say that your implicit proposal of keeping this forever instead
is assuming that we won't have more translations for git, and every new
translator will look at this.

Context is critical for translators, so even if it's one string it's a
string you'll quickly grep for and find ... no uses for, and then likely
go hunting around for where it's used only to (hopefully, in that case)
find this thread. Better not to have it.

> On the other hand, there is a lot of *reviewer* time that you are
> spending with changes like this. *That* should be your concern.

I'd think most of the that time, if any, will be spent on this
sub-thread you started, so ... :)

Which isn't to say it shouldn't have been brought up, but from my
perspective I was (and still am) making a rather small change that I
think won't harm anyone in practice, and gives us some incremental
tidyness & contributes to an eventual large "git rm git-sh-i18n.sh" et
al.

But on reflection I don't think it's worth worrying about, and we can
just do this change.

Re: [PATCH v3 7/7] git-sh-setup: don't mark trees not used in-tree for i18n

[Johannes Sixt]

Am 28.03.22 um 14:16 schrieb Ævar Arnfjörð Bjarmason:
> On Mon, Mar 28 2022, Johannes Sixt wrote:
>> What is wrong with
>> the status quo?
> 
> The larger context for why I was looking at this again is that I'm
> trying to slowly get us to the point where we can remove the
> i18n-in-shellscript entirtely.

Why? Again: what is wrong with the status quo?

> Just like having that "USE_PIC" comment in configure.ac isn't much of a
> big deal, but it makes sense to clean up unused code, just as we're
> adding new code.

There is a difference between "clean up unused code" and "change
observable behavior".

-- Hannes

[PATCH v4 0/6] various: remove dead code

[Ævar Arnfjörð Bjarmason]

This v4 drops the last patch of the v3. I'll address git-sh-i18n.sh in
some future topic, the rest of these should all be uncontroversial.

Ævar Arnfjörð Bjarmason (6):
  run-command.h: remove always unused "clean_on_exit_handler_cbdata"
  configure.ac: remove USE_PIC comment
  xdiff/xmacros.h: remove unused XDL_PTRFREE
  pack-bitmap-write: remove unused bitmap_reset() function
  object-store.h: remove unused has_sha1_file*()
  alloc.[ch]: remove alloc_report() function

 alloc.c                                       | 21 -------------------
 alloc.h                                       |  1 -
 configure.ac                                  |  3 ---
 .../coccinelle/the_repository.pending.cocci   | 15 -------------
 ewah/bitmap.c                                 |  5 -----
 ewah/ewok.h                                   |  1 -
 object-store.h                                |  4 ----
 run-command.h                                 |  1 -
 xdiff/xmacros.h                               |  1 -
 9 files changed, 52 deletions(-)

Range-diff against v3:
1:  bac78566135 = 1:  fc55b203474 run-command.h: remove always unused "clean_on_exit_handler_cbdata"
2:  93dc689e1aa = 2:  f6125e9f62a configure.ac: remove USE_PIC comment
3:  05adde5b9e4 = 3:  cf54976bbc4 xdiff/xmacros.h: remove unused XDL_PTRFREE
4:  6bd89f3cf42 = 4:  a9b71c281c2 pack-bitmap-write: remove unused bitmap_reset() function
5:  cf7969f8f67 = 5:  69d32330716 object-store.h: remove unused has_sha1_file*()
6:  b60a4c24a28 = 6:  f477389c275 alloc.[ch]: remove alloc_report() function
7:  7a82b1fd005 < -:  ----------- git-sh-setup: don't mark trees not used in-tree for i18n
-- 
2.35.1.1561.ge8eddc63765

[PATCH v4 1/6] run-command.h: remove always unused "clean_on_exit_handler_cbdata"

[Ævar Arnfjörð Bjarmason]

Remove a "struct child_process" member added in
ac2fbaa674c (run-command: add clean_on_exit_handler, 2016-10-16), but
which was never used.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 run-command.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/run-command.h b/run-command.h
index 07bed6c31b4..5bd0c933e80 100644
--- a/run-command.h
+++ b/run-command.h
@@ -142,7 +142,6 @@ struct child_process {
 	unsigned clean_on_exit:1;
 	unsigned wait_after_clean:1;
 	void (*clean_on_exit_handler)(struct child_process *process);
-	void *clean_on_exit_handler_cbdata;
 };
 
 #define CHILD_PROCESS_INIT { \
-- 
2.35.1.1561.ge8eddc63765

[PATCH v4 2/6] configure.ac: remove USE_PIC comment

[Ævar Arnfjörð Bjarmason]

Remove a comment about a Makefile knob that was removed in
f7661ce0b8e (Remove -fPIC which was only needed for Git.xs,
2006-09-29). The comment had been copied over to configure.ac in
633b423961d (Copy description of build configuration variables to
configure.ac, 2006-07-08).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 configure.ac | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6bd6bef1c44..789dcde3eae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1189,9 +1189,6 @@ AC_COMPILE_IFELSE([BSD_SYSCTL_SRC],
 GIT_CONF_SUBST([HAVE_BSD_SYSCTL])
 
 ## Other checks.
-# Define USE_PIC if you need the main git objects to be built with -fPIC
-# in order to build and link perl/Git.so.  x86-64 seems to need this.
-#
 # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
 # Enable it on Windows.  By default, symrefs are still used.
 #
-- 
2.35.1.1561.ge8eddc63765

[PATCH v4 3/6] xdiff/xmacros.h: remove unused XDL_PTRFREE

[Ævar Arnfjörð Bjarmason]

This macro was added in 3443546f6ef (Use a *real* built-in diff
generator, 2006-03-24), but none of the xdiff code uses it, it uses
xdl_free() directly.

If we need its functionality again we'll use the FREE_AND_NULL() macro
added in 481df65f4f7 (git-compat-util: add a FREE_AND_NULL() wrapper
around free(ptr); ptr = NULL, 2017-06-15).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 xdiff/xmacros.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xdiff/xmacros.h b/xdiff/xmacros.h
index 2809a28ca96..ae4636c2477 100644
--- a/xdiff/xmacros.h
+++ b/xdiff/xmacros.h
@@ -34,7 +34,6 @@
 #define XDL_ADDBITS(v,b)	((v) + ((v) >> (b)))
 #define XDL_MASKBITS(b)		((1UL << (b)) - 1)
 #define XDL_HASHLONG(v,b)	(XDL_ADDBITS((unsigned long)(v), b) & XDL_MASKBITS(b))
-#define XDL_PTRFREE(p) do { if (p) { xdl_free(p); (p) = NULL; } } while (0)
 #define XDL_LE32_PUT(p, v) \
 do { \
 	unsigned char *__p = (unsigned char *) (p); \
-- 
2.35.1.1561.ge8eddc63765

[PATCH v4 4/6] pack-bitmap-write: remove unused bitmap_reset() function

[Ævar Arnfjörð Bjarmason]

This function hasn't been used since 449fa5ee069 (pack-bitmap-write:
ignore BITMAP_FLAG_REUSE, 2020-12-08), which was a cleanup commit
intending to get rid of the code around the reusing of bitmaps.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 ewah/bitmap.c | 5 -----
 ewah/ewok.h   | 1 -
 2 files changed, 6 deletions(-)

diff --git a/ewah/bitmap.c b/ewah/bitmap.c
index 38a47c44db4..87d5cc8fa30 100644
--- a/ewah/bitmap.c
+++ b/ewah/bitmap.c
@@ -216,11 +216,6 @@ int bitmap_is_subset(struct bitmap *self, struct bitmap *other)
 	return 0;
 }
 
-void bitmap_reset(struct bitmap *bitmap)
-{
-	memset(bitmap->words, 0x0, bitmap->word_alloc * sizeof(eword_t));
-}
-
 void bitmap_free(struct bitmap *bitmap)
 {
 	if (bitmap == NULL)
diff --git a/ewah/ewok.h b/ewah/ewok.h
index 66920965da1..7eb8b9b6301 100644
--- a/ewah/ewok.h
+++ b/ewah/ewok.h
@@ -177,7 +177,6 @@ struct bitmap *bitmap_dup(const struct bitmap *src);
 void bitmap_set(struct bitmap *self, size_t pos);
 void bitmap_unset(struct bitmap *self, size_t pos);
 int bitmap_get(struct bitmap *self, size_t pos);
-void bitmap_reset(struct bitmap *self);
 void bitmap_free(struct bitmap *self);
 int bitmap_equals(struct bitmap *self, struct bitmap *other);
 int bitmap_is_subset(struct bitmap *self, struct bitmap *other);
-- 
2.35.1.1561.ge8eddc63765

[PATCH v4 5/6] object-store.h: remove unused has_sha1_file*()

[Ævar Arnfjörð Bjarmason]

These macros were last used in 5d3679ee023 (sha1-file: drop
has_sha1_file(), 2019-01-07), so let's remove coccinelle migration
rules added 9b45f499818 (object-store: prepare has_{sha1, object}_file
to handle any repo, 2018-11-13), along with the compatibility macros
themselves.

The "These functions.." in the diff context and the general comment
about compatibility macros still applies to
"NO_THE_REPOSITORY_COMPATIBILITY_MACROS" use just a few lines below
this, so let's keep the comment.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 contrib/coccinelle/the_repository.pending.cocci | 15 ---------------
 object-store.h                                  |  4 ----
 2 files changed, 19 deletions(-)

diff --git a/contrib/coccinelle/the_repository.pending.cocci b/contrib/coccinelle/the_repository.pending.cocci
index 2ee702ecf7f..072ea0d9228 100644
--- a/contrib/coccinelle/the_repository.pending.cocci
+++ b/contrib/coccinelle/the_repository.pending.cocci
@@ -11,21 +11,6 @@ expression G;
 + repo_read_object_file(the_repository,
   E, F, G)
 
-@@
-expression E;
-@@
-- has_sha1_file(
-+ repo_has_sha1_file(the_repository,
-  E)
-
-@@
-expression E;
-expression F;
-@@
-- has_sha1_file_with_flags(
-+ repo_has_sha1_file_with_flags(the_repository,
-  E)
-
 @@
 expression E;
 @@
diff --git a/object-store.h b/object-store.h
index bd2322ed8ce..53996018c11 100644
--- a/object-store.h
+++ b/object-store.h
@@ -312,10 +312,6 @@ int has_object(struct repository *r, const struct object_id *oid,
  * These functions can be removed once all callers have migrated to
  * has_object() and/or oid_object_info_extended().
  */
-#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
-#define has_sha1_file_with_flags(sha1, flags) repo_has_sha1_file_with_flags(the_repository, sha1, flags)
-#define has_sha1_file(sha1) repo_has_sha1_file(the_repository, sha1)
-#endif
 int repo_has_object_file(struct repository *r, const struct object_id *oid);
 int repo_has_object_file_with_flags(struct repository *r,
 				    const struct object_id *oid, int flags);
-- 
2.35.1.1561.ge8eddc63765

[PATCH v4 6/6] alloc.[ch]: remove alloc_report() function

[Ævar Arnfjörð Bjarmason]

The alloc_report() function has been orphaned since its introduction
in 855419f764a (Add specialized object allocator, 2006-06-19), it
appears to have been used for demonstration purposes in that commit
message.

These might be handy to manually use in a debugger, but keeping them
and the "count" member of "alloc_state" just for that doesn't seem
worth it.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 alloc.c | 21 ---------------------
 alloc.h |  1 -
 2 files changed, 22 deletions(-)

diff --git a/alloc.c b/alloc.c
index 957a0af3626..27f697e4c87 100644
--- a/alloc.c
+++ b/alloc.c
@@ -27,7 +27,6 @@ union any_object {
 };
 
 struct alloc_state {
-	int count; /* total number of nodes allocated */
 	int nr;    /* number of nodes left in current allocation */
 	void *p;   /* first free node in current allocation */
 
@@ -63,7 +62,6 @@ static inline void *alloc_node(struct alloc_state *s, size_t node_size)
 		s->slabs[s->slab_nr++] = s->p;
 	}
 	s->nr--;
-	s->count++;
 	ret = s->p;
 	s->p = (char *)s->p + node_size;
 	memset(ret, 0, node_size);
@@ -122,22 +120,3 @@ void *alloc_commit_node(struct repository *r)
 	init_commit_node(c);
 	return c;
 }
-
-static void report(const char *name, unsigned int count, size_t size)
-{
-	fprintf(stderr, "%10s: %8u (%"PRIuMAX" kB)\n",
-			name, count, (uintmax_t) size);
-}
-
-#define REPORT(name, type)	\
-    report(#name, r->parsed_objects->name##_state->count, \
-		  r->parsed_objects->name##_state->count * sizeof(type) >> 10)
-
-void alloc_report(struct repository *r)
-{
-	REPORT(blob, struct blob);
-	REPORT(tree, struct tree);
-	REPORT(commit, struct commit);
-	REPORT(tag, struct tag);
-	REPORT(object, union any_object);
-}
diff --git a/alloc.h b/alloc.h
index 371d388b552..3f4a0ad310a 100644
--- a/alloc.h
+++ b/alloc.h
@@ -13,7 +13,6 @@ void init_commit_node(struct commit *c);
 void *alloc_commit_node(struct repository *r);
 void *alloc_tag_node(struct repository *r);
 void *alloc_object_node(struct repository *r);
-void alloc_report(struct repository *r);
 
 struct alloc_state *allocate_alloc_state(void);
 void clear_alloc_state(struct alloc_state *s);
-- 
2.35.1.1561.ge8eddc63765

Re: [PATCH v3 7/7] git-sh-setup: don't mark trees not used in-tree for i18n

[Phillip Wood]

Hi Ævar

On 28/03/2022 13:16, Ævar Arnfjörð Bjarmason wrote:
> 
> On Mon, Mar 28 2022, Johannes Sixt wrote:
> 
>> Am 27.03.22 um 13:15 schrieb Ævar Arnfjörð Bjarmason:
>>>
>>> On Sun, Mar 27 2022, Johannes Sixt wrote:
>>>
>>>> Am 26.03.22 um 18:14 schrieb Ævar Arnfjörð Bjarmason:
>>>>> Partially revert d323c6b6410 (i18n: git-sh-setup.sh: mark strings for
>>>>> translation, 2016-06-17).
>>>>>
>>>>> These strings are no longer used in-tree, and we shouldn't be wasting
>>>>> translator time on them for the benefit of a hypothetical out-of-tree
>>>>> user of git-sh-setup.sh.

The out of tree users of git-sh-setup.sh are not hypothetical, they 
exist and objected when you recently tried to remove these functions 
entirely[1].

>>>> There is public documentation for these functions. Hence, you must
>>>> assume that they are used in scripts outside of Git. Castrating their
>>>> functionality like this patch does is unacceptable.
>>>
>>> For require_clean_work_tree() the public documentation for this function
>>> states that it will emit a specific error message in English, and you're
>>> expected to Lego-interpolate a string that we'll concatenate with it:

The documentation does not say whether the message is translated or not, 
probably because it was not updated when the translations were added six 
years ago.

>>> 	[...]It emits an error message of the form `Cannot
>>>          <action>: <reason>. <hint>`, and dies.  Example:

This is not a promising a "specific error message in English"

>>> 	+
>>> 	----------------
>>> 	require_clean_work_tree rebase "Please commit or stash them."

This is an example message you cannot use that to argue that we will 
always show a message in English

>>> So I think that marking it for translation like this as d323c6b6410 was
>>> always broken in that it broke that documented promise.
>>
>> I can buy this argument. But then this must be a separate commit with
>> this justification.
> 
> Sure, I can elaborate on that point & split it up.
> 
>>> But that's just an argument for keeping the require_clean_work_tree()
>>> part of this patch, not require_work_tree_exists().
>>>
>>> For that one and others in git-sh-setup we've never said that we'd
>>> provide these translated (and to the extent we've implied anything about
>>> the rest, have strongly implied the opposite with
>>> require_clean_work_tree()'s docs).
>>>
>>> Nothing will break for out-of-tree users as a result of this
>>> change.

The strings the user sees will change

>>> When we added these functions and their documentation their
>>> output wouldn't be translated,

Where does the documentation say "the output will not be translated"?

>>> then sometimes it was, now it's not
>>> again.
>>
>> This does not sound convincing at all, but rather like "I want the code
>> to be so, and here is some handwaving to justify it". What is wrong with
>> the status quo?
> 
> The larger context for why I was looking at this again is that I'm
> trying to slowly get us to the point where we can remove the
> i18n-in-shellscript entirtely.
> 
> But I thought that was a rather large digression for the commit message,
> and that these being both unused, and not something the "public" API
> affected ever promised it would do was sufficient.

I think if that is what you want to do then you should propose a series 
that does just that and explains why it is desirable, rather than coming 
up with other reasons to justify the changes you want.

>>> We need also need to be mindful of translator time, it's a *lot* of
>>> strings to go through, and e.g. I've commented in the past on patches
>>> that marked stuff in t/helper/ for translation.
>>
>> Translator's time is your concern? No translator sifts through 5000
>> strings on every release. There are tools that show only new strings to
>> translate.
> 
> Yes, I'm the person who added this entire i18n infrastructure to git, I
> know how it works :)
> 
>> A text is translated once and then it lies under the radar
>> until someone changes it. Don't tell me that is time-consuming.
> 
> Yes, individual orphaned strings aren't, but they add up.
> 
> Just like having that "USE_PIC" comment in configure.ac isn't much of a
> big deal, but it makes sense to clean up unused code, just as we're
> adding new code.
> 
> I will say that your implicit proposal of keeping this forever instead
> is assuming that we won't have more translations for git, and every new
> translator will look at this.
> 
> Context is critical for translators, so even if it's one string it's a
> string you'll quickly grep for and find ... no uses for, and then likely
> go hunting around for where it's used only to (hopefully, in that case)
> find this thread. Better not to have it.
> 
>> On the other hand, there is a lot of *reviewer* time that you are
>> spending with changes like this. *That* should be your concern.
> 
> I'd think most of the that time, if any, will be spent on this
> sub-thread you started, so ... :)

This sub-tread exists because you posted this patch to the mailing list. 
Blaming reviewers for asking perfectly reasonable questions is neither 
fair nor helpful.

This patch does not remove dead code as the rest of the series does but 
instead changes user facing messages in code that we recently 
established is part of the public api[2]. Nothing has changed since that 
recent discussion so I'm confused as to why you are proposing to modify 
the api again so soon.

Best Wishes

Phillip

[1] 
https://lore.kernel.org/git/CAJm9OHfN9iXDt-rzu-wb=67y4PPpmCUgMfmZPy1JMBJkHG256g@mail.gmail.com/
[2] https://lore.kernel.org/git/xmqq5yvik8bc.fsf@gitster.g/

> Which isn't to say it shouldn't have been brought up, but from my
> perspective I was (and still am) making a rather small change that I
> think won't harm anyone in practice, and gives us some incremental
> tidyness & contributes to an eventual large "git rm git-sh-i18n.sh" et
> al.
> 
> But on reflection I don't think it's worth worrying about, and we can
> just do this change.
> 

Re: [PATCH v3 7/7] git-sh-setup: don't mark trees not used in-tree for i18n

[Ævar Arnfjörð Bjarmason]

On Thu, Mar 31 2022, Phillip Wood wrote:

[tl;dr: Reply below, but this whole thing should be addressed by the v4
I sent last night:
https://lore.kernel.org/git/cover-v4-0.6-00000000000-20220331T014349Z-avarab@gmail.com/

I.e. the controversial patch has been ejected].

> On 28/03/2022 13:16, Ævar Arnfjörð Bjarmason wrote:
>> On Mon, Mar 28 2022, Johannes Sixt wrote:
>> 
>>> Am 27.03.22 um 13:15 schrieb Ævar Arnfjörð Bjarmason:
>>>>
>>>> On Sun, Mar 27 2022, Johannes Sixt wrote:
>>>>
>>>>> Am 26.03.22 um 18:14 schrieb Ævar Arnfjörð Bjarmason:
>>>>>> Partially revert d323c6b6410 (i18n: git-sh-setup.sh: mark strings for
>>>>>> translation, 2016-06-17).
>>>>>>
>>>>>> These strings are no longer used in-tree, and we shouldn't be wasting
>>>>>> translator time on them for the benefit of a hypothetical out-of-tree
>>>>>> user of git-sh-setup.sh.
>
> The out of tree users of git-sh-setup.sh are not hypothetical, they
> exist and objected when you recently tried to remove these functions 
> entirely[1].

I see that what I wrote there is ambiguous, but I'm aware of that &
remember that thread. I meant to say the hypothetical user that cares
about the i18n these functions exposed.

>>>>> There is public documentation for these functions. Hence, you must
>>>>> assume that they are used in scripts outside of Git. Castrating their
>>>>> functionality like this patch does is unacceptable.
>>>>
>>>> For require_clean_work_tree() the public documentation for this function
>>>> states that it will emit a specific error message in English, and you're
>>>> expected to Lego-interpolate a string that we'll concatenate with it:
>
> The documentation does not say whether the message is translated or
> not, probably because it was not updated when the translations were
> added six years ago.

It does say it. It uses the word "Cannot" at the beginning, and promises
to emit that specific string.

Yes we didn't update it at the time for i18n, and probably should.

But to the extent that the gordian knot in making any changes to these
whatsoever is because they've been publicly documented I don't think
anyone using these has been promised different behavior. So it's highly
relevant here.

>>>> 	[...]It emits an error message of the form `Cannot
>>>>          <action>: <reason>. <hint>`, and dies.  Example:
>
> This is not a promising a "specific error message in English"

It really is. You cannot use this API to produce sensible output in any
other language. It was used like this:

    require_clean_work_tree "pull with rebase" "Please commit or stash them."

For which we'd emit:

    Cannot pull with rebase: You have unstaged changes.

    Please commit or stash them.

You can see e.g. in the Bulgarian translation that this was dealt with
by putting the interpolated string in double-quotes.

>>>> 	+
>>>> 	----------------
>>>> 	require_clean_work_tree rebase "Please commit or stash them."
>
> This is an example message you cannot use that to argue that we will
> always show a message in English

I'm saying that the documentation says it emits English, that it didn't
always do that, and now does so again.

And that to get it to emit anything sensible in cases where we're not
under LC_ALL=C would have required 1=1 matching the behavior of whatever
shellscript is using this to what git-sh-i18n in picking the locale.

I don't think it's plausible that there's an out-of-tree user
maintaining their own set of i18n'd po/ files which expect to interact
with our translations in this way.

Any out-of-tree user of this (if they're using this at all) will either
not care, or they'll see more sensible output again.

>>>> So I think that marking it for translation like this as d323c6b6410 was
>>>> always broken in that it broke that documented promise.
>>>
>>> I can buy this argument. But then this must be a separate commit with
>>> this justification.
>> Sure, I can elaborate on that point & split it up.
>> 
>>>> But that's just an argument for keeping the require_clean_work_tree()
>>>> part of this patch, not require_work_tree_exists().
>>>>
>>>> For that one and others in git-sh-setup we've never said that we'd
>>>> provide these translated (and to the extent we've implied anything about
>>>> the rest, have strongly implied the opposite with
>>>> require_clean_work_tree()'s docs).
>>>>
>>>> Nothing will break for out-of-tree users as a result of this
>>>> change.
>
> The strings the user sees will change

Yes, and I'll admit that "nothing will break here" on my part isn't the
same as saying "there will be no observable change whatsoever". Sorry
about being unclear there.

As a general matter we don't promise that such strings won't change,
even for die(), error() etc. messages emitted by plumbing commands.

Except in some rare cases where they've been known to be used out of
tree extensively, e.g. the human-readable "merge" messages where we
have/had no other API to expose the same information.

Or, in the case of plumbing output where such strings are part of the
API contract.

But for these commands in the "Internal helper commands" category I
think this fall squarely in the category of changing a random error(),
die() etc. in the C code (which we do quite freely).

>>>> When we added these functions and their documentation their
>>>> output wouldn't be translated,
>
> Where does the documentation say "the output will not be translated"?

I think this was covered above, it's sufficient that it didn't promise
that it would be, and in the one case where we discuss it in passing
with an example we imply that it won't be.

>>>> then sometimes it was, now it's not
>>>> again.
>>>
>>> This does not sound convincing at all, but rather like "I want the code
>>> to be so, and here is some handwaving to justify it". What is wrong with
>>> the status quo?
>> The larger context for why I was looking at this again is that I'm
>> trying to slowly get us to the point where we can remove the
>> i18n-in-shellscript entirtely.
>> But I thought that was a rather large digression for the commit
>> message,
>> and that these being both unused, and not something the "public" API
>> affected ever promised it would do was sufficient.
>
> I think if that is what you want to do then you should propose a
> series that does just that and explains why it is desirable, rather
> than coming up with other reasons to justify the changes you want.

Just because I start looking at some code for reason X that doesn't mean
that submitting a patch with rationale Y isn't a sufficient reason to
make that change.

I still think that in this case that they're not used by our own i18n
effort is a perfectly sufficient reason to make the change, as we won't
waste translator time in it. I.e. I'll still stand behind the stated
rationale.

But aside from that most changes I made to git are with an eye to some
larger semi-related goal.

I do have some WIP changes to tear down most of the *.sh and *.perl i18n
infrastructure (the parts still in use would still have translations),
and IIRC it's at least a 2k line negative diffstat, and enables us to do
more interesting things in i18n (e.g. getting rid of the libintl
dependency).

But I also don't think that such a series is probably not possible in
the near term if we're going to insist that all shellscript output must
byte-for-byte be the same (for boring reasons I won't go into, but it's
mainly to do with sh-i18n--envsubst.c).

So it's also a bit of a chicke & egg problem. I wanted to send any such
UI changes in first, to see if it was even worth finishing up that work,
or if the whole thing would stall on not being able to change some
output someone somewhere might have relied on being byte-for-byte the
same.

>>>> We need also need to be mindful of translator time, it's a *lot* of
>>>> strings to go through, and e.g. I've commented in the past on patches
>>>> that marked stuff in t/helper/ for translation.
>>>
>>> Translator's time is your concern? No translator sifts through 5000
>>> strings on every release. There are tools that show only new strings to
>>> translate.
>> Yes, I'm the person who added this entire i18n infrastructure to
>> git, I
>> know how it works :)
>> 
>>> A text is translated once and then it lies under the radar
>>> until someone changes it. Don't tell me that is time-consuming.
>> Yes, individual orphaned strings aren't, but they add up.
>> Just like having that "USE_PIC" comment in configure.ac isn't much
>> of a
>> big deal, but it makes sense to clean up unused code, just as we're
>> adding new code.
>> I will say that your implicit proposal of keeping this forever
>> instead
>> is assuming that we won't have more translations for git, and every new
>> translator will look at this.
>> Context is critical for translators, so even if it's one string it's
>> a
>> string you'll quickly grep for and find ... no uses for, and then likely
>> go hunting around for where it's used only to (hopefully, in that case)
>> find this thread. Better not to have it.
>> 
>>> On the other hand, there is a lot of *reviewer* time that you are
>>> spending with changes like this. *That* should be your concern.
>> I'd think most of the that time, if any, will be spent on this
>> sub-thread you started, so ... :)
>
> This sub-tread exists because you posted this patch to the mailing
> list. Blaming reviewers for asking perfectly reasonable questions is
> neither fair nor helpful.

I didn't mean any offense there, but did mean to suggest (smiley an all)
that a mountain was being made out a molehill in this case.

Yes translator time is my concern. I started the i18n effort in git, and
I think it's really important. We currently have 18 translations of git
in the po/ directory, 16 if you leave out "dialects". Which if you
compare it with
https://en.wikipedia.org/wiki/List_of_languages_by_number_of_native_speakers
is quite bad.

For comparison I worked extensively on MediaWiki in a past life, which
at the time had at least 100 such translations. I looked again and it's
up to around 600 (many incomplete, to be fair).

Is that our fault as project? No, but we could definitely help it along.

I value the scarcity of translator time (including future translations)
much more than concerns that there *may be* someone somewhere who's got
a reliance on this particular output.

> This patch does not remove dead code as the rest of the series does
> but instead changes user facing messages in code that we recently 
> established is part of the public api[2]. Nothing has changed since
> that recent discussion so I'm confused as to why you are proposing to
> modify the api again so soon.

As noted above I don't think that previous discussion applies to these
changes as you describe, but in any case, ~8 hours before you sent this
reply I sent a v4 re-roll which left out this change:

    https://lore.kernel.org/git/cover-v4-0.6-00000000000-20220331T014349Z-avarab@gmail.com/

Which I hope will address your & Johannes Sixt's concerns here. Does the
rest of this series look good to you?

Re: [PATCH v3 7/7] git-sh-setup: don't mark trees not used in-tree for i18n

[Johannes Sixt]

Am 31.03.22 um 13:15 schrieb Ævar Arnfjörð Bjarmason:
> I do have some WIP changes to tear down most of the *.sh and *.perl i18n
> infrastructure (the parts still in use would still have translations),
> and IIRC it's at least a 2k line negative diffstat, and enables us to do
> more interesting things in i18n (e.g. getting rid of the libintl
> dependency).

Why? Why? Why? Does the status quo have a problem somewhere? All this
sounds like a change for the sake of change.

> But I also don't think that such a series is probably not possible in
> the near term if we're going to insist that all shellscript output must
> byte-for-byte be the same (for boring reasons I won't go into, but it's
> mainly to do with sh-i18n--envsubst.c).

Such an insistence can easily be lifted if the change is justified
sufficiently. I haven't seen such a justification, yet.

-- Hannes

Re: [PATCH v4 1/6] run-command.h: remove always unused "clean_on_exit_handler_cbdata"

[Junio C Hamano]

Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:

> Remove a "struct child_process" member added in
> ac2fbaa674c (run-command: add clean_on_exit_handler, 2016-10-16), but
> which was never used.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
>  run-command.h | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/run-command.h b/run-command.h
> index 07bed6c31b4..5bd0c933e80 100644
> --- a/run-command.h
> +++ b/run-command.h
> @@ -142,7 +142,6 @@ struct child_process {
>  	unsigned clean_on_exit:1;
>  	unsigned wait_after_clean:1;
>  	void (*clean_on_exit_handler)(struct child_process *process);
> -	void *clean_on_exit_handler_cbdata;
>  };
>  
>  #define CHILD_PROCESS_INIT { \

Thanks for digging.  Looks good.

Re: [PATCH v4 4/6] pack-bitmap-write: remove unused bitmap_reset() function

[Junio C Hamano]

Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:

> This function hasn't been used since 449fa5ee069 (pack-bitmap-write:
> ignore BITMAP_FLAG_REUSE, 2020-12-08), which was a cleanup commit
> intending to get rid of the code around the reusing of bitmaps.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
>  ewah/bitmap.c | 5 -----
>  ewah/ewok.h   | 1 -
>  2 files changed, 6 deletions(-)
>
> diff --git a/ewah/bitmap.c b/ewah/bitmap.c
> index 38a47c44db4..87d5cc8fa30 100644
> --- a/ewah/bitmap.c
> +++ b/ewah/bitmap.c
> @@ -216,11 +216,6 @@ int bitmap_is_subset(struct bitmap *self, struct bitmap *other)
>  	return 0;
>  }
>  
> -void bitmap_reset(struct bitmap *bitmap)
> -{
> -	memset(bitmap->words, 0x0, bitmap->word_alloc * sizeof(eword_t));
> -}
> -

It is kind of surprising that we used to want to "clear" a bitmap
array but no longer do so (read: "we may not use it right now, but
will we soon miss it?"), but the code removed here is simple,
obvious and trivial enough that anybody we does want to use it can
easily reinvent it.

So far, all patches look quite sensible.

Thanks.



>  void bitmap_free(struct bitmap *bitmap)
>  {
>  	if (bitmap == NULL)
> diff --git a/ewah/ewok.h b/ewah/ewok.h
> index 66920965da1..7eb8b9b6301 100644
> --- a/ewah/ewok.h
> +++ b/ewah/ewok.h
> @@ -177,7 +177,6 @@ struct bitmap *bitmap_dup(const struct bitmap *src);
>  void bitmap_set(struct bitmap *self, size_t pos);
>  void bitmap_unset(struct bitmap *self, size_t pos);
>  int bitmap_get(struct bitmap *self, size_t pos);
> -void bitmap_reset(struct bitmap *self);
>  void bitmap_free(struct bitmap *self);
>  int bitmap_equals(struct bitmap *self, struct bitmap *other);
>  int bitmap_is_subset(struct bitmap *self, struct bitmap *other);

Re: [PATCH v3 7/7] git-sh-setup: don't mark trees not used in-tree for i18n

[Ævar Arnfjörð Bjarmason]

On Thu, Mar 31 2022, Johannes Sixt wrote:

> Am 31.03.22 um 13:15 schrieb Ævar Arnfjörð Bjarmason:
>> I do have some WIP changes to tear down most of the *.sh and *.perl i18n
>> infrastructure (the parts still in use would still have translations),
>> and IIRC it's at least a 2k line negative diffstat, and enables us to do
>> more interesting things in i18n (e.g. getting rid of the libintl
>> dependency).
>
> Why? Why? Why? Does the status quo have a problem somewhere? All this
> sounds like a change for the sake of change.

So this is quite the digression, but, hey, you asked for it.

We don't have translations universally available because libintl is a
rather heavy thing to ship.

I don't personally mind linking against it for my own builds, but grep
for NO_GETTEXT in our tree & history for some of the workarounds.

We're also heading towards being able to build a stand-alone git binary
for most things, which makes shipping in various setups much easier, but
libintl is more of an "old-school" *nix library.

You need to ferry around auxilliary *.mo files, and for the *.sh and
*.perl translations we need gettext.sh, /usr/bin/gettext and
Locale::Messages (and everything that brings in).

I'd like translations for Git to Just Work, including if you're in some
random docker image with someone's home-built git. Giving people fewer
reasons to enable it improves accessibility. A lot of people who use git
are not on their own personal laptop, but on some setup (corporate, CI
etc.) that they don't fully control.

The gettext model & libintl is also just bad at various use-cases I
think would make sense to support.

E.g. having a configurable option to emit output in two languages at the
same time, either because you'd both like to understand the output &
e.g. search errors online, or you'd understand more from a union of say
German an English than from just one or the other.

For libintl you need'd to juggle setlocale() in the middle of your
underlying sprintf implementation to do that, or pull other shenanigans
of bypassing its API (e.g. directly reading the *.mo files), which
pretty much amounts to the same thing.

So essentially I wanted to hack up something that would just
post-process output like this:

    msgunfmt --strict -s -w 0 -i -E --color=always po/build/locale/de/LC_MESSAGES/git.mo

And turn it into a lang-de.c file, for which we'd make a lang-de.o that
we'd link in. And then either binary search through it, or just generate
code we'd compile (one really big switch/case statement).

Now, if you count the number of messages we translate in *.sh land on
your digits you won't even need to use all of our toes, and for the
*.perl it's similar, especially with add--interactive.perl going away
any day now.

There isn't any fundamental obstacle to making such a thing portable to
*.sh and *.perl, but having gotten that particular interop working once
in the past needing to do that again would bring this (I think
worthwhile) project from a "maybe someday" to "nah".

>> But I also don't think that such a series is probably not possible in
>> the near term if we're going to insist that all shellscript output must
>> byte-for-byte be the same (for boring reasons I won't go into, but it's
>> mainly to do with sh-i18n--envsubst.c).
>
> Such an insistence can easily be lifted if the change is justified
> sufficiently. I haven't seen such a justification, yet.

Sure, but re the "chicken & egg" problem I might do all the work to do
all that, and someone such as yourself might rightly point out that it
would break someone's obscure use-case, scuttling the whole thing.

Which isn't an exaggeration b.t.w., if you e.g. look through our
remaining gettext.sh usage you'll find that we carry the entirety of
sh-i18n--ensubst.c and everything around it (at least ~1k lines) for
emitting a single word in a single message in git-sh-setup.sh, that's
it.

Because the whole reason eval_gettext exists, and everything to support
it, is to support the use-case of feeding *arbitrary input* into the
translation engine, i.e. not the string you yourself have in your source
code & trust (it avoids shell "eval").

But if you think that's of paramount importance (that word is "usage"
b.t.w., and the equivalent in usage.c isn't even translated) there
wouldn't be any way to make forward progress towards the next step of
making the remaining shellscript translations call some "git sh--i18n"
helper to get their output.

So, to the extent that I was going to pursue the above plan at all I
wanted to do it in small steps, especially now as git-submodule.sh et al
are going away.

So.

It would be nice to get some leeway in some areas, especially for
something like this where I implemented this entire i18n system to begin
with, so I'd think it would be clear that it's not some drive-by
contribution. I clearly care about the end-goal, and have been sticking
with this particular topic for more than a decade.

Not everything can always be a single atomically understood patch that
carries all possible reasons to make the change with it, some things are
more of a longer term incremental effort.

And since we all have limited time on this spinning ball of mud
sometimes it can make sense to trickle in initial changes to see if some
larger end-goal is even attainable, or will be blocked due to some
unforeseen (or underestimated) reasons.

Thanks.

Re: [PATCH v3 7/7] git-sh-setup: don't mark trees not used in-tree for i18n

[Johannes Sixt]

Am 02.04.22 um 12:44 schrieb Ævar Arnfjörð Bjarmason:
> 
> On Thu, Mar 31 2022, Johannes Sixt wrote:
> 
>> Am 31.03.22 um 13:15 schrieb Ævar Arnfjörð Bjarmason:
>>> I do have some WIP changes to tear down most of the *.sh and *.perl i18n
>>> infrastructure (the parts still in use would still have translations),
>>> and IIRC it's at least a 2k line negative diffstat, and enables us to do
>>> more interesting things in i18n (e.g. getting rid of the libintl
>>> dependency).
>>
>> Why? Why? Why? Does the status quo have a problem somewhere? All this
>> sounds like a change for the sake of change.
> 
> So this is quite the digression, but, hey, you asked for it.

Oh, no, this is not a digression *at all*. What your write below is the
kind of text that is needed to judge the value of a change. Without it,
a change that does not have an otherwise obvious improvement[*] is just
for the change's sake.

[*] In my book, getting rid of a libintl dependency is not an obvious
improvement. I may be biased in this case, because that dependency was
never a problem for me. Might be because my personal builds all have
NO_GETTEXT set.

> We don't have translations universally available because libintl is a
> rather heavy thing to ship.
> 
> I don't personally mind linking against it for my own builds, but grep
> for NO_GETTEXT in our tree & history for some of the workarounds.
> 
> We're also heading towards being able to build a stand-alone git binary
> for most things, which makes shipping in various setups much easier, but
> libintl is more of an "old-school" *nix library.
> 
> You need to ferry around auxilliary *.mo files, and for the *.sh and
> *.perl translations we need gettext.sh, /usr/bin/gettext and
> Locale::Messages (and everything that brings in).
> 
> I'd like translations for Git to Just Work, including if you're in some
> random docker image with someone's home-built git. Giving people fewer
> reasons to enable it improves accessibility. A lot of people who use git
> are not on their own personal laptop, but on some setup (corporate, CI
> etc.) that they don't fully control.
> 
> The gettext model & libintl is also just bad at various use-cases I
> think would make sense to support.
> 
> E.g. having a configurable option to emit output in two languages at the
> same time, either because you'd both like to understand the output &
> e.g. search errors online, or you'd understand more from a union of say
> German an English than from just one or the other.
> 
> For libintl you need'd to juggle setlocale() in the middle of your
> underlying sprintf implementation to do that, or pull other shenanigans
> of bypassing its API (e.g. directly reading the *.mo files), which
> pretty much amounts to the same thing.
> 
> So essentially I wanted to hack up something that would just
> post-process output like this:
> 
>     msgunfmt --strict -s -w 0 -i -E --color=always po/build/locale/de/LC_MESSAGES/git.mo
> 
> And turn it into a lang-de.c file, for which we'd make a lang-de.o that
> we'd link in. And then either binary search through it, or just generate
> code we'd compile (one really big switch/case statement).
> 
> Now, if you count the number of messages we translate in *.sh land on
> your digits you won't even need to use all of our toes, and for the
> *.perl it's similar, especially with add--interactive.perl going away
> any day now.
> 
> There isn't any fundamental obstacle to making such a thing portable to
> *.sh and *.perl, but having gotten that particular interop working once
> in the past needing to do that again would bring this (I think
> worthwhile) project from a "maybe someday" to "nah".

Just to make it clear: I am totally neutral on your goal. It's on others
to tell whether this is worth doing.

>>> But I also don't think that such a series is probably not possible in
>>> the near term if we're going to insist that all shellscript output must
>>> byte-for-byte be the same (for boring reasons I won't go into, but it's
>>> mainly to do with sh-i18n--envsubst.c).
>>
>> Such an insistence can easily be lifted if the change is justified
>> sufficiently. I haven't seen such a justification, yet.
> 
> Sure, but re the "chicken & egg" problem I might do all the work to do
> all that, and someone such as yourself might rightly point out that it
> would break someone's obscure use-case, scuttling the whole thing.
> 
> Which isn't an exaggeration b.t.w., if you e.g. look through our
> remaining gettext.sh usage you'll find that we carry the entirety of
> sh-i18n--ensubst.c and everything around it (at least ~1k lines) for
> emitting a single word in a single message in git-sh-setup.sh, that's
> it.

See, someone thought it was a good idea to have i18n in shell scripts
and others agreed that it was worth having ~1k lines of code to do that.
So the code went in. From then on, these ~1k lines are *not a problem*
in themselves. From then on, the decision of having ~1k lines or not
having them can only be based on what effect they have, but no longer on
"oh, wow, that's 1k lines to write a single word; do we really want that"?

> 
> Because the whole reason eval_gettext exists, and everything to support
> it, is to support the use-case of feeding *arbitrary input* into the
> translation engine, i.e. not the string you yourself have in your source
> code & trust (it avoids shell "eval").
> 
> But if you think that's of paramount importance (that word is "usage"
> b.t.w., and the equivalent in usage.c isn't even translated) there
> wouldn't be any way to make forward progress towards the next step of
> making the remaining shellscript translations call some "git sh--i18n"
> helper to get their output.
> 
> So, to the extent that I was going to pursue the above plan at all I
> wanted to do it in small steps, especially now as git-submodule.sh et al
> are going away.
> 
> So.
> 
> It would be nice to get some leeway in some areas, especially for
> something like this where I implemented this entire i18n system to begin
> with, so I'd think it would be clear that it's not some drive-by
> contribution. I clearly care about the end-goal, and have been sticking
> with this particular topic for more than a decade.
> 
> Not everything can always be a single atomically understood patch that
> carries all possible reasons to make the change with it, some things are
> more of a longer term incremental effort.
> 
> And since we all have limited time on this spinning ball of mud
> sometimes it can make sense to trickle in initial changes to see if some
> larger end-goal is even attainable, or will be blocked due to some
> unforeseen (or underestimated) reasons.

You can't have leeway for a change whose conclusion is "removes some
miniscule feature". But if you add "Here is the secret plan to Scrat's
golden nut; let's start with this change, even though it removes some
miniscule feature", things are vastly different.

-- Hannes

Re: [PATCH v3 7/7] git-sh-setup: don't mark trees not used in-tree for i18n

[Ævar Arnfjörð Bjarmason]

On Sat, Apr 02 2022, Johannes Sixt wrote:

> Am 02.04.22 um 12:44 schrieb Ævar Arnfjörð Bjarmason:
>> 
>> On Thu, Mar 31 2022, Johannes Sixt wrote:
>> 
>>> Am 31.03.22 um 13:15 schrieb Ævar Arnfjörð Bjarmason:
>>>> I do have some WIP changes to tear down most of the *.sh and *.perl i18n
>>>> infrastructure (the parts still in use would still have translations),
>>>> and IIRC it's at least a 2k line negative diffstat, and enables us to do
>>>> more interesting things in i18n (e.g. getting rid of the libintl
>>>> dependency).
>>>
>>> Why? Why? Why? Does the status quo have a problem somewhere? All this
>>> sounds like a change for the sake of change.
>> 
>> So this is quite the digression, but, hey, you asked for it.
>
> Oh, no, this is not a digression *at all*. What your write below is the
> kind of text that is needed to judge the value of a change. Without it,
> a change that does not have an otherwise obvious improvement[*] is just
> for the change's sake.

Well let's be clear here.

It's been your claim that the proposed change must not be worth doing
because you don't place the same value on having a 1=1 mapping between
strings we ask translators to work on, and those that we'll actually
present as part of git's UI.

Which is fair enough, and something we can respectfully disagree on.

But that's not the same as claiming that the stated reason for the
upthread patch is incomplete or insufficient.

I can tell you that as the person who implemented this whole i18n
facility that providing translations for someone's random shellscript
was never the point, at all.

It just so happens that because we implemented some bits of
functionality of the porcelain as shellscripts, and at the same time had
a shellscript library which (regrettably or not) seems to invite both
in-tree and out-of-tree users to use it,that the two went hand-in-hand.

But now that they don't anymore I don't see anything "handwaving" about
simply removing the translation markings. I don't think they serve any
purpose anymore.

> [*] In my book, getting rid of a libintl dependency is not an obvious
> improvement. I may be biased in this case, because that dependency was
> never a problem for me. Might be because my personal builds all have
> NO_GETTEXT set.

So not only don't you use a translated version of git, but you don't
even compile one with it?

Yes, I can imagine that hasn't exposed you to any of the problems with
it :)

>>>> But I also don't think that such a series is probably not possible in
>>>> the near term if we're going to insist that all shellscript output must
>>>> byte-for-byte be the same (for boring reasons I won't go into, but it's
>>>> mainly to do with sh-i18n--envsubst.c).
>>>
>>> Such an insistence can easily be lifted if the change is justified
>>> sufficiently. I haven't seen such a justification, yet.
>> 
>> Sure, but re the "chicken & egg" problem I might do all the work to do
>> all that, and someone such as yourself might rightly point out that it
>> would break someone's obscure use-case, scuttling the whole thing.
>> 
>> Which isn't an exaggeration b.t.w., if you e.g. look through our
>> remaining gettext.sh usage you'll find that we carry the entirety of
>> sh-i18n--ensubst.c and everything around it (at least ~1k lines) for
>> emitting a single word in a single message in git-sh-setup.sh, that's
>> it.
>
> See, someone thought it was a good idea to have i18n in shell scripts
> and others agreed that it was worth having ~1k lines of code to do that.
> So the code went in. From then on, these ~1k lines are *not a problem*
> in themselves. From then on, the decision of having ~1k lines or not
> having them can only be based on what effect they have, but no longer on
> "oh, wow, that's 1k lines to write a single word; do we really want that"?

Aside from i18n. I don't agree with that in general.

Yes, code that's in-tree and working needs to be under less scrutiny as
a new addition, and refactoring something isn't always worth it. We'll
also need to review the removals.

But there's also a cost to keeping things around, as you can e.g. see
from various portability and correctness fixes to this code we've
perma-forked from the GNU GPLv2 version.

There's some tipping point wherea refactoring isn't worth it, but
emitting the word "usage" with ~1k lines is a pretty clear candidate in
my mind for a "git rm".

>> Because the whole reason eval_gettext exists, and everything to support
>> it, is to support the use-case of feeding *arbitrary input* into the
>> translation engine, i.e. not the string you yourself have in your source
>> code & trust (it avoids shell "eval").
>> 
>> But if you think that's of paramount importance (that word is "usage"
>> b.t.w., and the equivalent in usage.c isn't even translated) there
>> wouldn't be any way to make forward progress towards the next step of
>> making the remaining shellscript translations call some "git sh--i18n"
>> helper to get their output.
>> 
>> So, to the extent that I was going to pursue the above plan at all I
>> wanted to do it in small steps, especially now as git-submodule.sh et al
>> are going away.
>> 
>> So.
>> 
>> It would be nice to get some leeway in some areas, especially for
>> something like this where I implemented this entire i18n system to begin
>> with, so I'd think it would be clear that it's not some drive-by
>> contribution. I clearly care about the end-goal, and have been sticking
>> with this particular topic for more than a decade.
>> 
>> Not everything can always be a single atomically understood patch that
>> carries all possible reasons to make the change with it, some things are
>> more of a longer term incremental effort.
>> 
>> And since we all have limited time on this spinning ball of mud
>> sometimes it can make sense to trickle in initial changes to see if some
>> larger end-goal is even attainable, or will be blocked due to some
>> unforeseen (or underestimated) reasons.
>
> You can't have leeway for a change whose conclusion is "removes some
> miniscule feature". But if you add "Here is the secret plan to Scrat's
> golden nut; let's start with this change, even though it removes some
> miniscule feature", things are vastly different.

I mean leeway on the topic that I probably have some idea of what I'm
talking about when it comes to git's i18n support, and whether it's
worth the effort to keep certain things around or not.

I.e. you started this thread by claiming that the removal of these
translations would be "castrating [out-of-tree] functionality, [which
is] unacceptable.".

As noted above I don't think that assessment is correct, and if I'm
understanding you correctly you don't even use git's i18n mechanism at
all.

Which I think presents only two possible conclusions.

One is that I, the person who added the i18n mechanism in the first
place, am so clueless about how it work or what it's for, that I'm
(intentionally or not) submitting patches that "castrate" it.

The other is that you've understandably missed some of the nuance, such
as why we're even marking strings for translation, and what the intended
audience of them.

Re: [PATCH v3 7/7] git-sh-setup: don't mark trees not used in-tree for i18n

[Johannes Sixt]

Please appologize that I do not reply to your arguments directly. I
think I have said all I can. Perhaps I am unable to express my concerns
sufficiently clearly.

-- Hannes