tag 303738 -patch thanks Hello & sorry it took me so long to answer.
I do not like your patch because it is way to intrusive. You not only add
the '---' you want, but also kill most of the "quilt refresh" smartness.
"patch" tag thus removed before a better version is proposed.
Moreover, not all the users want this behaviour change. It should be made
optionnal. One way to achieve this would be with header templates. There was
a lot of discution about templates upstream, but nothing was implemented
yet.
If you want, feel free to contact upstream and help to implement header
templates.
Bye, Mt.
On Fri, Apr 08, 2005 at 03:40:49PM +0200, Martin Waitz wrote:
> Package: quilt
> Version: 0.39-2
> Severity: wishlist
> Tags: patch
>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> hoi :)
>
> I like to put the diffstat behind a --- separator as it really
> does not belong to the description of the patch.
> This is also the preferred format used on LKML.
>
> something like the thing below:
>
> - --- /usr/share/quilt/refresh.orig 2005-04-08 14:57:57.984032822 +0200
> +++ /usr/share/quilt/refresh 2005-04-08 15:20:33.290933467 +0200
> @@ -207,38 +207,13 @@
>
> tmp_result=$(gen_tempfile) || die 1
>
> +cat $tmp_header > $tmp_result
> +
> if [ -n "$opt_diffstat" ]
> then
> - - diffstat="$(diffstat -p$opt_strip_level $tmp_patch)" || die 1
> - - /usr/bin/gawk '
> - - function print_diffstat(arr, i) {
> - - split(diffstat, arr, "\n")
> - - for (i=1; i in arr; i++)
> - - print prefix arr[i]
> - - }
> - - BEGIN { split(diffstat, ds_arr, /\n/) }
> - - { prefix=""
> - - if (index($0, "#") == 1)
> - - prefix="#"
> - - }
> - - /.*\|.*/ { eat = eat $0 "\n"
> - - next }
> - - /.* files? changed(, .* insertions?\(\+\))?(, .* deletions?\(-\))?/
> \
> - - { print_diffstat()
> - - diffstat = "" ; eat = ""
> - - next }
> - - { print eat $0
> - - eat = "" }
> - - END { printf "%s", eat
> - - if (diffstat != "") {
> - - print_diffstat()
> - - print prefix
> - - }
> - - }
> - - ' diffstat="$diffstat" \
> - - $tmp_header > $tmp_result
> - -else
> - - cat $tmp_header > $tmp_result
> + echo "---" >> $tmp_result
> + diffstat -p$opt_strip_level $tmp_patch >> $tmp_result
> + echo >> $tmp_result
> fi
>
> cat $tmp_patch >> $tmp_result
>
> - -- System Information:
> Debian Release: 3.1
> APT prefers testing
> APT policy: (500, 'testing')
> Architecture: i386 (i686)
> Kernel: Linux 2.6.9-uml-faumachine
> Locale: LANG=en_US, LC_CTYPE=en_US (charmap=UTF-8) (ignored: LC_ALL set to
> de_DE.UTF-8)
>
> Versions of packages quilt depends on:
> ii bzip2 1.0.2-5 high-quality block-sorting file
> co
> ii diffstat 1.38-1 produces graph of changes
> introduc
> ii gawk 1:3.1.4-2 GNU awk, a pattern scanning and
> pr
> ii gettext 0.14.1-10 GNU Internationalization
> utilities
> ii libc6 2.3.2.ds1-20 GNU C Library: Shared libraries
> an
> ii patch 2.5.9-2 Apply a diff file to an original
>
> - -- no debconf information
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.2.5 (GNU/Linux)
>
> iD8DBQFCVongj/Eaxd/oD7IRAjQFAJ9Xb8TdDxd7V6xXY2qJnQn7tKFWpQCfWoKR
> Kj+3Rgs74MUSCJjTikvEBCw=
> =KsxR
> -----END PGP SIGNATURE-----
>
>
--
Le capitalisme, c'est l'exploitation de l'homme par l'homme.
Le communisme, c'est le contraire.
-- Coluche
signature.asc
Description: Digital signature
