[Python-apps-commits] r11554 - in packages/mercurial/trunk/debian (3 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Sat Nov 8 10:22:46 UTC 2014
Date: Saturday, November 8, 2014 @ 10:22:45
Author: vicho
Revision: 11554
Remove from_upstream__test-patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch as it is now included upstream
Modified:
packages/mercurial/trunk/debian/changelog
packages/mercurial/trunk/debian/patches/series
Deleted:
packages/mercurial/trunk/debian/patches/from_upstream__test-patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch
Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog 2014-11-08 10:22:43 UTC (rev 11553)
+++ packages/mercurial/trunk/debian/changelog 2014-11-08 10:22:45 UTC (rev 11554)
@@ -4,6 +4,9 @@
* Drop deb_specific__support_templates_in_fsh.patch,
deb_specific__support_help_in_fhs.patch and
deb_specific__support_mo_in_fhs.patch as they are no longer needed
+ * Remove from_upstream__test-
+ patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch
+ as it is now included upstream
-- Javi Merino <vicho at debian.org> Sun, 02 Nov 2014 12:55:06 +0000
Deleted: packages/mercurial/trunk/debian/patches/from_upstream__test-patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/from_upstream__test-patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch 2014-11-08 10:22:43 UTC (rev 11553)
+++ packages/mercurial/trunk/debian/patches/from_upstream__test-patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch 2014-11-08 10:22:45 UTC (rev 11554)
@@ -1,136 +0,0 @@
-From: Augie Fackler <raf at durin42.com>
-Origin: upstream, http://selenic.com/repo/hg/rev/f8fc5df6a8cf
-Subject: test-patchbomb.t: work around Python change d579866d6419 (issue4188)
-
-Python 2.7.7 and later (as well as some ubuntu/debian packages of
-2.7.6) include a fix that makes the email module more pedantically
-correct for MIME boundaries, but this breaks our tests. We work around
-this by filtering the output of any 'hg email' invocations in the test
-that produce MIME messages.
-
-diff --git a/tests/test-patchbomb.t b/tests/test-patchbomb.t
---- a/tests/test-patchbomb.t
-+++ b/tests/test-patchbomb.t
-@@ -8,6 +8,21 @@ Mercurial-patchbomb/.* -> Mercurial-patc
- --===+[0-9]+=+--$ -> --===*=-- (glob)
- --===+[0-9]+=+$ -> --===*= (glob)
-
-+ $ cat > prune-blank-after-boundary.py <<EOF
-+ > import sys
-+ > skipblank = False
-+ > trim = lambda x: x.strip(' \r\n')
-+ > for l in sys.stdin:
-+ > if trim(l).endswith('=--') or trim(l).endswith('=='):
-+ > skipblank = True
-+ > print l,
-+ > continue
-+ > if not trim(l) and skipblank:
-+ > continue
-+ > skipblank = False
-+ > print l,
-+ > EOF
-+ $ FILTERBOUNDARY="python `pwd`/prune-blank-after-boundary.py"
- $ echo "[extensions]" >> $HGRCPATH
- $ echo "patchbomb=" >> $HGRCPATH
-
-@@ -214,7 +229,7 @@ Mercurial-patchbomb/.* -> Mercurial-patc
-
- test bundle and description:
- $ hg email --date '1970-1-1 0:3' -n -f quux -t foo \
-- > -c bar -s test -r tip -b --desc description
-+ > -c bar -s test -r tip -b --desc description | $FILTERBOUNDARY
- searching for changes
- 1 changesets found
-
-@@ -689,7 +704,7 @@ test diffstat for multiple patches:
-
-
- test inline for single patch:
-- $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2
-+ $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2 | $FILTERBOUNDARY
- this patch series consists of 1 patches.
-
-
-@@ -732,7 +747,7 @@ test inline for single patch:
-
-
- test inline for single patch (quoted-printable):
-- $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 4
-+ $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 4 | $FILTERBOUNDARY
- this patch series consists of 1 patches.
-
-
-@@ -791,7 +806,7 @@ test inline for single patch (quoted-pri
-
- test inline for multiple patches:
- $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \
-- > -r 0:1 -r 4
-+ > -r 0:1 -r 4 | $FILTERBOUNDARY
- this patch series consists of 3 patches.
-
-
-@@ -943,7 +958,7 @@ test inline for multiple patches:
- --===*=-- (glob)
-
- test attach for single patch:
-- $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 2
-+ $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 2 | $FILTERBOUNDARY
- this patch series consists of 1 patches.
-
-
-@@ -994,7 +1009,7 @@ test attach for single patch:
- --===*=-- (glob)
-
- test attach for single patch (quoted-printable):
-- $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 4
-+ $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 4 | $FILTERBOUNDARY
- this patch series consists of 1 patches.
-
-
-@@ -1061,7 +1076,7 @@ test attach for single patch (quoted-pri
- --===*=-- (glob)
-
- test attach and body for single patch:
-- $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a --body -r 2
-+ $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a --body -r 2 | $FILTERBOUNDARY
- this patch series consists of 1 patches.
-
-
-@@ -1123,7 +1138,7 @@ test attach and body for single patch:
-
- test attach for multiple patches:
- $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a \
-- > -r 0:1 -r 4
-+ > -r 0:1 -r 4 | $FILTERBOUNDARY
- this patch series consists of 3 patches.
-
-
-@@ -1579,7 +1594,8 @@ tagging csets:
- $ hg tag -r2 two two.diff
-
- test inline for single named patch:
-- $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2
-+ $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \
-+ > -r 2 | $FILTERBOUNDARY
- this patch series consists of 1 patches.
-
-
-@@ -1621,7 +1637,8 @@ test inline for single named patch:
- --===*=-- (glob)
-
- test inline for multiple named/unnamed patches:
-- $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 0:1
-+ $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \
-+ > -r 0:1 | $FILTERBOUNDARY
- this patch series consists of 2 patches.
-
-
-@@ -1927,7 +1944,7 @@ test single flag for single patch (and n
- $ hg up -qr1
- $ echo dirt > a
- $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \
-- > -r 2
-+ > -r 2 | $FILTERBOUNDARY
- this patch series consists of 1 patches.
-
-
Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series 2014-11-08 10:22:43 UTC (rev 11553)
+++ packages/mercurial/trunk/debian/patches/series 2014-11-08 10:22:45 UTC (rev 11554)
@@ -5,4 +5,3 @@
deb_specific__disable_libdir_replacement.patch
for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
for_upstream__lenient_test-shelve.patch
-from_upstream__test-patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch
More information about the Python-apps-commits
mailing list