Merge ef0b7b0cfc5e5c8e08a37f7ed456c706ac14aa76 into 5e05d65caece9a3677c109ffa343ad00358d4405

commit: 00a725f8b860b6cda6c8973c7d900fe95d45b8b9
author: ermite · 2d ago · 2026-10-20 06:05 UTC
merge of: 5e05d65 + ef0b7b0 · diff against the first parent
signature: unsigned

2 files · +177 -70

M gen/ermite/git.pb.go +152 -67 generated file: collapsed

M proto/ermite/git.proto +25 -3


@@ -53,6 +53,24 @@ enum FileStatus {
53	53		FILE_STATUS_TYPE_CHANGED = 6;
54	54		}
55	55
	56	+	// FileOmission tells why a changed file has no hunks although it changed.
	57	+	enum FileOmission {
	58	+	// The file is not omitted: its hunks are present, or it has none to show
	59	+	// (binary, pure rename, mode change), or it is outside the requested window.
	60	+	FILE_OMISSION_UNSPECIFIED = 0;
	61	+	// The file is generated or vendored, by its path: its hunks were not read.
	62	+	// It can be read on its own.
	63	+	FILE_OMISSION_GENERATED = 1;
	64	+	// The file changes more lines than the per-file limit. It can be read on its own.
	65	+	FILE_OMISSION_LARGE = 2;
	66	+	// The file did not fit in what remained of the total limits of the diff.
	67	+	// It can be read on its own.
	68	+	FILE_OMISSION_BUDGET = 3;
	69	+	// The file's text exceeds the memory limit of a diff: it cannot be shown,
	70	+	// even on its own. Clone the repository to read it.
	71	+	FILE_OMISSION_UNAVAILABLE = 4;
	72	+	}
	73	+
56	74		// LineKind tells how a line of a hunk relates to the two sides of a diff.
57	75		enum LineKind {
58	76		// Not set. Never returned.

@@ -335,8 +353,8 @@ message Diff {
335	353		// Files are the changed files, ordered by path. Files past the file limit are
336	354		// omitted.
337	355		repeated FileDiff files = 1;
338		-	// Truncated is true when the diff is incomplete: files were omitted, or at
339		-	// least one listed file has truncated set. DiffStats still count everything.
	356	+	// Truncated is true when the diff is incomplete: files were omitted past the
	357	+	// file limit, or at least one listed file has omitted set. DiffStats still count everything.
340	358		bool truncated = 2;
341	359		}
342	360

@@ -367,11 +385,15 @@ message FileDiff {
367	385		// copied file, and 0 otherwise.
368	386		int32 similarity = 11;
369	387		// Truncated is true when the file exceeded a diff limit: hunks is then empty
370		-	// although the file changed. Additions and deletions remain accurate.
	388	+	// although the file changed. Additions and deletions remain accurate. It is
	389	+	// kept for compatibility and equals omitted != FILE_OMISSION_UNSPECIFIED.
371	390		bool truncated = 12;
372	391		// Hunks are the changed regions, in file order. Empty for a binary file, a
373	392		// truncated file, a pure rename and a mode-only change.
374	393		repeated Hunk hunks = 13;
	394	+	// Omitted tells why hunks is empty although the file changed. truncated is
	395	+	// true exactly when omitted is not FILE_OMISSION_UNSPECIFIED.
	396	+	FileOmission omitted = 14;
375	397		}
376	398
377	399		// Hunk is a contiguous changed region with its context.

   FILE_STATUS_TYPE_CHANGED = 6;
 }
+// FileOmission tells why a changed file has no hunks although it changed.
+enum FileOmission {
+  // The file is not omitted: its hunks are present, or it has none to show
+  // (binary, pure rename, mode change), or it is outside the requested window.
+  FILE_OMISSION_UNSPECIFIED = 0;
+  // The file is generated or vendored, by its path: its hunks were not read.
+  // It can be read on its own.
+  FILE_OMISSION_GENERATED = 1;
+  // The file changes more lines than the per-file limit. It can be read on its own.
+  FILE_OMISSION_LARGE = 2;
+  // The file did not fit in what remained of the total limits of the diff.
+  // It can be read on its own.
+  FILE_OMISSION_BUDGET = 3;
+  // The file's text exceeds the memory limit of a diff: it cannot be shown,
+  // even on its own. Clone the repository to read it.
+  FILE_OMISSION_UNAVAILABLE = 4;
+}
 // LineKind tells how a line of a hunk relates to the two sides of a diff.
 enum LineKind {
   // Not set. Never returned.
   // Files are the changed files, ordered by path. Files past the file limit are
   // omitted.
   repeated FileDiff files = 1;
-  // Truncated is true when the diff is incomplete: files were omitted, or at
+  // Truncated is true when the diff is incomplete: files were omitted past the
-  // least one listed file has truncated set. DiffStats still count everything.
+  // file limit, or at least one listed file has omitted set. DiffStats still count everything.
   bool truncated = 2;
 }
   // copied file, and 0 otherwise.
   int32 similarity = 11;
   // Truncated is true when the file exceeded a diff limit: hunks is then empty
-  // although the file changed. Additions and deletions remain accurate.
+  // although the file changed. Additions and deletions remain accurate. It is
+  // kept for compatibility and equals omitted != FILE_OMISSION_UNSPECIFIED.
   bool truncated = 12;
   // Hunks are the changed regions, in file order. Empty for a binary file, a
   // truncated file, a pure rename and a mode-only change.
   repeated Hunk hunks = 13;
+  // Omitted tells why hunks is empty although the file changed. truncated is
+  // true exactly when omitted is not FILE_OMISSION_UNSPECIFIED.
+  FileOmission omitted = 14;
 }
 // Hunk is a contiguous changed region with its context.