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

Use patches for revisions #42

Open
michaelpj opened this issue Mar 15, 2023 · 2 comments · May be fixed by #51
Open

Use patches for revisions #42

michaelpj opened this issue Mar 15, 2023 · 2 comments · May be fixed by #51
Assignees
@yvan-sraka

Comments

@michaelpj
Copy link
Collaborator

At the moment revisions are done by providing the whole new cabal file. This is annoying to do, and hard to review. An alternative would be to define revisions as patches.

  • The patch should be relative to the last revised cabal file (so you can stack them)
  • We probably want to support full cabal files also? For backwards compatibility?
  • We could decide whether the file is a cabal file or a patch based on the file extension

For applying patches I think we could either shell out to patch, or maybe there's a library on Hackage that replicates its functionality?
@michaelpj michaelpj mentioned this issue Mar 28, 2023
Merged
@jasagredo
Copy link

jasagredo commented Mar 28, 2023 •
edited

In the meantime, one can use this script I put together to review the Consensus update on https://github.com/input-output-hk/cardano-haskell-packages/pull/180

It should be easy to use:

❯ diff-chap-revs diff_all ouroboros-consensus 0.3.0.0
Checked out ouroboros-network at commit d64a5d253b751d465c5c48799dea6b234c2a329a
Diffing revision 1, press something to continue...

Have in mind it just worked for what I needed it to work, it might fail in other esoteric cases!

yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue Apr 17, 2023
@yvan-sraka
Fix input-output-hk#42: use patches for revisions
5ca4637
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue Apr 17, 2023
@yvan-sraka
Fix input-output-hk#42: use patches for revisions
d6fbbb5
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue Apr 17, 2023
@yvan-sraka
Fix input-output-hk#42: use patches for revisions
0d62575
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue Apr 17, 2023
@yvan-sraka
Fix input-output-hk#42: use patches for revisions
c7cbd00
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue Apr 17, 2023
@yvan-sraka
Fix input-output-hk#42: use patches for revisions
9aadf77
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue Apr 17, 2023
@yvan-sraka
Fix input-output-hk#42: use patches for revisions
c0f93ae
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue Apr 17, 2023
@yvan-sraka
Fix input-output-hk#42: use patches for revisions
ea09388
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue Apr 17, 2023
@yvan-sraka
Fix input-output-hk#42: use patches for revisions
6d37076
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue Apr 17, 2023
@yvan-sraka
Fix input-output-hk#42: use patches for revisions
701ee2c
@yvan-sraka
Copy link
Contributor

I tried to draft an implementation here #51 feel free to comment it :)

yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue Apr 21, 2023
@yvan-sraka
Fix input-output-hk#42: use patches for revisions
a0cbd0d
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue Apr 25, 2023
@yvan-sraka @michaelpj
Fix input-output-hk#42: use patches for revisions
53a2471 
Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
@yvan-sraka yvan-sraka linked a pull request May 3, 2023 that will close this issue
Fix #42: use patches for revisions #51
Draft
@yvan-sraka yvan-sraka self-assigned this May 3, 2023
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue May 5, 2023
@yvan-sraka @michaelpj
Fix input-output-hk#42: use patches for revisions
fd5a51d 
Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue May 5, 2023
@yvan-sraka @michaelpj
Fix input-output-hk#42: use patches for revisions
9ecb7da 
Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue May 23, 2023
@yvan-sraka @michaelpj
Fix input-output-hk#42: use patches for revisions
81b2e1d 
Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue May 23, 2023
@yvan-sraka @michaelpj
Fix input-output-hk#42: use patches for revisions
6a6d985 
Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue May 23, 2023
@yvan-sraka @michaelpj
Fix input-output-hk#42: use patches for revisions
77ab848 
Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue May 23, 2023
@yvan-sraka @michaelpj
Fix input-output-hk#42: use patches for revisions
a0187da 
Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue Sep 5, 2023
@yvan-sraka @michaelpj
Fix input-output-hk#42: use patches for revisions
1d23379 
Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
yvan-sraka added a commit to yvan-sraka/foliage that referenced this issue Sep 22, 2023
@yvan-sraka @michaelpj
Fix input-output-hk#42: use patches for revisions
d56b79b 
Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
andreabedini pushed a commit to yvan-sraka/foliage that referenced this issue Apr 11, 2024
@yvan-sraka @michaelpj @andreabedini
Fix input-output-hk#42: use patches for revisions
09df34e 
Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@yvan-sraka yvan-sraka

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Fix #42: use patches for revisions yvan-sraka/foliage
3 participants
@yvan-sraka @michaelpj @jasagredo