git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v5 4/5] pack-bitmap.c: retrieve missing i18n translations

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Jun 28, 2022, 08:58 UTC
Message-ID
<220628.86sfnpf96x.gmgdl@evledraar.gmail.com>
In-Reply-To
<065b7c9ccb5a412526a934f9b67c8be64a40fc7f.1656403084.git.dyroneteng@gmail.com>
On Tue, Jun 28 2022, Teng Long wrote:
> In pack-bitmap.c, some printed texts are translated,some are not.
> Let's support the translations of the bitmap related output.

Usually we don't go for cleanup-while-at-it, but in this case we're marking messages that don't conform to our CodingGudielines for translation, mostly because they're error messages that start with an upper-case letter.

So I think we should fix those issues first, to avoid double-work for translators (well, a bit less, since they're the translation memory, but it's quite a bit of churn...).

> -		error("Failed to load bitmap index (corrupted?)");
> +		error(_("Failed to load bitmap index (corrupted?)"));
e.g. here.
> -		return error("Corrupted bitmap index (too small)");
> +		return error(_("Corrupted bitmap index (too small)"));
..and here, etc. etc.
> -		return error("Unsupported version for bitmap index file (%d)", index->version);
> +		return error(_("Unsupported version for bitmap index file (%d)"), index->version);
Let's say "unsupported version '%d' for ..." instead?
> -			return error("Unsupported options for bitmap index file "
> -				"(Git requires BITMAP_OPT_FULL_DAG)");
> +			return error(_("Unsupported options for bitmap index file "
> +				"(Git requires BITMAP_OPT_FULL_DAG)"));
I'm not sure, but shouldn't this be a BUG()?
> -		error("Duplicate entry in bitmap index: %s", oid_to_hex(oid));
> +		error(_("Duplicate entry in bitmap index: %s"), oid_to_hex(oid));
Ditto upper-case, but add '%s' while at it.
>  	if (!strip_suffix(p->pack_name, ".pack", &len))
> -		BUG("pack_name does not end in .pack");
> +		BUG(_("pack_name does not end in .pack"));
Do not translate BUG() messages.
> -		warning("ignoring extra bitmap file: %s", buf.buf);
> +		warning(_("ignoring extra bitmap file: %s"), buf.buf);
Quote the name.
> -		warning("ignoring extra bitmap file: %s", packfile->pack_name);
> +		warning(_("ignoring extra bitmap file: %s"), packfile->pack_name);
ditto.
>  		if (prepare_revision_walk(revs))
> -			die("revision walk setup failed");
> +			die(_("revision walk setup failed"));

Looks good, but aside from this we should really have a tree-wide xprepare_revision_walk() or something, we have this copy/pasted all over the place...

