fixup! WIP: --changedFilesSinceCommit=origin/master + hg support

Turns out hacking things out drunkenly at midnight on a Friday isn't the greatest way to get high-quality code.
jestjs · Jan 14, 2018 · 933e33a · 933e33a
1 parent 8f15c74
commit 933e33a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/integration-tests/__tests__/jest_changed_files.test.js b/integration-tests/__tests__/jest_changed_files.test.js
@@ -210,7 +210,8 @@ test('gets changed files for git', async () => {
   writeFiles(DIR, {
     'file5.txt': 'file5',
   });
-  run(`${GIT} commit -am "test5"`, DIR);
+  run(`${GIT} add file5.txt`, DIR);
+  run(`${GIT} commit -m "test5"`, DIR);
 
   ({changedFiles: files} = await getChangedFilesForRoots(roots, {
     sinceCommit: 'master',
@@ -292,10 +293,11 @@ test('gets changed files for hg', async () => {
       .sort(),
   ).toEqual(['file1.txt', 'file4.txt']);
 
+  run(`${HG} add file4.txt`, DIR);
   run(`${HG} commit -m "test3"`, DIR);
 
   ({changedFiles: files} = await getChangedFilesForRoots(roots, {
-    sinceCommit: '-2',
+    sinceCommit: '-3',
   }));
   // Returns files from the last 2 commits
   expect(
@@ -311,7 +313,8 @@ test('gets changed files for hg', async () => {
   writeFiles(DIR, {
     'file5.txt': 'file5',
   });
-  run(`${HG} commit -am "test5"`, DIR);
+  run(`${HG} add file5.txt`, DIR);
+  run(`${HG} commit -m "test4"`, DIR);
 
   ({changedFiles: files} = await getChangedFilesForRoots(roots, {
     sinceCommit: 'master',

diff --git a/packages/jest-changed-files/src/git.js b/packages/jest-changed-files/src/git.js
@@ -33,6 +33,7 @@ const findChangedFilesUsingCommand = async (
           resolve(
             stdout
               .split('\n')
+              .filter(s => s !== '')
               .map(changedPath => path.resolve(cwd, changedPath)),
           );
         }

diff --git a/packages/jest-changed-files/src/hg.js b/packages/jest-changed-files/src/hg.js
@@ -27,7 +27,7 @@ const adapter: SCMAdapter = {
       if (options && options.withAncestor) {
         args.push('--rev', 'ancestor(.^)');
       } else if (options && options.sinceCommit) {
-        args.push(`--rev', 'ancestor(., ${options.sinceCommit})`);
+        args.push('--rev', `ancestor(., ${options.sinceCommit})`);
       } else if (options && options.lastCommit === true) {
         args = ['tip', '--template', '{files%"{file}\n"}'];
       }