Skip to content

Restore CMD prompt modifier #14713

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

Jump to bottom
Merged
merged 4 commits into from
Apr 2, 2025
Merged

Restore CMD prompt modifier #14713

merged 4 commits into from
Apr 2, 2025

Conversation

kenodegard
Copy link
Contributor

@kenodegard kenodegard commented Mar 26, 2025 •
edited
Loading

Description

Resolves #14711

CMD's shell script previously handled setting/unsetting the %PROMPT% manually, e.g.:

conda/conda/shell/condabin/_conda_activate.bat

Line 37 in 4275fa2

@IF NOT "%CONDA_PROMPT_MODIFIER%" == "" @CALL SET "PROMPT=%%PROMPT:%CONDA_PROMPT_MODIFIER%=%_empty_not_set_%%%"

conda/conda/shell/condabin/_conda_activate.bat

Line 42 in 4275fa2

@SET "PROMPT=%CONDA_PROMPT_MODIFIER%%PROMPT%"

This was missed in #14607 (because I was using https://starship.rs/) and resulted in a regression.

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

@github-project-automation github-project-automation bot moved this to 🆕 New in 🔎 Review Mar 26, 2025
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Mar 26, 2025
@kenodegard kenodegard changed the base branch from main to 25.3.x March 26, 2025 21:38
@codspeed-hq CodSpeed HQ
Copy link

codspeed-hq bot commented Mar 26, 2025 •
edited
Loading

CodSpeed Performance Report

Merging #14713 will not alter performance

Comparing kenodegard:cmd-prompt (5ffff32) with main (2e75740)

Summary

✅ 21 untouched benchmarks

@kenodegard kenodegard mentioned this pull request Mar 27, 2025
Closed
2 tasks
jezdez
jezdez reviewed Mar 31, 2025
View reviewed changes
@kenodegard kenodegard moved this from 🆕 New to 👀 In Review in 🔎 Review Apr 1, 2025
@kenodegard kenodegard marked this pull request as ready for review April 1, 2025 03:31
@kenodegard kenodegard requested a review from a team as a code owner April 1, 2025 03:31
jjhelmus
jjhelmus previously approved these changes Apr 1, 2025
View reviewed changes
@github-project-automation github-project-automation bot moved this from 👀 In Review to ✅ Approved in 🔎 Review Apr 1, 2025
jezdez
jezdez previously approved these changes Apr 1, 2025
View reviewed changes
@jezdez
Copy link
Member

jezdez commented Apr 1, 2025

I kicked the failing tests again

@jezdez
Copy link
Member

jezdez commented Apr 1, 2025

Seems like test_cmd_exe_basic needs to be patched as well https://github.com/kenodegard/conda/blob/2c7758c280dc962e565ee9498188557b1db6582e/tests/test_activate.py#L1472-L1481

@kenodegard kenodegard dismissed stale reviews from jezdez and jjhelmus via 5ffff32 April 1, 2025 13:55
@kenodegard kenodegard added this to the 25.3.x milestone Apr 1, 2025
@jezdez jezdez merged commit 7114724 into conda:25.3.x Apr 2, 2025
85 checks passed
@github-project-automation github-project-automation bot moved this from ✅ Approved to 🏁 Done in 🔎 Review Apr 2, 2025
@kenodegard kenodegard deleted the cmd-prompt branch April 2, 2025 22:00
@millsks millsks mentioned this pull request Jul 29, 2025
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jezdez jezdez jezdez approved these changes

@jjhelmus jjhelmus jjhelmus left review comments

Assignees
No one assigned
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
🔎 Review
Archived in project
Milestone
25.3.x
Development

Successfully merging this pull request may close these issues.

conda 25.3 doesn't show environment name in cmd prompt
4 participants
@kenodegard @jezdez @jjhelmus @conda-bot