rename file support

Author: SPRINX0\prochazka

src/diflow.test.ts

@@ -5,6 +5,7 @@ import {
   beforeDiflow,
   checkStateInConfig,
   createTestCommit,
+  createTestCommitCore,
   getTestRepoPath,
   initTestRepos,
 } from './testrepo';
@@ -211,4 +212,37 @@ describe('Git Repository Tests', () => {
     expect(await fs.exists(path.join(getTestRepoPath('diff'), 'base-folder/base.txt'))).toBe(false);
     expect(await fs.exists(path.join(getTestRepoPath('base'), 'base-folder/base.txt'))).toBe(true);
   });
+
+  test('Rename files', async () => {
+    // await execAsync(`git mv only-base.txt only-base-renamed.txt`, { cwd: getTestRepoPath('merged') });
+
+    await fs.rename(
+      path.join(getTestRepoPath('merged'), 'only-base.txt'),
+      path.join(getTestRepoPath('merged'), 'only-base-renamed.txt')
+    );
+    await fs.writeFile(
+      path.join(getTestRepoPath('merged'), 'only-base-renamed.txt'),
+      'only-base content\nline 1\nline 2\nline 3'
+    );
+    await createTestCommitCore(getTestRepoPath('merged'), 'merged', 'Rename only-base.txt to only-base-renamed.txt');
+
+    await beforeDiflow();
+
+    const processor = new Processor(getTestRepoPath('config'), path.join(__dirname, 'workrepos'), 'master');
+    await processor.process();
+
+    await afterDiflow();
+
+    await checkStateInConfig();
+
+    expect(await fs.exists(path.join(getTestRepoPath('merged'), 'only-base-renamed.txt'))).toBe(true);
+    expect(await fs.exists(path.join(getTestRepoPath('base'), 'only-base-renamed.txt'))).toBe(true);
+
+    const newContent = await fs.readFile(path.join(getTestRepoPath('base'), 'only-base-renamed.txt'), 'utf8');
+
+    expect(newContent.replaceAll('\r\n', '\n')).toBe('only-base content\nline 1\nline 2\nline 3');
+
+    expect(await fs.exists(path.join(getTestRepoPath('merged'), 'only-base.txt'))).toBe(false);
+    expect(await fs.exists(path.join(getTestRepoPath('base'), 'only-base.txt'))).toBe(false);
+  });
 });

src/processor.ts

@@ -8,6 +8,7 @@ import {
   getDiffForCommit,
   getLastCommitHash,
   removeRepoFile,
+  renameRepoFile,
   repoFileExists,
   repoHasModifications,
   runGitCommand,
@@ -229,7 +230,11 @@ class CommitProcessor {
     if (file.action === 'M' || file.action === 'A') {
       await copyRepoFile(this.processor.repoPaths.base, this.processor.repoPaths.merged, file.file);
     } else if (file.action === 'D') {
-      await removeRepoFile(this.processor.repoPaths.merged, file.file);
+      if (!(await repoFileExists(this.processor.repoPaths.diff, file.file))) {
+        await removeRepoFile(this.processor.repoPaths.merged, file.file);
+      }
+    } else if (file.action == 'R') {
+      await renameRepoFile(this.processor.repoPaths.base, this.processor.repoPaths.merged, file.file, file.newFile!);
     }
   }
 
@@ -242,6 +247,8 @@ class CommitProcessor {
       } else {
         await removeRepoFile(this.processor.repoPaths.merged, file.file);
       }
+    } else if (file.action == 'R') {
+      await renameRepoFile(this.processor.repoPaths.diff, this.processor.repoPaths.merged, file.file, file.newFile!);
     }
   }
 
@@ -305,6 +312,12 @@ class CommitProcessor {
     } else if (file.action === 'D') {
       await removeRepoFile(this.processor.repoPaths.base, file.file);
       await removeRepoFile(this.processor.repoPaths.diff, file.file);
+    } else if (file.action == 'R') {
+      if (await repoFileExists(this.processor.repoPaths.diff, file.file)) {
+        await renameRepoFile(this.processor.repoPaths.merged, this.processor.repoPaths.diff, file.file, file.newFile!);
+      } else {
+        await renameRepoFile(this.processor.repoPaths.merged, this.processor.repoPaths.base, file.file, file.newFile!);
+      }
     }
   }
 

src/testrepo.ts

