cargo-mutants icon indicating copy to clipboard operation
cargo-mutants copied to clipboard

Replace patch with gitpatch

Open psandana opened this issue 7 months ago • 8 comments
trafficstars

patch crate is unmaintained: https://github.com/uniphil/patch-rs/issues/29

Project has been forked, and a new version with fixes has been created: https://github.com/gitpatch-rs/gitpatch

gitpatch version 0.7.1 is a direct replacement of patch version 0.7.0. Thus, no major changes are required.

psandana avatar Apr 15 '25 20:04 psandana

Thanks,

Also, I think I added a workaround for the "binary files differ" failure, which should be removed as it will no longer be necessary.

Martin

On Tue, Apr 15, 2025 at 1:34 PM Pato Sandaña @.***> wrote:

patch crate is unmaintained: uniphil/patch-rs#29 https://github.com/uniphil/patch-rs/issues/29

Project has been forked, and a new version with fixes has been created: https://github.com/gitpatch-rs/gitpatch

gitpatch version 0.7.1 is a direct replacement of patch version 0.7.0. Thus, no major changes are required.

You can view, comment on, or merge this pull request online at:

https://github.com/sourcefrog/cargo-mutants/pull/507 Commit Summary

File Changes

(3 files https://github.com/sourcefrog/cargo-mutants/pull/507/files)

Patch Links:

  • https://github.com/sourcefrog/cargo-mutants/pull/507.patch
  • https://github.com/sourcefrog/cargo-mutants/pull/507.diff

— Reply to this email directly, view it on GitHub https://github.com/sourcefrog/cargo-mutants/pull/507, or unsubscribe https://github.com/notifications/unsubscribe-auth/AACUR4ZDAVTPBDH72NWBEMT2ZVUNHAVCNFSM6AAAAAB3GSPOXCVHI2DSMVQWIX3LMV43ASLTON2WKOZSHE4TONJUHAZDGOI . You are receiving this because you are subscribed to this thread.Message ID: @.***>

sourcefrog avatar Apr 16 '25 03:04 sourcefrog

Thanks, Also, I think I added a workaround for the "binary files differ" failure, which should be removed as it will no longer be necessary. Martin

There are more issues than the first one. Like this one: https://github.com/uniphil/patch-rs/issues/24.

psandana avatar Apr 16 '25 16:04 psandana

Yes, I'm in favor of updating to a maintained fork, I'm just adding a note (maybe for myself) to remove the obsolete workaround.

Message ID: @.***>

sourcefrog avatar Apr 16 '25 22:04 sourcefrog

Specifically 78b7e313a4f3cc9bab504ca5d643c0ce3d9ce7a9 could be partially reverted, leaving the test in place, and the changelog entry.

sourcefrog avatar Apr 21 '25 15:04 sourcefrog

@sourcefrog maybe I misunderstood. Do you want me to do these changes on this PR?

Specifically 78b7e31 could be partially reverted, leaving the test in place, and the changelog entry.

psandana avatar Apr 22 '25 14:04 psandana

If you can do it that would be great

sourcefrog avatar Apr 22 '25 14:04 sourcefrog

@sourcefrog I partially reverted 78b7e31. Is anything left? :)

psandana avatar Apr 29 '25 21:04 psandana

Thanks, removal of the workaround looks good.

Let's wait and see about patch vs gitpatch in https://github.com/uniphil/patch-rs/issues/29#issuecomment-2848209412. No need to bifurcate if upstream is actually still maintained.

sourcefrog avatar May 04 '25 15:05 sourcefrog

I just looked at this again in the context of fixing #547, where I hit https://github.com/gitpatch-rs/gitpatch/issues/4.

At the moment it's unclear to me whether patch-rs or gitpatch is going to be better maintained. There is a PR https://github.com/gitpatch-rs/gitpatch/pull/5 to fix that bug but it's been open for a few months. Both libraries have issues open asking about maintenance.

sourcefrog avatar Oct 05 '25 16:10 sourcefrog