[Git][reproducible-builds/diffoscope][remove_comment] 12 commits: Fix compatibility with llvm 22
Chris Lamb (@lamby)
gitlab at salsa.debian.org
Mon Apr 20 17:43:15 UTC 2026
Chris Lamb pushed to branch remove_comment at Reproducible Builds / diffoscope
Commits:
6ea43da2 by Jelle van der Waa at 2026-03-29T16:53:00+02:00
Fix compatibility with llvm 22
- - - - -
e881f4fa by Chris Lamb at 2026-03-30T11:08:36-07:00
Add some debugging info for PyPI debugging.
- - - - -
483ab5f3 by Chris Lamb at 2026-04-02T10:31:40-07:00
releasing package diffoscope version 316
- - - - -
fef5068e by Chris Lamb at 2026-04-02T10:32:36-07:00
Open new changelog entry for version 317.
Gbp-Dch: ignore
- - - - -
2c4e960b by Chris Lamb at 2026-04-06T15:05:12-04:00
Try to fix PYPI_ID_TOKEN debugging.
- - - - -
0c61f974 by Chris Lamb at 2026-04-08T14:51:56-04:00
Limit python3-guestfs Build-Dependency to !i386. (Closes: #1132974)
- - - - -
eec382e5 by Holger Levsen at 2026-04-09T15:48:58+02:00
fixup, add ppc64el: Limit python3-guestfs Build-Dependency to !i386. (Closes: #1132974)
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
f089e36b by Chris Lamb at 2026-04-10T11:37:04-04:00
Correct ordering of python3-guestfs architecture restrictions.
- - - - -
93553b6f by Chris Lamb at 2026-04-10T11:38:58-04:00
releasing package diffoscope version 317
- - - - -
a8811c5d by Chris Lamb at 2026-04-10T11:41:42-04:00
Open new changelog entry for version 318.
Gbp-Dch: ignore
- - - - -
22785043 by Chris Lamb at 2026-04-10T11:41:45-04:00
Bump Standards-Version to 4.7.4.
- - - - -
15512eef by Manuel Jacob at 2026-04-20T17:43:11+00:00
Remove misleading comment.
I saw the message “Too much input for diff” in the output. Searching for that in the source code lead me to this config parameter. In that context, reading the comment made me think that GNU diffutils has some hard limit. Manual testing showed that `diff` can cope with much larger files. I thought that maybe there used to be some hard limit. I couldn’t find anything like that when skimming GNU diffutils changes.
When diffing two files with few differences, I found the memory usage to be about the sum of the size of the input files. When constructing inputs that caused more than 2GiB of memory usage, the command didn’t finish after 1 h. Surely, there are cases where GNU diffutils could use less RAM or handle large files better, but fundamentally it is an issue of limited hardware resources.
In conclusion, I think that the comment is more misleading than insightful. I couldn’t think of a better one that states more than the obvious (“resources are limited”), so I decided to remove it.
- - - - -
7 changed files:
- .gitlab-ci.yml
- debian/changelog
- debian/control
- diffoscope/__init__.py
- diffoscope/config.py
- tests/comparators/test_rlib.py
- + tests/data/rlib_llvm_dis_expected_diff_22
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -99,4 +99,5 @@ deploy-pypi:
- apt-get -q -y install --no-install-recommends twine python3-setuptools
- python3 setup.py sdist
- twine check dist/*
+ - echo $PYPI_ID_TOKEN | cut -d '.' -f2 | base64 -d | python3 -m json.tool
- twine upload dist/* || true
=====================================
debian/changelog
=====================================
@@ -1,8 +1,29 @@
-diffoscope (316) UNRELEASED; urgency=medium
+diffoscope (318) UNRELEASED; urgency=medium
* WIP (generated upon release).
- -- Chris Lamb <lamby at debian.org> Fri, 20 Mar 2026 10:45:56 -0700
+ -- Chris Lamb <lamby at debian.org> Fri, 10 Apr 2026 11:41:42 -0400
+
+diffoscope (317) unstable; urgency=medium
+
+ [ Chris Lamb ]
+ * Limit python3-guestfs Build-Dependency to !i386. (Closes: #1132974)
+ * Try to fix PYPI_ID_TOKEN debugging.
+
+ [ Holger Levsen ]
+ * Add ppc64el to the list of architectures for python3-guestfs.
+
+ -- Chris Lamb <lamby at debian.org> Fri, 10 Apr 2026 11:38:56 -0400
+
+diffoscope (316) unstable; urgency=medium
+
+ [ Jelle van der Waa ]
+ * Fix compatibility with LLVM version 22.
+
+ [ Chris Lamb ]
+ * Add some debugging info for PyPI debugging.
+
+ -- Chris Lamb <lamby at debian.org> Thu, 02 Apr 2026 10:31:30 -0700
diffoscope (315) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -70,7 +70,7 @@ Build-Depends:
python3-defusedxml <!nocheck>,
python3-distro <!nocheck>,
python3-docutils,
- python3-guestfs <!nocheck>,
+ python3-guestfs [amd64 arm64 loong64 ppc64el riscv64 s390x] <!nocheck>,
python3-h5py <!nocheck>,
python3-jsondiff <!nocheck>,
python3-libarchive-c,
@@ -99,7 +99,7 @@ Build-Depends:
zstd <!nocheck>,
Build-Conflicts:
graphicsmagick-imagemagick-compat,
-Standards-Version: 4.7.3
+Standards-Version: 4.7.4
Homepage: https://diffoscope.org
Vcs-Git: https://salsa.debian.org/reproducible-builds/diffoscope.git
Vcs-Browser: https://salsa.debian.org/reproducible-builds/diffoscope
=====================================
diffoscope/__init__.py
=====================================
@@ -17,4 +17,4 @@
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <https://www.gnu.org/licenses/>.
-VERSION = "315"
+VERSION = "317"
=====================================
diffoscope/config.py
=====================================
@@ -41,7 +41,6 @@ class Config:
def reset(self):
self.diff_context = 7
- # GNU diff cannot process arbitrary large files :(
self.max_diff_input_lines = 2**22
self.max_diff_block_lines_saved = float("inf")
=====================================
tests/comparators/test_rlib.py
=====================================
@@ -91,6 +91,9 @@ def rlib_dis_expected_diff():
if actual_ver >= "21.0":
diff_file = "rlib_llvm_dis_expected_diff_21"
+ if actual_ver >= "22.0":
+ diff_file = "rlib_llvm_dis_expected_diff_22"
+
return get_data(diff_file)
=====================================
tests/data/rlib_llvm_dis_expected_diff_22
=====================================
@@ -0,0 +1,36 @@
+@@ -42,32 +42,32 @@
+ entry-block:
+ %out.i.i = alloca ptr, align 8
+ %4 = icmp ult i64 %3, 17
+ br i1 %4, label %then-block-195-.i, label %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i
+
+ then-block-195-.i: ; preds = %entry-block
+ %5 = tail call ptr @realloc(ptr %0, i64 %2) #2
+- br label %_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit
++ br label %_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit
+
+ _ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i: ; preds = %entry-block
+ %6 = bitcast ptr %out.i.i to ptr
+ call void @llvm.lifetime.start.p0(ptr %out.i.i)
+ store ptr null, ptr %out.i.i, align 8
+ %7 = call i32 @posix_memalign(ptr nonnull %out.i.i, i64 %3, i64 %2) #2
+ %8 = icmp eq i32 %7, 0
+ %9 = load ptr, ptr %out.i.i, align 8
+ %sret_slot.0.i.i = select i1 %8, ptr %9, ptr null
+ call void @llvm.lifetime.end.p0(ptr %out.i.i)
+ %10 = icmp ule i64 %2, %1
+ %11 = select i1 %10, i64 %2, i64 %1
+ call void @llvm.memmove.p0.p0.i64(ptr align 1 %sret_slot.0.i.i, ptr align 1 %0, i64 %11, i1 false) #2
+ call void @free(ptr %0) #2
+- br label %_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit
++ br label %_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit
+
+-_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit: ; preds = %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i, %then-block-195-.i
++_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit: ; preds = %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i, %then-block-195-.i
+ %sret_slot.0.i = phi ptr [ %5, %then-block-195-.i ], [ %sret_slot.0.i.i, %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i ]
+ ret ptr %sret_slot.0.i
+ }
+
+ ; Function Attrs: nounwind memory(none) uwtable
+ define i64 @__rust_reallocate_inplace(ptr readnone captures(none) %0, i64 %1, i64 %2, i64 %3) unnamed_addr #1 {
+ entry-block:
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/d68cc26c05a4064a945e16de38d83aa2687a629c...15512eefe2e3d2a0269591bff095b8a387ae4fc8
--
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/d68cc26c05a4064a945e16de38d83aa2687a629c...15512eefe2e3d2a0269591bff095b8a387ae4fc8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20260420/8ef64b38/attachment.htm>
More information about the rb-commits
mailing list