Skip to content

repl: Don't wait on incomplete parses from imported file (backport #13334) #13623

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.

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

Open
wants to merge 2 commits into
base: 2.28-maintenance
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 30, 2025

Motivation

The repl should only catch "unexpected end of file" parse errors from the top-level expression, not from imported files.

Fixes #13332.

Context


Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.


This is an automatic backport of pull request #13334 done by [Mergify](https://mergify.com).

edolstra added 2 commits July 30, 2025 12:42
Fixes #13332.

(cherry picked from commit d8b067b)

# Conflicts:
#	src/libcmd/repl.cc
(cherry picked from commit 91b3573)
Copy link
Contributor Author

mergify bot commented Jul 30, 2025

Cherry-pick of d8b067b has failed:

On branch mergify/bp/2.28-maintenance/pr-13334
Your branch is up to date with 'origin/2.28-maintenance'.

You are currently cherry-picking commit d8b067b54.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   tests/functional/repl.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/libcmd/repl.cc

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue labels Jul 30, 2025
@mergify mergify bot requested a review from edolstra as a code owner July 30, 2025 12:42
@github-actions github-actions bot added with-tests Issues related to testing. PRs with tests have some priority repl The Read Eval Print Loop, "nix repl" command and debugger labels Jul 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue repl The Read Eval Print Loop, "nix repl" command and debugger with-tests Issues related to testing. PRs with tests have some priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant