1-commit variant without committedByDiflow works

dbgate · Feb 19, 2025 · e57e097 · e57e097
1 parent 747c747
commit e57e097
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/processor.ts b/src/processor.ts
@@ -230,7 +230,8 @@ class CommitProcessor {
       await runGitCommand(this.processor.repoPaths[repoid], `push`);
       if (repoid !== 'config') {
         const hash = await getLastCommitHash(this.processor.repoPaths[repoid]);
-        this.state![repoid][this.branchProcessor.branch].committedByDiflow.push(hash);
+        this.state![repoid][this.branchProcessor.branch].lastProcessed = hash;
+        // this.state![repoid][this.branchProcessor.branch].committedByDiflow.push(hash);
       }
       console.log('Commiting changes for repo:', repoid, 'DONE.');
     }

diff --git a/src/testrepo.ts b/src/testrepo.ts
@@ -110,17 +110,17 @@ export async function afterDiflow() {
 }
 
 export async function checkStateInConfig() {
-  // const stateContent = await fs.readFile(path.join(getTestRepoPath('config'), 'state.json'), 'utf8');
-  // const state = JSON.parse(stateContent) as State;
-  // const baseHash = await getHeadCommitInRepo(getTestRepoPath('base'));
-  // const diffHash = await getHeadCommitInRepo(getTestRepoPath('diff'));
-  // const mergedHash = await getHeadCommitInRepo(getTestRepoPath('merged'));
+  const stateContent = await fs.readFile(path.join(getTestRepoPath('config'), 'state.json'), 'utf8');
+  const state = JSON.parse(stateContent) as State;
+  const baseHash = await getHeadCommitInRepo(getTestRepoPath('base'));
+  const diffHash = await getHeadCommitInRepo(getTestRepoPath('diff'));
+  const mergedHash = await getHeadCommitInRepo(getTestRepoPath('merged'));
 
-  // expect(state['base']['master'].lastProcessed).toBe(baseHash);
-  // expect(state['diff']['master'].lastProcessed).toBe(diffHash);
-  // expect(state['merged']['master'].lastProcessed).toBe(mergedHash);
+  expect(state['base']['master'].lastProcessed).toBe(baseHash);
+  expect(state['diff']['master'].lastProcessed).toBe(diffHash);
+  expect(state['merged']['master'].lastProcessed).toBe(mergedHash);
 
-  // expect(state['base']['master'].committedByDiflow).toBe([]);
-  // expect(state['diff']['master'].committedByDiflow).toBe([]);
-  // expect(state['merged']['master'].committedByDiflow).toBe([]);
+  expect(state['base']['master'].committedByDiflow).toEqual([]);
+  expect(state['diff']['master'].committedByDiflow).toEqual([]);
+  expect(state['merged']['master'].committedByDiflow).toEqual([]);
 }