Skip to content
TypeScript

fix(source-control): renamed files in GitHub, GitLab and Azure DevOps diffs show as renames (#29774)

Alex Southwell8bfe94af18e1
diff --git a/packages/source-control-azure-devops/src/server/azureDevOpsDiff.test.ts b/packages/source-control-azure-devops/src/server/azureDevOpsDiff.test.ts
index 25e68f8caed..d82d586f5a6 100644
--- a/packages/source-control-azure-devops/src/server/azureDevOpsDiff.test.ts
+++ b/packages/source-control-azure-devops/src/server/azureDevOpsDiff.test.ts
@@ -80,6 +80,7 @@ describe("azureDevOpsFilePatch", () => {
expect(patch.section).toBe(
[
"diff --git a/docs/old.md b/docs/new.md",
+ "similarity index 100%",
"rename from docs/old.md",
"rename to docs/new.md",
"--- a/docs/old.md",
@@ -209,6 +210,7 @@ describe("a file Azure names something a patch header cannot carry plainly", ()
expect(patch.section).toBe(
[
'diff --git "a/docs/old\\tname.md" "b/docs/new\\tname.md"',
+ "similarity index 100%",
'rename from "docs/old\\tname.md"',
'rename to "docs/new\\tname.md"',
'--- "a/docs/old\\tname.md"',
diff --git a/packages/source-control-azure-devops/src/server/azureDevOpsDiff.ts b/packages/source-control-azure-devops/src/server/azureDevOpsDiff.ts
index 839935ccbd5..15bddb5a631 100644
--- a/packages/source-control-azure-devops/src/server/azureDevOpsDiff.ts
+++ b/packages/source-control-azure-devops/src/server/azureDevOpsDiff.ts
@@ -91,7 +91,9 @@ function patchHeader(change: AzureDevOpsChangeEntry): string {
if (change.changeKind === "new") lines.push("new file mode 100644");
if (change.changeKind === "deleted") lines.push("deleted file mode 100644");
if (change.changeKind === "rename-pure" || change.changeKind === "rename-changed") {
+ // Pierre needs this header to keep the rename.
lines.push(
+ `similarity index ${change.changeKind === "rename-pure" ? 100 : 0}%`,
`rename from ${quoteGitPatchPath(change.oldPath)}`,
`rename to ${quoteGitPatchPath(change.path)}`,
);
diff --git a/packages/source-control-github/src/server/gitHubPullRequestJson.test.ts b/packages/source-control-github/src/server/gitHubPullRequestJson.test.ts
index 622b48db3b8..c816f76a780 100644
--- a/packages/source-control-github/src/server/gitHubPullRequestJson.test.ts
+++ b/packages/source-control-github/src/server/gitHubPullRequestJson.test.ts
@@ -1460,6 +1460,7 @@ describe("decodePullRequestFilesJson", () => {
expect(result.patch).toBe(
[
String.raw`diff --git "a/ old\\name.ts " "b/ new\\name.ts "`,
+ "similarity index 100%",
String.raw`rename from " old\\name.ts "`,
String.raw`rename to " new\\name.ts "`,
String.raw`--- "a/ old\\name.ts "`,
@@ -1515,6 +1516,7 @@ describe("decodePullRequestFilesJson", () => {
expect(result.patch).toBe(
[
"diff --git a/src/old.ts b/src/new.ts",
+ "similarity index 0%",
"rename from src/old.ts",
"rename to src/new.ts",
"--- a/src/old.ts",
diff --git a/packages/source-control-github/src/server/gitHubPullRequestJson.ts b/packages/source-control-github/src/server/gitHubPullRequestJson.ts
index e7c05a4aa84..7b8851f7bed 100644
--- a/packages/source-control-github/src/server/gitHubPullRequestJson.ts
+++ b/packages/source-control-github/src/server/gitHubPullRequestJson.ts
@@ -1639,6 +1639,8 @@ function toFilesPatch(entries: ReadonlyArray<unknown>): GitHubPullRequestFilesPa
...(status === "removed" ? ["deleted file mode 100644"] : []),
...(status === "renamed"
? [
+ // The files API has no similarity score; Pierre needs this header to keep the rename.
+ `similarity index ${hunks.length > 0 || (value.additions ?? 0) + (value.deletions ?? 0) > 0 ? 0 : 100}%`,
`rename from ${quoteGitPatchPath(oldPath)}`,
`rename to ${quoteGitPatchPath(value.filename)}`,
]
diff --git a/packages/source-control-gitlab/src/server/gitLabMergeRequestJson.test.ts b/packages/source-control-gitlab/src/server/gitLabMergeRequestJson.test.ts
index 371c2e3f3c7..7b755d559c5 100644
--- a/packages/source-control-gitlab/src/server/gitLabMergeRequestJson.test.ts
+++ b/packages/source-control-gitlab/src/server/gitLabMergeRequestJson.test.ts
@@ -372,6 +372,7 @@ describe("decodeMergeRequestDiffsJson", () => {
expect(result.patch).toBe(
[
String.raw`diff --git "a/ old\\name.ts " "b/ new\\name.ts "`,
+ "similarity index 100%",
String.raw`rename from " old\\name.ts "`,
String.raw`rename to " new\\name.ts "`,
String.raw`--- "a/ old\\name.ts "`,
diff --git a/packages/source-control-gitlab/src/server/gitLabMergeRequestJson.ts b/packages/source-control-gitlab/src/server/gitLabMergeRequestJson.ts
index 79ab379ffbd..c6fdafad94b 100644
--- a/packages/source-control-gitlab/src/server/gitLabMergeRequestJson.ts
+++ b/packages/source-control-gitlab/src/server/gitLabMergeRequestJson.ts
@@ -724,6 +724,8 @@ function mergeRequestPatch(entries: ReadonlyArray<unknown>): GitLabMergeRequestP
...(value.deleted_file === true ? [`deleted file mode ${value.a_mode ?? "100644"}`] : []),
...(value.renamed_file === true
? [
+ // GitLab has no similarity score; Pierre needs this header to keep the rename.
+ `similarity index ${hunks.length > 0 || value.too_large === true || value.collapsed === true ? 0 : 100}%`,
`rename from ${quoteGitPatchPath(value.old_path)}`,
`rename to ${quoteGitPatchPath(value.new_path)}`,
]