Skip to content
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

show untracked files in jj status #5138

Merged
merged 3 commits into from
Jan 5, 2025
Merged

Conversation

cstoitner
Copy link
Contributor

@cstoitner cstoitner commented Dec 18, 2024

This adds the plumbing to get the untracked files from the snapshot to the status command and displays them similar to mercurial. I am not sure if this is the right way to do this.

This might be the last thing to fix #323.

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

Copy link
Contributor

@yuja yuja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! The implementation generally looks good to me.

lib/src/local_working_copy.rs Show resolved Hide resolved
cli/src/cli_util.rs Outdated Show resolved Hide resolved
cli/src/commands/status.rs Show resolved Hide resolved
cli/src/commands/status.rs Outdated Show resolved Hide resolved
lib/src/working_copy.rs Outdated Show resolved Hide resolved
Copy link
Contributor

@yuja yuja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

cli/tests/test_status_command.rs Outdated Show resolved Hide resolved
cli/tests/test_status_command.rs Show resolved Hide resolved
@yuja
Copy link
Contributor

yuja commented Jan 2, 2025

Just in case you didn't know, "when your first PR has been approved, we typically give you contributor access, so you can address any remaining minor comments and then merge the PR yourself when you're ready."
https://jj-vcs.github.io/jj/latest/contributing/#code-reviews

@cstoitner cstoitner merged commit ae91f22 into jj-vcs:main Jan 5, 2025
19 checks passed
@martinvonz
Copy link
Member

I think this feature definitely deserves an entry in CHANGELOG.md. Could you send a PR for that?

@cstoitner cstoitner deleted the status_untracked branch January 5, 2025 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Auto-add of untracked files screws me up every time
3 participants