0.9.11 second attempt

pragma-git · Feb 5, 2024 · 49b9358 · 49b9358
2 parents c88f543 + a4f0451
commit 49b9358
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 743 deletions.
diff --git a/graph.js b/graph.js
@@ -31,7 +31,7 @@
  var gui = require("nw.gui"); 
  var os = require('os');
  var fs = require('fs');
- const simpleGit = require('simple-git');  
+ const simpleGit = opener.simpleGit; 
  var util = require('./util_module.js'); // Pragma-git common functions
 
  const pathsep = require('path').sep; // Os-dependent path separator

diff --git a/merge/pragma-merge.js b/merge/pragma-merge.js
@@ -14,8 +14,8 @@ var fs = require('fs');
 const isBinaryFileSync = require("isbinaryfile").isBinaryFileSync;
 var mime = require('mime-types'); // Mime
 const util = require('./util_module.js'); // Pragma-git common functions
-const simpleGit = require('simple-git'); // npm install simple-git
 
+const simpleGit = parent.opener.simpleGit; // Defined in app.js
 const pragmaLog = parent.opener.pragmaLog; // Defined in app.js
 const simpleGitLog = parent.opener.simpleGitLog; // Defined in app.js
 

diff --git a/notes.js b/notes.js
@@ -5,7 +5,7 @@ const gui = require("nw.gui"); // TODO : don't know if this will be needed
 const os = require('os');
 const fs = require('fs');
 const path = require('path');
-const simpleGit = require('simple-git'); 
+const simpleGit = opener.simpleGit;
 
 var util = require('./util_module.js'); // Pragma-git common functions
 

diff --git a/resolveConflicts.js b/resolveConflicts.js
@@ -12,7 +12,7 @@ var fs = require('fs');
 
 const pathsep = require('path').sep; // Os-dependent path separator
 
-const simpleGit = require('simple-git'); 
+const simpleGit = opener.simpleGit;
 const pragmaLog = opener.pragmaLog; // Defined in app.js
 
 const util = require('./util_module.js'); // Pragma-git common functions 

diff --git a/settings.js b/settings.js
@@ -10,7 +10,6 @@ const pathsep = require('path').sep; // Os-dependent path separator
 const path = require('path');
 const { execSync } = require('child_process');
 
-//let simpleGit = require('simple-git');
 let simpleGit = opener.simpleGit; 
 let simpleGitLog = opener.simpleGitLog; // Use as with simpleGit, but this one logs through pragmaLog
 

diff --git a/tagList.js b/tagList.js
@@ -12,7 +12,7 @@ var fs = require('fs');
 
 const pathsep = require('path').sep; // Os-dependent path separator
 
-const simpleGit = require('simple-git'); 
+const simpleGit = opener.simpleGit;