From e714e6e4621a8f364cf024b580f1b177bccc8d36 Mon Sep 17 00:00:00 2001 From: mrazauskas <72159681+mrazauskas@users.noreply.github.com> Date: Tue, 8 Feb 2022 12:03:44 +0200 Subject: [PATCH] fix revset --- e2e/__tests__/jestChangedFiles.test.ts | 2 -- packages/jest-changed-files/src/hg.ts | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/__tests__/jestChangedFiles.test.ts b/e2e/__tests__/jestChangedFiles.test.ts index 7cc662c4fd97..fbb0c532cfef 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 02f1ea6099cd..20ae92a32dd3 100644 --- a/packages/jest-changed-files/src/hg.ts +++ b/packages/jest-changed-files/src/hg.ts @@ -18,7 +18,9 @@ const adapter: SCMAdapter = { const args = ['status', '-amnu']; if (options.withAncestor) { - args.push('--rev', 'min((!public() & ::.)+.)^'); + // working suggestion + // args.push('--rev', 'min((not public() and ancestors(.))^ or .^)'); + args.push('--rev', 'min((!public() & ::.)+.)^1'); } else if (options.changedSince) { args.push('--rev', `ancestor(., ${options.changedSince})`); } else if (options.lastCommit === true) {