Skip to content

GitLab: Additional places to encode, handle first commit and empty ta… #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mschlicht-tt merged 1 commit into from
Aug 18, 2025
Merged

GitLab: Additional places to encode, handle first commit and empty ta… #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 25 additions & 18 deletions src/scm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ class Gitlab extends BaseScmAdapter {
const namespace = encodeURIComponent(
`${commitInfo.owner}/${commitInfo.repo}`,
);

// get project id
const commitUrl = `${this.getApiUrl()}/projects/${namespace}/repository/commits/${commitInfo.commitHash}`;

Expand Down Expand Up @@ -564,9 +564,14 @@ class Gitlab extends BaseScmAdapter {
throw new Error('Unable to retrieve modified files from commitData.');
}

const baseApiUrl = `${this.getApiUrl()}/projects/${commitInfo.owner}%2F${
commitInfo.repo
}/repository/files`;
const namespace = encodeURIComponent(
`${commitInfo.owner}/${commitInfo.repo}`,
);
const baseApiUrl = `${this.getApiUrl()}/projects/${namespace}/repository/files`;

// commitData.parents[0] is probably empty if this is the first commit
const shaOld = commitData.parents[0]?.sha || commitData.sha;
const shaNew = commitData.sha;
const modifiedFiles = commitData.files.map((file) => {
return {
filename: file.filename,
Expand All @@ -576,16 +581,16 @@ class Gitlab extends BaseScmAdapter {
renamed: file.renamed,
additions: file.additions,
deletions: file.deletions,
shaOld: commitData.parents[0].sha,
shaNew: commitData.sha,
shaOld,
shaNew,
download: {
type: 'raw' as const,
old: `${baseApiUrl}/${file.filenameOld.replace(
/\//g,
'%2f',
)}/raw?ref=${commitData.parents[0].sha}`,
)}/raw?ref=${shaOld}`,
new: `${baseApiUrl}/${file.filename.replace(/\//g, '%2f')}/raw?ref=${
commitData.sha
shaNew
}`,
},
};
Expand All @@ -604,10 +609,9 @@ class Gitlab extends BaseScmAdapter {
};
files: CommonChange[];
}> {
const namespace = encodeURIComponent(`${pullInfo.owner}/${pullInfo.repo}`);
const response = await fetch(
`${this.getApiUrl()}/projects/${pullInfo.owner}%2f${
pullInfo.repo
}/merge_requests/${pullInfo.pullNumber}/changes`,
`${this.getApiUrl()}/projects/${namespace}/merge_requests/${pullInfo.pullNumber}/changes`,
{ headers: this.createHeaders(token) },
);
if (!response.ok) {
Expand All @@ -632,10 +636,13 @@ class Gitlab extends BaseScmAdapter {
token: string,
): Promise<ModifiedFile[]> {
const pullData = await this.getPullDetails(pullInfo, token);
const baseApiUrl = `${this.getApiUrl()}/projects/${pullInfo.owner}%2F${
pullInfo.repo
}/repository/files`;
const namespace = encodeURIComponent(`${pullInfo.owner}/${pullInfo.repo}`);
const baseApiUrl = `${this.getApiUrl()}/projects/${namespace}/repository/files`;


// pullData.info.base.sha is probably not set if target branch has no commit yet
const shaOld = pullData.info.base.sha || pullData.info.head.sha;
const shaNew = pullData.info.head.sha;
const modifiedFiles = pullData.files.map((file) => {
return {
filename: file.filename,
Expand All @@ -645,16 +652,16 @@ class Gitlab extends BaseScmAdapter {
renamed: file.renamed,
additions: file.additions,
deletions: file.deletions,
shaOld: pullData.info.base.sha,
shaNew: pullData.info.head.sha,
shaOld,
shaNew,
download: {
type: 'raw' as const,
old: `${baseApiUrl}/${file.filenameOld.replace(
/\//g,
'%2f',
)}/raw?ref=${pullData.info.base.sha}`,
)}/raw?ref=${shaOld}`,
new: `${baseApiUrl}/${file.filename.replace(/\//g, '%2f')}/raw?ref=${
pullData.info.head.sha
shaNew
}`,
},
};
Expand Down