Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2022-05-09 13:23:52 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2022-05-09 13:23:52 +0300
commit9bb6fb420b75ad7657a30751ba7df7c9bf1e0060 (patch)
tree609626f18144fab34a44f8bab360d527f4dab1aa /proto/conflicts.proto
parent58aa3bc8b0f8a1dd7fd9ec006ff870d59d8c01be (diff)
proto: Enforce comment-linting for message fields
Enforce that message fields must have a comment and add a placeholder for all instances where such a comment is missing.
Diffstat (limited to 'proto/conflicts.proto')
-rw-r--r--proto/conflicts.proto11
1 files changed, 11 insertions, 0 deletions
diff --git a/proto/conflicts.proto b/proto/conflicts.proto
index 5be41fea5..6af03bc8d 100644
--- a/proto/conflicts.proto
+++ b/proto/conflicts.proto
@@ -33,8 +33,11 @@ service ConflictsService {
// This comment is left unintentionally blank.
message ListConflictFilesRequest {
+ // This comment is left unintentionally blank.
Repository repository = 1 [(target_repository)=true];
+ // This comment is left unintentionally blank.
string our_commit_oid = 2;
+ // This comment is left unintentionally blank.
string their_commit_oid = 3;
// AllowTreeConflicts will not cause the request to fail in case there are
// tree conflicts. If set to true, then responses may contain conflict files
@@ -45,23 +48,31 @@ message ListConflictFilesRequest {
// This comment is left unintentionally blank.
message ConflictFileHeader {
reserved 1;
+ // This comment is left unintentionally blank.
string commit_oid = 2;
+ // This comment is left unintentionally blank.
bytes their_path = 3;
+ // This comment is left unintentionally blank.
bytes our_path = 4;
+ // This comment is left unintentionally blank.
int32 our_mode = 5;
+ // This comment is left unintentionally blank.
bytes ancestor_path = 6;
}
// This comment is left unintentionally blank.
message ConflictFile {
oneof conflict_file_payload {
+ // This comment is left unintentionally blank.
ConflictFileHeader header = 1;
+ // This comment is left unintentionally blank.
bytes content = 2;
}
}
// This comment is left unintentionally blank.
message ListConflictFilesResponse {
+ // This comment is left unintentionally blank.
repeated ConflictFile files = 1;
}