Switching nodir and removing consolelogs

jdalrymple · Apr 29, 2018 · 9a76fea · 9a76fea
1 parent 719ac5d
commit 9a76fea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/Hg.js b/src/Hg.js
@@ -94,7 +94,7 @@ async function cloneMultipleAndMerge(from, to, pythonPath) {
     await combinedRepo.update({ clean: true, revision: 'default' });
 
     const files = await Globby(['*', '!.hg'], {
-      expandDirectories: true,
+      nodir: false,
       dot: true,
       cwd: combinedRepo.path,
     });

diff --git a/src/HgRepo.js b/src/HgRepo.js
@@ -98,7 +98,7 @@ class HgRepo {
     await Command.run(cloneCmd);
 
     // Remove .hgtags from each folder
-    const files = await Globby(['**/.hgtags'], { expandDirectories: true, dot: true, cwd: path });
+    const files = await Globby(['**/.hgtags'], { nodir: false, dot: true, cwd: path });
 
     if (files.length) {
       await Promise.all(files.map(hgpath => Fs.remove(Path.resolve(path, hgpath))));
@@ -108,7 +108,7 @@ class HgRepo {
 
     // Rename .hgignore to .gitignore, and remove the line syntax:*
     const hgIgnoreFiles = await Globby(['**/.hgignore'], {
-      expandDirectories: true,
+      nodir: false,
       dot: true,
       cwd: path,
     });

diff --git a/tests/Hg.js b/tests/Hg.js
@@ -99,8 +99,6 @@ Test('Cloning multiple live Hg repositories into one.', async (assert) => {
     DirectoryCompare.compare(Path.join(testDirectory, 'whoosh'), Path.join(outputDirectory, 'whoosh'), exclude),
     DirectoryCompare.compare(Path.join(testDirectory, 'hg-git'), Path.join(outputDirectory, 'hg-git'), exclude),
   ]).spread((compare1, compare2) => {
-    console.log(compare1)
-    console.log(compare2)
     assert.true(compare1.same, 'First repo didnt match');
     assert.true(compare2.same, 'Second repo did not match');
   });