Inspect changes in Gitaly 6ad2a2fa454f597b6b7470f27667df1cc5a7d54e
Upstream merge commit 6c7e0bdbfc4e changes Gitaly server version from 82988a601f0ae35d7c260bfe01d3304e642429db to 6ad2a2fa454f597b6b7470f27667df1cc5a7d54e, with changes in protocol or one of the source subtrees currently under watch.
To further inspect, go to an up to date Gitaly source clone and run
diff 82988a601f0ae35d7c260bfe01d3304e642429db..6ad2a2fa454f597b6b7470f27667df1cc5a7d54e -- proto/*.proto internal/backup
. Here is a preview, truncated at 500 lines:
diff --git a/proto/blob.proto b/proto/blob.proto
index 6b83d31dc..73a78670b 100644
--- a/proto/blob.proto
+++ b/proto/blob.proto
@@ -80,11 +80,11 @@ service BlobService {
// GetBlobRequest is a request for the GetBlob RPC.
message GetBlobRequest {
- // Repository is the repository that shall be searched.
+ // repository is the repository that shall be searched.
Repository repository = 1[(target_repository)=true];
- // Oid is the object ID of the blob we want to get.
+ // oid is the object ID of the blob we want to get.
string oid = 2;
- // Limit is the maximum number of bytes we want to receive. Use '-1' to get the full blob no matter how big. Setting
+ // limit is the maximum number of bytes we want to receive. Use '-1' to get the full blob no matter how big. Setting
// this to `0` will return no data.
int64 limit = 3;
}
@@ -92,11 +92,11 @@ message GetBlobRequest {
// GetBlobResponse is a response for the GetBlob RPC. Multiple responses will be returned when the blob is large and
// thus doesn't fit into a single response.
message GetBlobResponse {
- // Size is the size of the blob. Present only in first response message.
+ // size is the size of the blob. Present only in first response message.
int64 size = 1;
- // Data is a chunk of data.
+ // data is a chunk of data.
bytes data = 2;
- // Oid of the actual blob returned. Empty if no blob was found.
+ // oid of the actual blob returned. Empty if no blob was found.
string oid = 3;
}
@@ -105,18 +105,18 @@ message GetBlobsRequest {
// RevisionPath is a combination of revision and path. All objects reachable in the subdirectory of the treeish
// will be returned.
message RevisionPath {
- // Revision is the revision that identifies the tree-ish. Must not be empty.
+ // revision is the revision that identifies the tree-ish. Must not be empty.
string revision = 1;
- // Path is the path relative to the treeish revision that shall be searched for a blob. If the path is empty the
+ // path is the path relative to the treeish revision that shall be searched for a blob. If the path is empty the
// root directory of the tree-ish will be searched.
bytes path = 2;
}
- // Repository is the repository that shall be searched.
+ // repository is the repository that shall be searched.
Repository repository = 1[(target_repository)=true];
- // RevisionPaths identifies the set of revision/path pairs that shall be searched for blobs.
+ // revision_paths identifies the set of revision/path pairs that shall be searched for blobs.
repeated RevisionPath revision_paths = 2;
- // Limit is the maximum number of bytes we want to receive. Use '-1' to get the full blobs no matter how big.
+ // limit is the maximum number of bytes we want to receive. Use '-1' to get the full blobs no matter how big.
int64 limit = 3;
}
@@ -125,47 +125,47 @@ message GetBlobsRequest {
// only have their data field set. Blobs which cannot be found will only have their path and revision set, but will
// otherwise be empty.
message GetBlobsResponse {
- // Size is the size of the blob. Present only on the first message per blob
+ // size is the size of the blob. Present only on the first message per blob
int64 size = 1;
- // Data is a chunk of blob data, which could span over multiple messages.
+ // data is a chunk of blob data, which could span over multiple messages.
bytes data = 2;
- // Oid is the object ID of the current blob. Only present on the first message per blob. Empty if no blob was
+ // oid is the object ID of the current blob. Only present on the first message per blob. Empty if no blob was
// found.
string oid = 3;
- // IsSubmodule indicates whether the blob is a submodule.
+ // is_submodule indicates whether the blob is a submodule.
bool is_submodule = 4;
- // Mode is the file mode of blob as present in the tree. It is typically one of:
+ // mode is the file mode of blob as present in the tree. It is typically one of:
//
// - 0o100644 for non-executable files.
// - 0o100755 for executable files.
// - 0o160000 for submodules.
// - 0o040000 for subtrees.
int32 mode = 5;
- // Revision is the revision that this blob has been traversed from.
+ // revision is the revision that this blob has been traversed from.
string revision = 6;
- // Path is the path of the blob inside of the tree.
+ // path is the path of the blob inside of the tree.
bytes path = 7;
- // Type is the type of the "blob".
+ // type is the type of the "blob".
ObjectType type = 8;
}
// ListBlobsRequest is a request for the ListBlobs RPC.
message ListBlobsRequest {
- // Repository is the repository in which blobs should be enumerated.
+ // repository is the repository in which blobs should be enumerated.
Repository repository = 1 [(target_repository)=true];
- // Revisions is the list of revisions to retrieve blobs from. These revisions
+ // revisions is the list of revisions to retrieve blobs from. These revisions
// will be walked. Supports pseudo-revisions `--all` and `--not` as well as
// negated revisions via `^revision`. Revisions cannot start with a leading
// dash. Please consult gitrevisions(7) for more info. Must not be empty.
repeated string revisions = 2;
- // Limit is the maximum number of blobs to return. If set to its default
+ // limit is the maximum number of blobs to return. If set to its default
// (`0`), then all found blobs wll be returned.
uint32 limit = 3;
- // BytesLimit is the maximum number of bytes to receive for each blob. If set
+ // bytes_limit is the maximum number of bytes to receive for each blob. If set
// to `0`, then no blob data will be sent. If `-1`, then all blob data will
// be sent without any limits.
int64 bytes_limit = 4;
- // WithPaths determines whether paths of blobs should be returned. When
+ // with_paths determines whether paths of blobs should be returned. When
// set to `true`, paths are returned on a best-effort basis: a path will only
// exist if the blob was traversed via a tree.
bool with_paths = 5;
@@ -175,21 +175,21 @@ message ListBlobsRequest {
message ListBlobsResponse {
// Blob represents a Git blob object.
message Blob {
- // Oid is the object ID of the blob. Will only be set for the first
+ // oid is the object ID of the blob. Will only be set for the first
// message of each specific blob.
string oid = 1;
- // Size is the size of the blob. Will only be set for the first message
+ // size is the size of the blob. Will only be set for the first message
// of each specific blob.
int64 size = 2;
- // Data is the contents of the blob. This field is optional and depends on
+ // data is the contents of the blob. This field is optional and depends on
// the BytesLimit in the original request.
bytes data = 3;
- // Path is the path of the blob. May be unset depending on how the blob had
+ // path is the path of the blob. May be unset depending on how the blob had
// been traversed.
bytes path = 4;
}
- // Blobs is the blobs which have been found. In case blob contents were
+ // blobs is the blobs which have been found. In case blob contents were
// requested and contents of a blob exceed the maximum gRPC message size,
// then this blob will be split up into multiple blob messages which span
// across multiple responses. In that case, metadata of the blob will only be
@@ -199,12 +199,12 @@ message ListBlobsResponse {
// ListAllBlobsRequest is a request for the ListAllBlobs RPC.
message ListAllBlobsRequest {
- // Repository is the repository in which blobs should be enumerated.
+ // repository is the repository in which blobs should be enumerated.
Repository repository = 1 [(target_repository)=true];
- // Limit is the maximum number of blobs to return. If set to its default
+ // limit is the maximum number of blobs to return. If set to its default
// (`0`), then all found blobs wll be returned.
uint32 limit = 2;
- // BytesLimit is the maximum number of bytes to receive for each blob. If set
+ // bytes_limit is the maximum number of bytes to receive for each blob. If set
// to `0`, then no blob data will be sent. If `-1`, then all blob data will
// be sent without any limits.
int64 bytes_limit = 3;
@@ -214,18 +214,18 @@ message ListAllBlobsRequest {
message ListAllBlobsResponse {
// Blob represents a Git blob object.
message Blob {
- // Oid is the object ID of the blob. Will only be set for the first
+ // oid is the object ID of the blob. Will only be set for the first
// message of each specific blob.
string oid = 1;
- // Size is the size of the blob. Will only be set for the first message
+ // size is the size of the blob. Will only be set for the first message
// of each specific blob.
int64 size = 2;
- // Data is the contents of the blob. This field is optional and depends on
+ // data is the contents of the blob. This field is optional and depends on
// the BytesLimit in the original request.
bytes data = 3;
}
- // Blobs is the blobs which have been found. In case blob contents were
+ // blobs is the blobs which have been found. In case blob contents were
// requested and contents of a blob exceed the maximum gRPC message size,
// then this blob will be split up into multiple blob messages which span
// across multiple responses. In that case, metadata of the blob will only be
@@ -235,61 +235,61 @@ message ListAllBlobsResponse {
// LFSPointer is a git blob which points to an LFS object.
message LFSPointer {
- // Size is the size of the blob. This is not the size of the LFS object
+ // size is the size of the blob. This is not the size of the LFS object
// pointed to.
int64 size = 1;
- // Data is the bare data of the LFS pointer blob. It contains the pointer to
+ // data is the bare data of the LFS pointer blob. It contains the pointer to
// the LFS data in the format specified by the LFS project.
bytes data = 2;
- // Oid is the object ID of the blob.
+ // oid is the object ID of the blob.
string oid = 3;
}
// GetLFSPointersRequest is a request for the GetLFSPointers RPC.
message GetLFSPointersRequest {
- // Repository is the repository for which LFS pointers should be retrieved
+ // repository is the repository for which LFS pointers should be retrieved
// from.
Repository repository = 1[(target_repository)=true];
- // BlobIds is the list of blobs to retrieve LFS pointers from. Must be a
+ // blob_ids is the list of blobs to retrieve LFS pointers from. Must be a
// non-empty list of blobs IDs to fetch.
repeated string blob_ids = 2;
}
// GetLFSPointersResponse is a response for the GetLFSPointers RPC.
message GetLFSPointersResponse {
- // LfsPointers is the list of LFS pointers which were requested.
+ // lfs_pointers is the list of LFS pointers which were requested.
repeated LFSPointer lfs_pointers = 1;
}
// ListLFSPointersRequest is a request for the ListLFSPointers RPC.
message ListLFSPointersRequest {
- // Repository is the repository for which LFS pointers should be retrieved
+ // repository is the repository for which LFS pointers should be retrieved
// from.
Repository repository = 1[(target_repository)=true];
- // Revisions is the list of revisions to retrieve LFS pointers from. Must be
+ // revisions is the list of revisions to retrieve LFS pointers from. Must be
// a non-empty list.
repeated string revisions = 2;
- // Limit limits the number of LFS pointers returned.
+ // limit limits the number of LFS pointers returned.
int32 limit = 3;
}
// ListLFSPointersResponse is a response for the ListLFSPointers RPC.
message ListLFSPointersResponse {
- // LfsPointers is the list of LFS pointers which were requested.
+ // lfs_pointers is the list of LFS pointers which were requested.
repeated LFSPointer lfs_pointers = 1;
}
// ListAllLFSPointersRequest is a request for the ListAllLFSPointers RPC.
message ListAllLFSPointersRequest {
- // Repository is the repository for which LFS pointers should be retrieved
+ // repository is the repository for which LFS pointers should be retrieved
// from.
Repository repository = 1[(target_repository)=true];
- // Limit limits the number of LFS pointers returned.
+ // limit limits the number of LFS pointers returned.
int32 limit = 3;
}
// ListAllLFSPointersResponse is a response for the ListAllLFSPointers RPC.
message ListAllLFSPointersResponse {
- // LfsPointers is the list of LFS pointers which were requested.
+ // lfs_pointers is the list of LFS pointers which were requested.
repeated LFSPointer lfs_pointers = 1;
}
diff --git a/proto/cleanup.proto b/proto/cleanup.proto
index dd172b6bb..511bbff46 100644
--- a/proto/cleanup.proto
+++ b/proto/cleanup.proto
@@ -10,7 +10,7 @@ option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb";
// CleanupService provides RPCs to clean up a repository's contents.
service CleanupService {
- // This comment is left unintentionally blank.
+ // ApplyBfgObjectMapStream ...
rpc ApplyBfgObjectMapStream(stream ApplyBfgObjectMapStreamRequest) returns (stream ApplyBfgObjectMapStreamResponse) {
option (op_type) = {
op: MUTATOR
@@ -19,30 +19,31 @@ service CleanupService {
}
-// This comment is left unintentionally blank.
+// ApplyBfgObjectMapStreamRequest ...
message ApplyBfgObjectMapStreamRequest {
+ // repository ...
// Only available on the first message
Repository repository = 1 [(target_repository)=true];
- // A raw object-map file as generated by BFG: https://rtyley.github.io/bfg-repo-cleaner
+ // object_map is a raw object-map file as generated by BFG: https://rtyley.github.io/bfg-repo-cleaner
// Each line in the file has two object SHAs, space-separated - the original
// SHA of the object, and the SHA after BFG has rewritten the object.
bytes object_map = 2;
}
-// This comment is left unintentionally blank.
+// ApplyBfgObjectMapStreamResponse ...
message ApplyBfgObjectMapStreamResponse {
- // We send back each parsed entry in the request's object map so the client
- // can take action
+ // Entry refers to each parsed entry in the request's object map so the client
+ // can take action.
message Entry {
- // This comment is left unintentionally blank.
+ // type ...
ObjectType type = 1;
- // This comment is left unintentionally blank.
+ // old_oid ...
string old_oid = 2;
- // This comment is left unintentionally blank.
+ // new_oid ...
string new_oid = 3;
}
- // This comment is left unintentionally blank.
+ // entries ...
repeated Entry entries = 1;
}
diff --git a/proto/commit.proto b/proto/commit.proto
index 52341c539..334156cf3 100644
--- a/proto/commit.proto
+++ b/proto/commit.proto
@@ -68,27 +68,28 @@ service CommitService {
};
}
- // This comment is left unintentionally blank.
+ // ListFiles ...
rpc ListFiles(ListFilesRequest) returns (stream ListFilesResponse) {
option (op_type) = {
op: ACCESSOR
};
}
- // This comment is left unintentionally blank.
+ // FindCommit ...
rpc FindCommit(FindCommitRequest) returns (FindCommitResponse) {
option (op_type) = {
op: ACCESSOR
};
}
- // This comment is left unintentionally blank.
+ // CommitStats ...
rpc CommitStats(CommitStatsRequest) returns (CommitStatsResponse) {
option (op_type) = {
op: ACCESSOR
};
}
+ // FindAllCommits ...
// Use a stream to paginate the result set
rpc FindAllCommits(FindAllCommitsRequest) returns (stream FindAllCommitsResponse) {
option (op_type) = {
@@ -96,7 +97,7 @@ service CommitService {
};
}
- // This comment is left unintentionally blank.
+ // FindCommits ...
rpc FindCommits(FindCommitsRequest) returns (stream FindCommitsResponse) {
option (op_type) = {
op: ACCESSOR
@@ -131,49 +132,49 @@ service CommitService {
};
}
- // This comment is left unintentionally blank.
+ // ListLastCommitsForTree ...
rpc ListLastCommitsForTree(ListLastCommitsForTreeRequest) returns (stream ListLastCommitsForTreeResponse) {
option (op_type) = {
op: ACCESSOR
};
}
- // This comment is left unintentionally blank.
+ // CommitsByMessage ...
rpc CommitsByMessage(CommitsByMessageRequest) returns (stream CommitsByMessageResponse) {
option (op_type) = {
op: ACCESSOR
};
}
- // This comment is left unintentionally blank.
+ // ListCommitsByOid ...
rpc ListCommitsByOid(ListCommitsByOidRequest) returns (stream ListCommitsByOidResponse) {
option (op_type) = {
op: ACCESSOR
};
}
- // This comment is left unintentionally blank.
+ // ListCommitsByRefName ...
rpc ListCommitsByRefName(ListCommitsByRefNameRequest) returns (stream ListCommitsByRefNameResponse) {
option (op_type) = {
op: ACCESSOR
};
}
- // This comment is left unintentionally blank.
+ // FilterShasWithSignatures ...
rpc FilterShasWithSignatures(stream FilterShasWithSignaturesRequest) returns (stream FilterShasWithSignaturesResponse) {
option (op_type) = {
op: ACCESSOR
};
}
- // This comment is left unintentionally blank.
+ // GetCommitSignatures ...
rpc GetCommitSignatures(GetCommitSignaturesRequest) returns (stream GetCommitSignaturesResponse) {
option (op_type) = {
op: ACCESSOR
};
}
- // This comment is left unintentionally blank.
+ // GetCommitMessages ...
rpc GetCommitMessages(GetCommitMessagesRequest) returns (stream GetCommitMessagesResponse) {
option (op_type) = {
op: ACCESSOR
@@ -208,71 +209,71 @@ message ListCommitsRequest {
DATE = 2; // protolint:disable:this ENUM_FIELD_NAMES_PREFIX
};
- // Repository is the repository in which commits should be searched for.
+ // repository is the repository in which commits should be searched for.
Repository repository = 1 [(target_repository)=true];
- // Revisions is the set of revisions which should be walked to enumerate
+ // revisions is the set of revisions which should be walked to enumerate
// commits. Accepts all notation as documented in gitrevisions(7) as well as
// the pseudo-revisions `--not` and `--all` as documented in git-rev-list(1).
// Must not be empty.
repeated string revisions = 2;
- // PaginationParams allows implementation of pagination. The page token is
+ // pagination_params allows implementation of pagination. The page token is
// the last commit OID that was sent. It's expected to be the full object ID
// to guard against ambigious OIDs.
PaginationParameter pagination_params = 3;
- // Order is the order in which commits should be traversed. Please refer to
+ // order is the order in which commits should be traversed. Please refer to
// the enum's documentation for further information.
Order order = 4;
- // Reverse will cause all commits to be listed in reverse.
+ // reverse will cause all commits to be listed in reverse.
bool reverse = 11;
- // MaxParents will skip all commits which have more than the specified number
+ // max_parents will skip all commits which have more than the specified number
// of parents. If set to `0`, no filtering by parents will happen. If set to
// `1`, all merge commits will be omitted.
uint32 max_parents = 5;
- // DisableWalk will disable walking the graph. As a result, only commits
+ // disable_walk will disable walking the graph. As a result, only commits
// which are immediately referenced by Revisions will be returned.
bool disable_walk = 6;
- // FirstParent will cause the graph walk to only go down the first-parent
+ // first_parent will cause the graph walk to only go down the first-parent
// chain of commits. Merge commits will thus only cause the mainline to be
// enumerated.
bool first_parent = 7;
- // After will only list commits which are more recent than the specified date.
+ // after will only list commits which are more recent than the specified date.
google.protobuf.Timestamp after = 8;
- // After will only list commits which are older than the specified date.
+ // before will only list commits which are older than the specified date.
google.protobuf.Timestamp before = 9;
- // Author will only list commits whose author matches the given pattern,
+ // author will only list commits whose author matches the given pattern,
// which is a regular expression.
bytes author = 10;
- // IgnoreCase will apply case-sensitive behaviour while regex matching.
+ // ignore_case will apply case-sensitive behaviour while regex matching.
bool ignore_case = 12;
- // CommitMessagePatterns will only list commits whose commit message matches
+ // commit_message_patterns will only list commits whose commit message matches
// any of the given patterns.
repeated bytes commit_message_patterns = 13;
}
// ListCommitsResponse is a response for the ListCommits RPC.
message ListCommitsResponse {
- // Commits is the list of commits found.
+ // commits is the list of commits found.
repeated GitCommit commits = 1;
}
// ListAllCommitsRequest is a request for the ListAllCommits RPC.
message ListAllCommitsRequest {
- // Repository is the repository in which commits should be searched for.
+ // repository is the repository in which commits should be searched for.
Repository repository = 1 [(target_repository)=true];
- // PaginationParams allows implementation of pagination. The page token is
A merge request may have already been submitted, check that on [merge commit commit](6c7e0bdbfc4e, as usually changes in Gitaly are not breaking, compliance becoming mandatory in the following development cycles.