Skip to content

Git support for --changedFilesWithAncestor #5189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cpojer merged 8 commits into from
Jan 4, 2018
Merged

Git support for --changedFilesWithAncestor #5189

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c574721
refactor of findChangedFiles
alsuren Dec 27, 2017
beefdbc
make --changedFilesWithAncestor work with git
alsuren Dec 27, 2017
0c20845
fixup! refactor of findChangedFiles
alsuren Dec 27, 2017
007104e
add withAncestor test to git
alsuren Dec 27, 2017
129d52d
docs: update changedFilesWithAncestor's description
alsuren Dec 27, 2017
f6f5f47
docs: add --changedFilesWithAncestor fix to changelog
alsuren Dec 27, 2017
86451ba
docs: updated docs for --changedFilesWithAncestor and --lastCommit
alsuren Dec 28, 2017
4b15f86
docs: mention --watch in --changedFilesWithAncestor docs
alsuren Dec 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
refactor of findChangedFiles
  • Loading branch information
@alsuren
alsuren committed Dec 27, 2017
commit c57472193747ff96cdcc809cb6f35be6dd1de02e
50 changes: 28 additions & 22 deletions packages/jest-changed-files/src/git.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,33 @@ import type {Options, SCMAdapter} from 'types/ChangedFiles';
import path from 'path';
import childProcess from 'child_process';

const findChangedFilesUsingCommand = async (args, cwd) => {
return new Promise((resolve, reject) => {
const child = childProcess.spawn('git', args, {cwd});
let stdout = '';
let stderr = '';
child.stdout.on('data', data => (stdout += data));
child.stderr.on('data', data => (stderr += data));
child.on('error', e => reject(e));
child.on('close', code => {
if (code === 0) {
stdout = stdout.trim();
if (stdout === '') {
resolve([]);
} else {
resolve(
stdout
.split('\n')
.map(changedPath => path.resolve(cwd, changedPath)),
);
}
} else {
reject(code + ': ' + stderr);
}
});
});
};

const adapter: SCMAdapter = {
findChangedFiles: async (
cwd: string,
Expand All @@ -28,28 +55,7 @@ const adapter: SCMAdapter = {
options && options.lastCommit
? ['show', '--name-only', '--pretty=%b', 'HEAD']
: ['ls-files', '--other', '--modified', '--exclude-standard'];
const child = childProcess.spawn('git', args, {cwd});
let stdout = '';
let stderr = '';
child.stdout.on('data', data => (stdout += data));
child.stderr.on('data', data => (stderr += data));
child.on('error', e => reject(e));
child.on('close', code => {
if (code === 0) {
stdout = stdout.trim();
if (stdout === '') {
resolve([]);
} else {
resolve(
stdout
.split('\n')
.map(changedPath => path.resolve(cwd, changedPath)),
);
}
} else {
reject(code + ': ' + stderr);
}
});
resolve(findChangedFilesUsingCommand(args, cwd));
});
},

Expand Down