@@ -30,6 +30,10 @@ export async function createTestCommit(
   console.log('Creating commit:', repoPath, 'file:', fileName, 'content:', content);
   await fs.ensureDir(path.join(repoPath, path.dirname(fileName)));
   await fs.writeFile(path.join(repoPath, fileName), content);
+  return await createTestCommitCore(repoPath, repoid, message);
+}
+
+export async function createTestCommitCore(repoPath: string, repoid: string, message?: string) {
   await execAsync('git add .', { cwd: repoPath });
   if (message) {
     await execAsync(`git commit -m "${message}"`, { cwd: repoPath });
@@ -58,6 +62,9 @@ export async function initTestRepos() {
   await initTestRepo('merged');
 
   // Setup initial files
+  await createTestCommit(getTestRepoPath('base'), 'only-base.txt', 'only-base content\nline 1\nline 2', 'base');
+  await createTestCommit(getTestRepoPath('merged'), 'only-base.txt', 'only-base content\nline 1\nline 2', 'merged');
+
   const baseHash = await createTestCommit(getTestRepoPath('base'), 'file1.txt', 'base content', 'base');
   const diffHash = await createTestCommit(getTestRepoPath('diff'), 'file1.txt', 'different content', 'diff');
   const mergedHash = await createTestCommit(getTestRepoPath('merged'), 'file1.txt', 'different content', 'merged');

src/tools.ts

@@ -19,7 +19,10 @@ export async function runGitCommand(repoPath: string, cmd: string): Promise<stri
 }
 
 export async function getCommits(repoPath: string, branch: string): Promise<Commit[]> {
-  const log = await runGitCommand(repoPath, `log ${branch} --reverse --pretty=format:"%H@|@%ct@|@%aN@|@%aE@|@%s@|@%ad"`);
+  const log = await runGitCommand(
+    repoPath,
+    `log ${branch} --reverse --pretty=format:"%H@|@%ct@|@%aN@|@%aE@|@%s@|@%ad"`
+  );
   const res = log
     .split('\n')
     .filter(Boolean)
@@ -64,12 +67,13 @@ export async function getDiffForCommit(repoPath: string, commitHash: string): Pr
   const diff = await runGitCommand(repoPath, `show --name-status ${commitHash}`);
   return diff
     .split('\n')
-    .filter(x => x.match(/^[AMD]\t/))
+    .filter(x => x.match(/^(A|M|D|R\d\d\d)\t/))
     .map(x => {
-      const [action, file] = x.split('\t');
+      const [action, file, newFile] = x.split('\t');
       return {
-        action: action as FileAction,
+        action: action.substring(0, 1) as FileAction,
         file,
+        newFile,
       };
     });
 }
@@ -82,6 +86,19 @@ export async function copyRepoFile(srcRepo: string, destRepo: string, file: stri
   console.log(`Copied ${file} from ${srcRepo} to ${destRepo}`);
 }
 
+export async function renameRepoFile(srcRepo: string, destRepo: string, srcFile: string, dstFile: string) {
+  const oldTargetFile = path.join(destRepo, srcFile);
+  if (await fs.exists(oldTargetFile)) {
+    await fs.unlink(oldTargetFile);
+  }
+  const newSourceFile = path.join(srcRepo, dstFile);
+  const newTargetFile = path.join(destRepo, dstFile);
+
+  await fs.ensureDir(path.dirname(newTargetFile));
+  await fs.copyFile(newSourceFile, newTargetFile);
+  console.log(`Renamed ${srcFile} to ${dstFile} from ${srcRepo} to ${destRepo}`);
+}
+
 export async function removeRepoFile(repoPath: string, file: string) {
   const filePath = path.join(repoPath, file);
   if (await fs.exists(filePath)) {

src/types.ts

@@ -1,9 +1,9 @@
 export type RepoId = 'base' | 'diff' | 'merged' | 'config';
-export type FileAction = 'A' | 'D' | 'M';
+export type FileAction = 'A' | 'D' | 'M' | 'R';
 
 export interface RepoConfig {
   url: string;
-  commitTag?: string; // eg. [skip ci] for skipping github pipeline  
+  commitTag?: string; // eg. [skip ci] for skipping github pipeline
 }
 
 export interface RepoIdentifier {
@@ -45,6 +45,7 @@ export interface Commit {
 export interface ChangeItem {
   action: FileAction;
   file: string;
+  newFile?: string;
 }
 
 // export interface BranchInfo {