Merge d4f86e9d1689a5d2ddb94e173669f31cc3497351 into 0621d936c0d15c7a5a116268ea1f7c362b76c50b

action.yml

@@ -145,6 +145,14 @@ inputs:
     description: "Output renamed files as deleted and added files."
     required: false
     default: "false"
+  recover_deleted_files_to_original_location:
+    description: "Recover deleted files to their original location."
+    required: false
+    default: "false"
+  recover_deleted_files_to_destination:
+    description: "Recover deleted files to the destination directory."
+    required: false
+    default: ""
 
 outputs:
   added_files:

src/inputs.ts

@@ -37,6 +37,8 @@ export type Inputs = {
   writeOutputFiles: boolean
   outputDir: string
   outputRenamedFilesAsDeletedAndAdded: boolean
+  recoverDeletedFiles: boolean
+  recoverDeletedFilesToDestination: string
 }
 
 export const getInputs = (): Inputs => {
@@ -145,6 +147,13 @@ export const getInputs = (): Inputs => {
     'output_renamed_files_as_deleted_and_added',
     {required: false}
   )
+  const recoverDeletedFiles = core.getBooleanInput('recover_deleted_files', {
+    required: false
+  })
+  const recoverDeletedFilesToDestination = core.getInput(
+    'recover_deleted_files_to_destination',
+    {required: false}
+  )
 
   const inputs: Inputs = {
     files,
@@ -180,7 +189,9 @@ export const getInputs = (): Inputs => {
     sinceLastRemoteCommit,
     writeOutputFiles,
     outputDir,
-    outputRenamedFilesAsDeletedAndAdded
+    outputRenamedFilesAsDeletedAndAdded,
+    recoverDeletedFiles,
+    recoverDeletedFilesToDestination
   }
 
   if (fetchDepth) {

src/main.ts

@@ -1,6 +1,6 @@
 import * as core from '@actions/core'
 import path from 'path'
-import {getAllDiffFiles, getRenamedFiles} from './changedFiles'
+import {ChangeTypeEnum, getAllDiffFiles, getRenamedFiles} from './changedFiles'
 import {setChangedFilesOutput} from './changedFilesOutput'
 import {
   DiffResult,
@@ -14,6 +14,7 @@ import {
   getSubmodulePath,
   getYamlFilePatterns,
   isRepoShallow,
+  recoverDeletedFiles,
   setOutput,
   submoduleExists,
   updateGitGlobalConfig,
@@ -118,6 +119,13 @@ export async function run(): Promise<void> {
   core.info('All Done!')
   core.endGroup()
 
+  recoverDeletedFiles({
+    inputs,
+    workingDirectory,
+    deletedFiles: allDiffFiles[ChangeTypeEnum.Deleted],
+    sha: diffResult.currentSha
+  })
+
   const filePatterns = await getFilePatterns({
     inputs,
     workingDirectory

src/utils.ts

@@ -1032,3 +1032,68 @@ export const setOutput = async ({
     await fs.writeFile(outputFilePath, cleanedValue.replace(/\\"/g, '"'))
   }
 }
+
+const getDeletedFileContents = async ({
+  cwd,
+  filePath,
+  sha
+}: {
+  cwd: string
+  filePath: string
+  sha: string
+}): Promise<string> => {
+  const {stdout, exitCode, stderr} = await exec.getExecOutput(
+    'git',
+    ['show', `${sha}:${filePath}`],
+    {
+      cwd,
+      silent: process.env.RUNNER_DEBUG !== '1',
+      ignoreReturnCode: true
+    }
+  )
+
+  if (exitCode !== 0) {
+    throw new Error(
+      `Error getting file content from git history "${filePath}": ${stderr}`
+    )
+  }
+
+  return stdout
+}
+
+export const recoverDeletedFiles = async ({
+  inputs,
+  workingDirectory,
+  deletedFiles,
+  sha
+}: {
+  inputs: Inputs
+  workingDirectory: string
+  deletedFiles: string[]
+  sha: string
+}): Promise<void> => {
+  if (inputs.recoverDeletedFiles) {
+    for (const deletedFile of deletedFiles) {
+      let target = path.join(workingDirectory, deletedFile)
+
+      if (inputs.recoverDeletedFilesToDestination) {
+        target = path.join(
+          workingDirectory,
+          inputs.recoverDeletedFilesToDestination,
+          deletedFile
+        )
+      }
+
+      const deletedFileContents = await getDeletedFileContents({
+        cwd: workingDirectory,
+        filePath: deletedFile,
+        sha
+      })
+
+      if (!(await exists(path.dirname(target)))) {
+        await fs.mkdir(path.dirname(target), {recursive: true})
+      }
+      await fs.writeFile(target, deletedFileContents)
+    }
+  }
+}