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.

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

copy-tracking: improve --summary and add --stat #4245

Merged
merged 1 commit into from
Aug 14, 2024
Merged

copy-tracking: improve --summary and add --stat #4245

merged 1 commit into from
Aug 14, 2024

Conversation

fowles
Copy link
Contributor

@fowles fowles commented Aug 9, 2024 •
edited
Loading

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

@ilyagr
Copy link
Contributor

ilyagr commented Aug 9, 2024 •
edited
Loading

How is this related to #4118 (and is it)? I haven't been following that discussion as closely as I would have liked, so I'm wondering whether to look there or here first when I finally get to trying to understand how copy-tracking works (no need to wait for me though).

@fowles
Copy link
Contributor Author

fowles commented Aug 9, 2024

How is this related to #4118 (and is it)? I haven't been following that discussion as closely as I would have liked, so I'm wondering whether to look there or here first when I finally get to trying to understand how copy-tracking works (no need to wait for me though).

it builds on it. You only need to look at the last commit on this one.

@fowles fowles force-pushed the diff-stat branch 10 times, most recently from 9a89e86 to f92f459 Compare August 10, 2024 02:18
PhilipMetzger
PhilipMetzger requested changes Aug 10, 2024
View reviewed changes
Copy link
Contributor

@PhilipMetzger PhilipMetzger left a comment

Choose a reason for hiding this comment

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

This is great, there are just some minor nits.

CHANGELOG.md Outdated Show resolved Hide resolved
cli/src/text_util.rs Outdated Show resolved Hide resolved
cli/src/text_util.rs Outdated Show resolved Hide resolved
@fowles fowles force-pushed the diff-stat branch 3 times, most recently from 43787cc to 89604ba Compare August 11, 2024 21:32
@fowles fowles changed the title copy-tracking: add support for copies tracking to diff --stat @fowles copy-tracking: improve --summary and add --stat Aug 11, 2024
@fowles fowles force-pushed the diff-stat branch 2 times, most recently from 2fb2243 to 8fb40e0 Compare August 11, 2024 21:45
PhilipMetzger
PhilipMetzger approved these changes Aug 12, 2024
View reviewed changes
Copy link
Contributor

@PhilipMetzger PhilipMetzger left a comment

Choose a reason for hiding this comment

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

LG, maybe Yuya or Martin should take a look too

cli/src/text_util.rs Outdated Show resolved Hide resolved
cli/src/diff_util.rs Outdated Show resolved Hide resolved
cli/src/text_util.rs Outdated Show resolved Hide resolved
yuja
yuja reviewed Aug 13, 2024
View reviewed changes
cli/src/text_util.rs Outdated Show resolved Hide resolved
cli/src/commit_templater.rs Show resolved Hide resolved
@fowles fowles force-pushed the diff-stat branch 3 times, most recently from 224f52e to 962a5ed Compare August 13, 2024 21:29
martinvonz
martinvonz reviewed Aug 14, 2024
View reviewed changes
lib/src/repo_path.rs Show resolved Hide resolved
lib/src/repo_path.rs Show resolved Hide resolved
@fowles
copy-tracking: improve --summary and add --stat
5973730 
- add support for copy tracking to `diff --stat`
- switch `--summary` to match git's output more closely
- rework `show_diff_summary` signature to be more consistent
@fowles fowles enabled auto-merge (rebase) August 14, 2024 01:28
@fowles fowles merged commit ec99a17 into jj-vcs:main Aug 14, 2024
17 checks passed
@fowles fowles deleted the diff-stat branch August 14, 2024 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martinvonz martinvonz martinvonz left review comments

@yuja yuja yuja left review comments

@PhilipMetzger PhilipMetzger PhilipMetzger approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@fowles @ilyagr @yuja @martinvonz @PhilipMetzger