-
Notifications
You must be signed in to change notification settings - Fork 346
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
base: main
Are you sure you want to change the base?
Conversation
213f80a
to
433e28d
Compare
There was a problem hiding this 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.
// TODO: Report this path to the caller | ||
self.untracked_paths_tx | ||
.send((path, UntrackedReason::FileNotAutoTracked)) | ||
.ok(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just reminder: we also need to report untracked directories containing untracked files, but that can be addressed separately.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add some tests?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will be out of town over the weekend and I'm not sure how much time a will have next week, so it might be a while before I get to that.
@@ -85,6 +87,14 @@ pub(crate) fn cmd_status( | |||
)?; | |||
} | |||
|
|||
formatter.with_label("diff", |formatter| { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: can you leave a TODO comment about watchman somewhere?
See 168c797 for the issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
… tracked because of snapshot.auto-track
433e28d
to
f891e16
Compare
@@ -258,6 +258,8 @@ pub enum UntrackedReason { | |||
/// Maximum allowed size. | |||
max_size: u64, | |||
}, | |||
/// Setting snapshot.auto-track did not match this file. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: I initially parsed "Setting" as a verb. Maybe "Setting" -> "Config"?
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:
CHANGELOG.md