[PR PATCH] [RFC] xbps-src: add a command `show-diff`

[PR PATCH] [RFC] xbps-src: add a command `show-diff`

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 1031 bytes --]

There is a new pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages show-diff
https://github.com/void-linux/void-packages/pull/53950

[RFC] xbps-src: add a command `show-diff`
Usage: ./xbps-src show-diff PKG

Shows differences between the original sources and $wrksrc, in the form
of a patch that can be used for the template.

Note this ignores new files.


#### Testing the changes
- I tested the changes in this PR: **briefly**


#### Alternatives

One alternative suggested in irc is to use unpatch from

https://leahneukirchen.org/dotfiles/bin/unpatch

Save the original files as .orig, then run

- `unpatch -g -p3 masterdir-*/builddir/pkg-ver`

With vim, one can use `:set patchmode=.orig`


Two more suggestions from irc related to this:

 - `alias xpatch="nvim -c 'set patchmode=.orig'"`

 - `autocmd BufNewFile,BufRead masterdir-*/builddir/* setlocal patchmode=.orig`


A patch file from https://github.com/void-linux/void-packages/pull/53950.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-show-diff-53950.patch --]
[-- Type: text/x-diff, Size: 1248 bytes --]

From f912225d0bc665b112a059b193471efdeaa1f7e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 12 Jan 2025 19:10:43 -0300
Subject: [PATCH] xbps-src: add a command `show-diff`

Usage: ./xbps-src show-diff PKG

Shows differences between the original sources and $wrksrc, in the form
of a patch that can be used for the template.

Note this ignores new files.
---
 xbps-src | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/xbps-src b/xbps-src
index c17270b62ee4b5..63e570dd7b1a00 100755
--- a/xbps-src
+++ b/xbps-src
@@ -968,6 +968,18 @@ case "$XBPS_TARGET" in
                 fi # The trailing space gets stripped before printing anyway
         done
         ;;
+    show-diff)
+        read_pkg ignore-problems
+        mkdir -p "${XBPS_STATEDIR}/show-diff"
+        cd "${XBPS_STATEDIR}/show-diff"
+        if [ ! -d clean-wrksrc ]; then
+            ( . "${XBPS_COMMONDIR}/hooks/do-extract/00-distfiles.sh"
+              wrksrc="$PWD/clean-wrksrc" hook )
+            ln -Ts clean-wrksrc a
+            ln -Trs "$wrksrc" b
+        fi
+        diff -ru a b | grep -v '^Only in b[/:]'
+        ;;
     dbulk-dump)
         read_pkg
         check_pkg_arch "$XBPS_CROSS_BUILD"

Re: [RFC] xbps-src: add a command `show-diff`

[sgn]

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/53950#issuecomment-2592763029

Comment:
I would say, just use `quilt` ;)

Re: [RFC] xbps-src: add a command `show-diff`

[github-actions]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/53950#issuecomment-2808013957

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [RFC] xbps-src: add a command `show-diff`

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 382 bytes --]

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/53950#issuecomment-2809675596

Comment:
Ping if this is deemed interesting / useful / worthy of merging or not.

To be fair, the suggestion of using https://leahneukirchen.org/dotfiles/bin/unpatch is quite good, assuming one took care of setting `patchmode=.orig` as suggested.

Re: [PR PATCH] [Closed]: [RFC] xbps-src: add a command `show-diff`

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 876 bytes --]

There's a closed pull request on the void-packages repository

[RFC] xbps-src: add a command `show-diff`
https://github.com/void-linux/void-packages/pull/53950

Description:
Usage: ./xbps-src show-diff PKG

Shows differences between the original sources and $wrksrc, in the form
of a patch that can be used for the template.

Note this ignores new files.


#### Testing the changes
- I tested the changes in this PR: **briefly**


#### Alternatives

One alternative suggested in irc is to use unpatch from

https://leahneukirchen.org/dotfiles/bin/unpatch

Save the original files as .orig, then run

- `unpatch -g -p3 masterdir-*/builddir/pkg-ver`

With vim, one can use `:set patchmode=.orig`


Two more suggestions from irc related to this:

 - `alias xpatch="nvim -c 'set patchmode=.orig'"`

 - `autocmd BufNewFile,BufRead masterdir-*/builddir/* setlocal patchmode=.orig`