commander, logs

Author: SPRINX0\prochazka

master/config

@@ -0,0 +1 @@
+Subproject commit cb257f1b411a1deda0bfff9fa0b93251315a1ca1

package.json

@@ -7,8 +7,8 @@
     "test:ci": "jest --runInBand --json --outputFile=test-result.json --testLocationInResults --detectOpenHandles --forceExit",
     "test:init": "yarn tsc && node dist/runtest init",
     "test:add": "yarn tsc && node dist/runtest add",
-    "test:dbgate": "yarn tsc && node dist/diflow https://github.com/dbgate/dbgate-diflow-config.git --skip-push --clear",
-    "test:dbgate:push": "yarn tsc && node dist/diflow https://github.com/dbgate/dbgate-diflow-config.git --clear"
+    "test:dbgate": "yarn tsc && node dist/diflow sync -r https://github.com/dbgate/dbgate-diflow-config.git -b master --skip-push --clear",
+    "test:dbgate:push": "yarn tsc && node dist/diflow sync -r https://github.com/dbgate/dbgate-diflow-config.git -b master --clear"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",

src/diflow.ts

@@ -12,12 +12,15 @@ program
 program
   .command('sync')
   .description('Ryn sync between GIT 3 repos (base+diff=merged)')
-  .requiredOption('-r, --repo', 'URL to control repo repo (configuration+state)')
-  .requiredOption('-b, --branch', 'Branch name to be processed')
+  .requiredOption('-r, --repo <string>', 'URL to control repo repo (configuration+state)')
+  .requiredOption('-b, --branch <string>', 'Branch name to be processed')
   .option('--skip-push', 'skip pushing changes to remote')
   .option('--clear', 'clear work repos before running')
   .action(options => {
-    const processor = new Processor(options.config, options.branch, path.join(__dirname, 'workrepos'), {
+    // console.log('repo:', options.repo);
+    // console.log('branch:', options.branch);
+    // return;
+    const processor = new Processor(options.repo, path.join(__dirname, 'workrepos'), options.branch, {
       skipPush: options.skipPush,
       clear: options.clear,
     });
@@ -36,4 +39,4 @@ program
 // const processor = new Processor(process.argv[2], path.join(__dirname, 'workrepos'), { skipPush, clear });
 // processor.process();
 
-console.log('Processing complete.');
+program.parse();

src/processor.ts

@@ -133,7 +133,7 @@ export class Processor {
       ...mergedFilteredCommits.map(x => ({ ...x, repoid: 'merged' as RepoId })),
     ];
     this.commitsToProcess.sort((a, b) => a.ts - b.ts);
-    console.log('Initializing branch:', this.branch, 'DONE');
+    // console.log('Initializing branch:', this.branch, 'DONE');
     console.log('Commits to process:', this.commitsToProcess.length);
   }
 
@@ -164,7 +164,7 @@ export class Processor {
     await this.initialize();
 
     for (const commit of this.commitsToProcess) {
-      console.log('Processing commit', commit.repoid, ':', commit.commit);
+      console.log('Processing commit', commit.repoid, ':', commit.message);
       const commitProcessor = new CommitProcessor(this, commit);
       await commitProcessor.process();
     }
@@ -198,8 +198,6 @@ class CommitProcessor {
   async processFiles() {
     const files = await getDiffForCommit(this.processor.repoPaths[this.commit.repoid], this.commit.commit);
 
-    console.log('Processing files from commit:', files.length);
-
     for (const file of files) {
       if ((this.processor.config?.ignorePaths ?? []).find(ignore => minimatch(file.file, ignore, { partial: true }))) {
         continue;