Your message dated Mon, 26 Jan 2009 10:17:07 +0000
with message-id <[email protected]>
and subject line Bug#433831: fixed in patchutils 0.3.1-1
has caused the Debian Bug report #433831,
regarding Improvement of filterdiff feature in patchutils: --add{old,new}prefix
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
433831: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=433831
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: patchutils
Version: 0.2.31-1
Tags: patch
Submitter: Paul Gortmaker <[email protected]>
----- Forwarded message from Paul Gortmaker <[email protected]> -----
Date: Wed, 18 Jul 2007 16:39:42 -0400
From: Paul Gortmaker <[email protected]>
To: [email protected], [email protected]
Subject: Improvement of filterdiff feature in patchutils
Hi guys,
I came across a use case where I thought it would be nice to expand the
--addprefix=PREFIX support to allow independent prefix for both the
original and the updated file in the diff -- e.g. the "a" and "b" so
commonly seen in git diffs.
I've added this with --addoldprefix=... and --addnewprefix=... while
still maintaining the old option to set both as once. I've also
updated the man page source.
Hope you think it is a useful update that others may also have an
interest in -- thanks for creating and maintaining the original.
Thanks,
Paul.
--
--- patchutils-0.2.31/src/filterdiff.c~ 2007-07-18 13:34:41.000000000 -0400
+++ patchutils-0.2.31/src/filterdiff.c 2007-07-18 13:51:17.000000000 -0400
@@ -82,6 +82,8 @@
static int ignore_components = 0;
static int strip_components = 0;
static const char *prefix_to_add = NULL;
+static const char *old_prefix_to_add = NULL;
+static const char *new_prefix_to_add = NULL;
static int show_status = 0;
static int verbose = 0;
static int removing_timestamp = 0;
@@ -155,6 +157,12 @@
if (prefix_to_add)
fputs (prefix_to_add, stdout);
+ else {
+ if (old_prefix_to_add && strncmp (line, "---", 3) == 0)
+ fputs (old_prefix_to_add, stdout);
+ if (new_prefix_to_add && strncmp (line, "+++", 3) == 0)
+ fputs (new_prefix_to_add, stdout);
+ }
fn = xstrndup (line + 4, h);
fputs (stripped (fn, strip_components), stdout);
@@ -1040,6 +1048,10 @@
" --strip=N initial pathname components to strip\n"
" --addprefix=PREFIX\n"
" prefix pathnames with PREFIX\n"
+" --addoldprefix=PREFIX\n"
+" prefix pathnames in old files with PREFIX\n"
+" --addnewprefix=PREFIX\n"
+" prefix pathnames in new files with PREFIX\n"
" -s show file additions and removals (lsdiff)\n"
" -v verbose output -- use more than once for extra verbosity\n"
" -E use extended regexps, like egrep (grepdiff)\n"
@@ -1243,6 +1255,8 @@
{"grep", 0, 0, 'g'},
{"strip", 1, 0, 1000 + 'S'},
{"addprefix", 1, 0, 1000 + 'A'},
+ {"addoldprefix", 1, 0, 1000 + 'O'},
+ {"addnewprefix", 1, 0, 1000 + 'N'},
{"hunks", 1, 0, '#'},
{"lines", 1, 0, 1000 + ':'},
{"files", 1, 0, 1000 + 'w'},
@@ -1301,6 +1315,12 @@
case 1000 + 'A':
prefix_to_add = optarg;
break;
+ case 1000 + 'O':
+ old_prefix_to_add = optarg;
+ break;
+ case 1000 + 'N':
+ new_prefix_to_add = optarg;
+ break;
case 'p':
ignore_components = strtoul (optarg, &end, 0);
if (optarg == end)
--- patchutils-0.2.31/doc/filterdiff.1~ 2007-07-18 13:56:02.000000000 -0400
+++ patchutils-0.2.31/doc/filterdiff.1 2007-07-18 14:02:15.000000000 -0400
@@ -24,7 +24,7 @@
.ad l
.hy 0
.HP 11
-\fBfilterdiff\fR [\-i\ \fIPATTERN\fR] [\-p\ \fIn\fR] [\-\-strip=\fIn\fR]
[\-\-addprefix=\fIPREFIX\fR] [\-x\ \fIPATTERN\fR] [\-\-verbose] [\-v] [\-z]
[\fB\-#\ \fIRANGE\fR\fR | \fB\-\-hunks=\fIRANGE\fR\fR] [\-\-lines=\fIRANGE\fR]
[\-\-files=\fIRANGE\fR] [\-\-annotate] [\-\-format=\fIFORMAT\fR]
[\-\-as\-numbered\-lines=\fIWHEN\fR] [\-\-remove\-timestamps] [\fIfile\fR...]
+\fBfilterdiff\fR [\-i\ \fIPATTERN\fR] [\-p\ \fIn\fR] [\-\-strip=\fIn\fR]
[\-\-addprefix=\fIPREFIX\fR] [\-\-addoldprefix=\fIPREFIX\fR]
[\-\-addnewprefix=\fIPREFIX\fR] [\-x\ \fIPATTERN\fR] [\-\-verbose] [\-v] [\-z]
[\fB\-#\ \fIRANGE\fR\fR | \fB\-\-hunks=\fIRANGE\fR\fR] [\-\-lines=\fIRANGE\fR]
[\-\-files=\fIRANGE\fR] [\-\-annotate] [\-\-format=\fIFORMAT\fR]
[\-\-as\-numbered\-lines=\fIWHEN\fR] [\-\-remove\-timestamps] [\fIfile\fR...]
.ad
.hy
.ad l
@@ -95,6 +95,18 @@
.TP
\fB\-\-addprefix\fR=\fIPREFIX\fR
Prefix pathnames in the output by \fIPREFIX\fR\&.
+This will override any individual settings specified with
+the \fB\--addoldprefix\fR or \fB\--addnewprefix\fR options.
+
+.TP
+\fB\-\-addoldprefix\fR=\fIPREFIX\fR
+Prefix pathnames for old or original files in the output
+by \fIPREFIX\fR\&.
+
+.TP
+\fB\-\-addnewprefix\fR=\fIPREFIX\fR
+Prefix pathnames for updated or new files in the output
+by \fIPREFIX\fR\&.
.TP
\fB\-\-as\-numbered\-lines\fR=before|after
----- End forwarded message -----
--- End Message ---
--- Begin Message ---
Source: patchutils
Source-Version: 0.3.1-1
We believe that the bug you reported is fixed in the latest version of
patchutils, which is due to be installed in the Debian FTP archive:
patchutils_0.3.1-1.diff.gz
to pool/main/p/patchutils/patchutils_0.3.1-1.diff.gz
patchutils_0.3.1-1.dsc
to pool/main/p/patchutils/patchutils_0.3.1-1.dsc
patchutils_0.3.1-1_amd64.deb
to pool/main/p/patchutils/patchutils_0.3.1-1_amd64.deb
patchutils_0.3.1.orig.tar.gz
to pool/main/p/patchutils/patchutils_0.3.1.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Christoph Berg <[email protected]> (supplier of updated patchutils package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Mon, 26 Jan 2009 10:39:04 +0100
Source: patchutils
Binary: patchutils
Architecture: source amd64
Version: 0.3.1-1
Distribution: unstable
Urgency: low
Maintainer: Christoph Berg <[email protected]>
Changed-By: Christoph Berg <[email protected]>
Description:
patchutils - Utilities to work with patches
Closes: 305828 306921 433831 440241 468486 470040 512217
Changes:
patchutils (0.3.1-1) unstable; urgency=low
.
* New upstream release.
+ All utils: Honor TMPDIR. (Closes: #306921)
+ All utils: --long options for all options. (Closes: #440241)
+ filterdiff: Separate --add{old,new}prefix settings. (Closes: #433831)
+ lsdiff: -z doc patch went upstream.
+ rediff: Doesn't segfault on deleted hunks but reports error.
(Closes: #305828, #470040)
+ rediff: Keep -p comments. (Closes: #468486)
+ unwrapdiff: Fix typo in manpage. (Closes: #512217)
Checksums-Sha1:
7b2a819107acf65ff4505ab4a8ae4bbf226e04ca 1042 patchutils_0.3.1-1.dsc
85f5f534858d021e052da577d144d2a39e77c0d2 203449 patchutils_0.3.1.orig.tar.gz
decfe11c4bbbc32024678daa379850f248b81853 5187 patchutils_0.3.1-1.diff.gz
15b6af709faa95e0b8a7019cb47aa63fb3844438 104584 patchutils_0.3.1-1_amd64.deb
Checksums-Sha256:
f07545d3fa82481662a298fff29830782ee514bdc6986aa237ff209c7e8ec103 1042
patchutils_0.3.1-1.dsc
3ede5fa2750f67e1dcfa4b60177e16047c0921a52cc4090171ed01ee8b19bae1 203449
patchutils_0.3.1.orig.tar.gz
950b9eb87678fe2f2a4e7e3b289d5b7784c3f787d599b118ce6482c0f219aaf0 5187
patchutils_0.3.1-1.diff.gz
73d27b7a75dd64eb17d9e566b863684abc461c6acf062ac562a2074fd59f0a56 104584
patchutils_0.3.1-1_amd64.deb
Files:
50d7fd75a508c118114a36d59b593283 1042 text optional patchutils_0.3.1-1.dsc
170483bdbdaa7c53cba69d183ffe2aec 203449 text optional
patchutils_0.3.1.orig.tar.gz
15fd2770597d420053bb9e4f6a7bf65c 5187 text optional patchutils_0.3.1-1.diff.gz
5ef12872b30ad98e16bc1fe8932f459c 104584 text optional
patchutils_0.3.1-1_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkl9ijwACgkQxa93SlhRC1oS1gCdHI+ZCB0r05VQC0+zkahAWq3B
jL4AoL5FT4lOHwHmiUMWQ4h8u8W12xNe
=GGwI
-----END PGP SIGNATURE-----
--- End Message ---