> -		BUG("filter_bitmap_tree_depth given non-zero limit");
> +		BUG(_("filter_bitmap_tree_depth given non-zero limit"));
Ditto BUG.
Show 19 quoted lines
>  
>  	filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter,
>  				   OBJ_TREE);
> @@ -1148,7 +1148,7 @@ static void filter_bitmap_object_type(struct bitmap_index *bitmap_git,
>  				      enum object_type object_type)
>  {
>  	if (object_type < OBJ_COMMIT || object_type > OBJ_TAG)
> -		BUG("filter_bitmap_object_type given invalid object");
> +		BUG(_("filter_bitmap_object_type given invalid object"));
>  
>  	if (object_type != OBJ_TAG)
>  		filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter, OBJ_TAG);
> @@ -1304,14 +1304,14 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
>  		revs->ignore_missing_links = 0;
>  
>  		if (haves_bitmap == NULL)
> -			BUG("failed to perform bitmap walk");
> +			BUG(_("failed to perform bitmap walk"));
>  	}
etc. etc.
Show 16 quoted lines
>  
>  	wants_bitmap = find_objects(bitmap_git, revs, wants, haves_bitmap,
>  				    filter);
>  
>  	if (!wants_bitmap)
> -		BUG("failed to perform bitmap walk");
> +		BUG(_("failed to perform bitmap walk"));
>  
>  	if (haves_bitmap)
>  		bitmap_and_not(wants_bitmap, haves_bitmap);
> @@ -1432,7 +1432,7 @@ uint32_t midx_preferred_pack(struct bitmap_index *bitmap_git)
>  {
>  	struct multi_pack_index *m = bitmap_git->midx;
>  	if (!m)
> -		BUG("midx_preferred_pack: requires non-empty MIDX");
> +		BUG(_("midx_preferred_pack: requires non-empty MIDX"));
etc. etc.
Show 22 quoted lines
>  	return nth_midxed_pack_int_id(m, pack_pos_to_midx(bitmap_git->midx, 0));
>  }
>  
> @@ -1629,15 +1629,15 @@ static void test_bitmap_type(struct bitmap_test_data *tdata,
>  	}
>  
>  	if (bitmap_type == OBJ_NONE)
> -		die("object %s not found in type bitmaps",
> +		die(_("object %s not found in type bitmaps"),
>  		    oid_to_hex(&obj->oid));
>  
>  	if (bitmaps_nr > 1)
> -		die("object %s does not have a unique type",
> +		die(_("object %s does not have a unique type"),
>  		    oid_to_hex(&obj->oid));
>  
>  	if (bitmap_type != obj->type)
> -		die("object %s: real type %s, expected: %s",
> +		die(_("object %s: real type %s, expected: %s"),
>  		    oid_to_hex(&obj->oid),
>  		    type_name(obj->type),
>  		    type_name(bitmap_type));
quote %s for these.
Show 6 quoted lines
> @@ -1651,7 +1651,7 @@ static void test_show_object(struct object *object, const char *name,
>  
>  	bitmap_pos = bitmap_position(tdata->bitmap_git, &object->oid);
>  	if (bitmap_pos < 0)
> -		die("Object not in bitmap: %s\n", oid_to_hex(&object->oid));
> +		die(_("Object not in bitmap: %s\n"), oid_to_hex(&object->oid));
Lose the \n here, in addition to lower-case & quote %s.
Show 9 quoted lines
>  	test_bitmap_type(tdata, object, bitmap_pos);
>  
>  	bitmap_set(tdata->base, bitmap_pos);
> @@ -1666,7 +1666,7 @@ static void test_show_commit(struct commit *commit, void *data)
>  	bitmap_pos = bitmap_position(tdata->bitmap_git,
>  				     &commit->object.oid);
>  	if (bitmap_pos < 0)
> -		die("Object not in bitmap: %s\n", oid_to_hex(&commit->object.oid));
> +		die(_("Object not in bitmap: %s\n"), oid_to_hex(&commit->object.oid));
Ditto.
Show 50 quoted lines
>  	test_bitmap_type(tdata, &commit->object, bitmap_pos);
>  
>  	bitmap_set(tdata->base, bitmap_pos);
> @@ -1683,26 +1683,26 @@ void test_bitmap_walk(struct rev_info *revs)
>  	struct ewah_bitmap *bm;
>  
>  	if (!(bitmap_git = prepare_bitmap_git(revs->repo)))
> -		die("failed to load bitmap indexes");
> +		die(_("failed to load bitmap indexes"));
>  
>  	if (revs->pending.nr != 1)
> -		die("you must specify exactly one commit to test");
> +		die(_("you must specify exactly one commit to test"));
>  
> -	fprintf(stderr, "Bitmap v%d test (%d entries loaded)\n",
> +	fprintf(stderr, _("Bitmap v%d test (%d entries loaded)\n"),
>  		bitmap_git->version, bitmap_git->entry_count);
>  
>  	root = revs->pending.objects[0].item;
>  	bm = bitmap_for_commit(bitmap_git, (struct commit *)root);
>  
>  	if (bm) {
> -		fprintf(stderr, "Found bitmap for %s. %d bits / %08x checksum\n",
> +		fprintf(stderr, _("Found bitmap for %s. %d bits / %08x checksum\n"),
>  			oid_to_hex(&root->oid), (int)bm->bit_size, ewah_checksum(bm));
>  
>  		result = ewah_to_bitmap(bm);
>  	}
>  
>  	if (result == NULL)
> -		die("Commit %s doesn't have an indexed bitmap", oid_to_hex(&root->oid));
> +		die(_("Commit %s doesn't have an indexed bitmap"), oid_to_hex(&root->oid));
>  
>  	revs->tag_objects = 1;
>  	revs->tree_objects = 1;
> @@ -1711,7 +1711,7 @@ void test_bitmap_walk(struct rev_info *revs)
>  	result_popcnt = bitmap_popcount(result);
>  
>  	if (prepare_revision_walk(revs))
> -		die("revision walk setup failed");
> +		die(_("revision walk setup failed"));
>  
>  	tdata.bitmap_git = bitmap_git;
>  	tdata.base = bitmap_new();
> @@ -1719,7 +1719,7 @@ void test_bitmap_walk(struct rev_info *revs)
>  	tdata.trees = ewah_to_bitmap(bitmap_git->trees);
>  	tdata.blobs = ewah_to_bitmap(bitmap_git->blobs);
>  	tdata.tags = ewah_to_bitmap(bitmap_git->tags);
> -	tdata.prg = start_progress("Verifying bitmap entries", result_popcnt);
> +	tdata.prg = start_progress(_("Verifying bitmap entries"), result_popcnt);
Good catch!
Show 9 quoted lines
>  	tdata.seen = 0;
>  
>  	traverse_commit_list(revs, &test_show_commit, &test_show_object, &tdata);
> @@ -1727,9 +1727,9 @@ void test_bitmap_walk(struct rev_info *revs)
>  	stop_progress(&tdata.prg);
>  
>  	if (bitmap_equals(result, tdata.base))
> -		fprintf(stderr, "OK!\n");
> +		fprintf(stderr, _("OK!\n"));
Ditto don't include \n.
Show 24 quoted lines
>  	else
> -		die("mismatch in bitmap results");
> +		die(_("mismatch in bitmap results"));
>  
>  	bitmap_free(result);
>  	bitmap_free(tdata.base);
> @@ -1747,7 +1747,7 @@ int test_bitmap_commits(struct repository *r)
>  	MAYBE_UNUSED void *value;
>  
>  	if (!bitmap_git)
> -		die("failed to load bitmap indexes");
> +		die(_("failed to load bitmap indexes"));
>  
>  	kh_foreach(bitmap_git->bitmaps, oid, value, {
>  		printf("%s\n", oid_to_hex(&oid));
> @@ -1825,8 +1825,8 @@ uint32_t *create_bitmap_mapping(struct bitmap_index *bitmap_git,
>  	if (!bitmap_is_midx(bitmap_git))
>  		load_reverse_index(bitmap_git);
>  	else if (load_midx_revindex(bitmap_git->midx) < 0)
> -		BUG("rebuild_existing_bitmaps: missing required rev-cache "
> -		    "extension");
> +		BUG(_("rebuild_existing_bitmaps: missing required rev-cache "
> +		    "extension"));
>  
Ditto don't translate BUG().
Previous: Teng LongNext: Eric Sunshine
Message 69 of 128 in “trace2 output for bitmap decision path”
  1. 0/3 trace2 output for bitmap decision pathTeng Long, Mar 24, 2022
  2. 1/3 pack-bitmap.c: use "ret" in "open_midx_bitmap()"Teng Long, Mar 24, 2022
  3. Taylor BlauMar 24, 2022
  4. Teng LongMar 28, 2022
  5. Taylor BlauMar 30, 2022
  6. 2/3 pack-bitmap.c: add "break" statement in "open_pack_bitmap()"Teng Long, Mar 24, 2022
  7. Junio C HamanoMar 24, 2022
  8. Taylor BlauMar 24, 2022
  9. Taylor BlauMar 24, 2022
  10. Teng LongMar 29, 2022
  11. Taylor BlauMar 30, 2022
  12. Teng LongTeng Long, Mar 30, 2022
  13. Ævar Arnfjörð BjarmasonMar 30, 2022
  14. 3/3 bitmap: add trace outputs during open "bitmap" fileTeng Long, Mar 24, 2022
  15. Junio C HamanoMar 24, 2022
  16. Ævar Arnfjörð BjarmasonMar 24, 2022
  17. Teng LongTeng Long, Mar 29, 2022
  18. Ævar Arnfjörð BjarmasonMar 29, 2022
  19. 0/5 trace2 output for bitmap decision pathTeng Long, Apr 21, 2022
  20. 1/5 pack-bitmap.c: continue looping when first MIDX bitmap is foundTeng Long, Apr 21, 2022
  21. Taylor BlauMay 11, 2022
  22. 2/5 pack-bitmap.c: rename "idx_name" to "bitmap_name"Teng Long, Apr 21, 2022
  23. Taylor BlauMay 11, 2022
  24. 3/5 pack-bitmap.c: make warnings more detailed when opening bitmapTeng Long, Apr 21, 2022
  25. Taylor BlauApr 21, 2022
  26. Teng LongMay 6, 2022
  27. 5/5 pack-bitmap.c: using error() instead of silently returning -1Teng Long, Apr 21, 2022
  28. Ævar Arnfjörð BjarmasonApr 21, 2022
  29. Teng LongMay 6, 2022
  30. 4/5 bitmap: add trace2 outputs during open "bitmap" fileTeng Long, Apr 21, 2022
  31. Ævar Arnfjörð BjarmasonApr 21, 2022
  32. Teng LongMay 6, 2022
  33. Teng LongMay 6, 2022
  34. Jeff HostetlerApr 21, 2022
  35. Teng LongMay 6, 2022
  36. Jeff HostetlerMay 10, 2022
  37. 0/5 trace2 output for bitmap decision pathTeng Long, Jun 12, 2022
  38. 1/5 pack-bitmap.c: continue looping when first MIDX bitmap is foundTeng Long, Jun 12, 2022
  39. 3/5 pack-bitmap.c: make warnings support i18N when opening bitmapTeng Long, Jun 12, 2022
  40. 2/5 pack-bitmap.c: rename "idx_name" to "bitmap_name"Teng Long, Jun 12, 2022
  41. 4/5 pack-bitmap.c: using error() instead of silently returning -1Teng Long, Jun 12, 2022
  42. Taylor BlauJun 14, 2022
  43. Teng LongJun 20, 2022
  44. 5/5 bitmap: add trace2 outputs during open "bitmap" fileTeng Long, Jun 12, 2022
  45. Junio C HamanoJun 13, 2022
  46. Teng LongJun 20, 2022
  47. Taylor BlauJun 14, 2022
  48. Teng LongJun 21, 2022
  49. Jeff HostetlerJun 22, 2022
  50. Teng LongJun 23, 2022
  51. Jeff HostetlerJun 23, 2022
  52. Teng LongJun 24, 2022
  53. 0/5 trace2 output for bitmap decision pathTeng Long, Jun 21, 2022
  54. 1/5 pack-bitmap.c: continue looping when first MIDX bitmap is foundTeng Long, Jun 21, 2022
  55. 3/5 pack-bitmap.c: make warnings support i18N when opening bitmapTeng Long, Jun 21, 2022
  56. 2/5 pack-bitmap.c: rename "idx_name" to "bitmap_name"Teng Long, Jun 21, 2022
  57. 5/5 bitmap: add trace2 outputs during open "bitmap" fileTeng Long, Jun 21, 2022
  58. Jeff HostetlerJun 22, 2022
  59. Junio C HamanoJun 22, 2022
  60. 4/5 pack-bitmap.c: using error() instead of silently returning -1Teng Long, Jun 21, 2022
  61. 0/5 tr2: avoid to print "interesting" config repeatedlyTeng Long, Jun 28, 2022
  62. 1/5 pack-bitmap.c: continue looping when first MIDX bitmap is foundTeng Long, Jun 28, 2022
  63. 2/5 pack-bitmap.c: rename "idx_name" to "bitmap_name"Teng Long, Jun 28, 2022
  64. 3/5 pack-bitmap.c: using error() instead of silently returning -1Teng Long, Jun 28, 2022
  65. Junio C HamanoJun 28, 2022
  66. Teng LongJul 5, 2022
  67. Junio C HamanoJul 5, 2022
  68. 4/5 pack-bitmap.c: retrieve missing i18n translationsTeng Long, Jun 28, 2022
  69. Ævar Arnfjörð BjarmasonJun 28, 2022
  70. Eric SunshineJun 28, 2022
  71. Teng LongJul 6, 2022
  72. Teng LongJul 6, 2022
  73. Junio C HamanoJun 28, 2022
  74. Teng LongJul 7, 2022
  75. Junio C HamanoJul 7, 2022
  76. Teng LongJul 11, 2022
  77. 5/5 tr2: avoid to print "interesting" config repeatedlyTeng Long, Jun 28, 2022
  78. Ævar Arnfjörð BjarmasonJun 28, 2022
  79. Junio C HamanoJun 28, 2022
  80. Jeff HostetlerJul 1, 2022
  81. Teng LongJul 11, 2022
  82. Teng LongJul 11, 2022
  83. 0/7 trace2: dump scope when print "interesting" configTeng Long, Jul 11, 2022
  84. 1/7 clean: fixed issues related to text output formatTeng Long, Jul 11, 2022
  85. Junio C HamanoJul 11, 2022
  86. Teng LongJul 13, 2022
  87. 2/7 pack-bitmap.c: mark more strings for translationsTeng Long, Jul 11, 2022
  88. 3/7 pack-bitmap.c: rename "idx_name" to "bitmap_name"Teng Long, Jul 11, 2022
  89. 4/7 pack-bitmap.c: don't ignore ENOENT silentlyTeng Long, Jul 11, 2022
  90. Ævar Arnfjörð BjarmasonJul 11, 2022
  91. Teng LongJul 13, 2022
  92. Junio C HamanoJul 11, 2022
  93. Teng LongJul 14, 2022
  94. 5/7 pack-bitmap.c: using error() instead of silently returning -1Teng Long, Jul 11, 2022
  95. Ævar Arnfjörð BjarmasonJul 11, 2022
  96. Teng LongJul 15, 2022
  97. 6/7 pack-bitmap.c: continue looping when first MIDX bitmap is foundTeng Long, Jul 11, 2022
  98. 7/7 tr2: dump names if config exist in multiple scopesTeng Long, Jul 11, 2022
  99. Ævar Arnfjörð BjarmasonJul 11, 2022
  100. Jeff HostetlerJul 11, 2022
  101. Ævar Arnfjörð BjarmasonJul 11, 2022
  102. Teng LongJul 18, 2022
  103. 0/7 trace2: dump scope when print "interesting" configTeng Long, Jul 18, 2022
  104. 1/7 pack-bitmap.c: fix formatting of error messagesTeng Long, Jul 18, 2022
  105. 2/7 pack-bitmap.c: mark more strings for translationsTeng Long, Jul 18, 2022
  106. 3/7 pack-bitmap.c: rename "idx_name" to "bitmap_name"Teng Long, Jul 18, 2022
  107. 4/7 pack-bitmap.c: do not ignore error when opening a bitmap fileTeng Long, Jul 18, 2022
  108. 5/7 pack-bitmap.c: using error() instead of silently returning -1Teng Long, Jul 18, 2022
  109. 6/7 pack-bitmap.c: continue looping when first MIDX bitmap is foundTeng Long, Jul 18, 2022
  110. 7/7 tr2: dump names if config exist in multiple scopesTeng Long, Jul 18, 2022
  111. Jeff HostetlerJul 18, 2022
  112. tenglong.tlJul 19, 2022
  113. Junio C HamanoJul 19, 2022
  114. tenglong.tlJul 20, 2022
  115. Junio C HamanoJul 18, 2022
  116. Ævar Arnfjörð BjarmasonJul 18, 2022
  117. tenglong.tlJul 19, 2022
  118. Ævar Arnfjörð BjarmasonJul 19, 2022
  119. tenglong.tlJul 19, 2022
  120. 0/6 pack-bitmap.c: optimize error messagestenglong.tl, Jul 21, 2022
  121. 1/6 pack-bitmap.c: fix formatting of error messagestenglong.tl, Jul 21, 2022
  122. 2/6 pack-bitmap.c: mark more strings for translationstenglong.tl, Jul 21, 2022
  123. 3/6 pack-bitmap.c: rename "idx_name" to "bitmap_name"tenglong.tl, Jul 21, 2022
  124. 4/6 pack-bitmap.c: do not ignore error when opening a bitmap filetenglong.tl, Jul 21, 2022
  125. 5/6 pack-bitmap.c: using error() instead of silently returning -1tenglong.tl, Jul 21, 2022
  126. 6/6 pack-bitmap.c: continue looping when first MIDX bitmap is foundtenglong.tl, Jul 21, 2022
  127. Junio C HamanoJul 21, 2022
  128. tenglong.tlJul 22, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.