From e98a36d3af64862e2c2cd6aef84f69e4c73c5e1d Mon Sep 17 00:00:00 2001 From: mrazauskas <72159681+mrazauskas@users.noreply.github.com> Date: Tue, 8 Feb 2022 11:53:25 +0200 Subject: [PATCH] alternative revset --- e2e/__tests__/jestChangedFiles.test.ts | 2 -- packages/jest-changed-files/src/hg.ts | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/e2e/__tests__/jestChangedFiles.test.ts b/e2e/__tests__/jestChangedFiles.test.ts index 52f32931017f..dc85fec1f983 100644 --- a/e2e/__tests__/jestChangedFiles.test.ts +++ b/e2e/__tests__/jestChangedFiles.test.ts @@ -47,8 +47,6 @@ function gitCreateBranch(branchName: string, dir: string) { run(`git branch ${branchName}`, dir); } -jest.retryTimes(3); - beforeEach(() => cleanup(DIR)); afterEach(() => cleanup(DIR)); diff --git a/packages/jest-changed-files/src/hg.ts b/packages/jest-changed-files/src/hg.ts index 196b5b2c611b..c7147a004697 100644 --- a/packages/jest-changed-files/src/hg.ts +++ b/packages/jest-changed-files/src/hg.ts @@ -20,7 +20,8 @@ const adapter: SCMAdapter = { const args = ['status', '-amnu']; if (options && options.withAncestor) { - args.push('--rev', 'min((not public() and ancestors(.))^ or .^)'); + // args.push('--rev', 'min((not public() and ancestors(.))^ or .^)'); + args.push('--rev', 'min((!public() & ::.)+.)^1'); } else if (options && options.changedSince) { args.push('--rev', `ancestor(., ${options.changedSince})`); } else if (options && options.lastCommit === true) {