[diffoscope] branch siamezzze/containers updated (5a5c341 -> 9570f1c)
Maria Glukhova
siamezzze-guest at moszumanska.debian.org
Mon Feb 13 20:39:58 CET 2017
This is an automated email from the git hooks/post-receive script.
siamezzze-guest pushed a change to branch siamezzze/containers
in repository diffoscope.
discards 5a5c341 Add informative output for container type and file list.
discards ac55cec Check nested containers while comparing containers content.
discards ce81bcb Revert "Add fuzzy-matching across containers."
discards 3218f0c Add fuzzy-matching across containers.
discards 49110eb Revert "Change internal archive content names."
discards d00362b Add tests for cross-container comparison.
discards 3444132 Keep filelist sorted for deterministic output, and add newline at the end.
discards 29458c4 Drop libarchive check; prevent directories from being byte-compared instead.
discards 176f7ab Change internal archive content names.
discards f6456a8 Comparison of containers using different formats.
adds 3253f14 diffoscope: Specify choices for --list-tools switch.
adds c79f41c diffoscope: Improve --help output.
adds e7f7731 CONTRIBUTING: Refresh instructions for contributing to diffoscope.
adds 63adae5 CONTRIBUTING: misc updates, clearer info about how to submit a Debian bug
adds b22c4ff presenters: Move text presenter to use Visitor pattern.
adds 42b7de5 presenters: Add markdown output support. (Closes: #848141)
adds d76cb76 presenters: Add RestructuredText output format.
adds 1d7a4dc tests: Avoid DRY violations when running the main function
adds ec646da tests: Split main and presenter tests.
adds 58c95cd tests: Avoid DRY violations in presenter tests.
adds 636ccbe tests: Actually compare the output of text/ReST/markdown formats to fixtures.
adds 7778c24 tests: Drop output_* calls that are inconsistently applied to differences.
adds 574f235 presenters: Instantiate our presenter classes directly instead of wrapping a method
adds 5197c6e presenters.text: Remove superfluous empty newlines from diff.
adds bdbebad presenters: Use an optimised indentation routine throughout all text presenters.
adds 15ca129 tests: Add tests for HTML output.
adds 41b8dbf comparators.zip: Drop unused get_content method.
adds 6f2bee3 tests: Don't warn about coverage lines that raise NotImplementedError.
adds 6a47b06 tests: Add a test comparing two empty directories.
adds 6257836 tests: Test --text-color output format.
adds 1525094 tests: Test that no arguments (beyond the filenames) prints the text output.
adds 4624a4e tests: Increase coverage by adding "# noqa" in relevant parts.
adds 1aace3e comparators: Use idiomatic 'pass' over 'return'
adds 05801d9 comparators: Drop unnecessary "close_archive" method.
adds 9f470c8 Revert "comparators: Drop unnecessary "close_archive" method." - it's abstract for Archive, not Libarchive
adds 354c5d6 Add build status to README.rst
adds 6712661 tools: switch Arch Linux dependency for pedump to mono
adds ab01a67 Changelog for v70
adds 532c188 Release version 70
adds 4366e7b Fix bug introduced in commit 36d1c964 that only worked "accidentally"
adds 737fc3b Fix lazy expression, filter is lazy in python 3
adds 1e5d30b comparators: Tidy re_tests with list comprehensions and implicit "x, y" unpacking over indexing; lambda/filter is not idiomatic Python 3.
adds ad367a0 tests.presenters: Prevent FTBFS by loading fixtures as UTF-8 in case surrounding terminal is not Unicode-aware. (Closes: #852926)
adds fa4cab2 diffoscope.diff: Improve FIFO writing robustness. (Closes: #852013)
adds cdf7d61 diffoscope.diff: Drop unused 'contextlib' import.
adds d9b7da2 Revert "diffoscope.diff: Improve FIFO writing robustness. (Closes: #852013)"
adds cc85fac Revert "diffoscope.diff: Drop unused 'contextlib' import."
adds daad816 Add docs about releasing signed tarballs.
adds e4e7fe2 Update documentation regarding git archive --prefix
adds c6c220b README.rst: Drop the incomplete list of external tools.
adds 37dc6ea Add tests for comparing a device with a regular file fails (re. #850055)
adds 3040112 comparators.Device: Use our logger instance, not the top-level logging module.
adds 3c94759 comparators.Device: Log when "other" is not a device.
adds a738c8f Add watch file with cryptographic signature verification.
adds bf7155a comparators: Don't report on test coverage for some internal error messages.
adds 30e112c comparators.squashfs: Consistently use double-quotes in human-readable exception messages.
adds dfc6ed9 comparators.image: Correct location of noqa stub for imagemagick calls.
adds 8046db9 tests.comparators: Add test for symlink differing in destination.
adds 19a1890 tests.comparators.utils: Add a get_data helper method
adds dc7b769 Don't write "fixture" file - was left in from previous commit(s)
adds 03446b8 tests.comparators: Avoid DRY violations by using new 'get_data' method.
adds b465f4b comparators.elf: Mark abstract/example method as "noqa" for coverage
adds 5fecba7 diffoscope.diff: Use %r over %s & repr(line)
adds 1f01648 diffoscope.exc: Tag nother impossible-to-reach-in-tests code with "noqa"
adds d58051b tests: When comparing two empty directories, ensure that the mtime of the directory is consistent to avoid non-deterministic failures.
adds 95f828e comparators.ps: Add "noqa" stub when missing ps2ascii.
adds 2b2cb3c tests: Also test whether the 2nd source of a difference is a string, not just the first
adds dd09b6c tests: Smoke-test test profiling output.
adds 4bccd9e Override the debian-watch-file-in-native-package lintian tag
adds b30e152 tools: arch package changed from cdrkit to cdrtools
adds eba6ed9 tests: Test that we ignore invalid JSON files correctly.
adds 1808a99 comparators.cpio: Drop CpioContent command now that we use libarchive.
adds 4cdfa57 comparators: Use a singleton to manage our Comparator classes.
adds 5362315 tests: Reload Comparators after every test so we are always in a consistent state.
adds fe9c9ba tests: Ensure we can at least import the "deb_fallback" and "rpm_fallback" modules.
adds 3a4d365 tests: Test RPM "fallback" comparison.
adds 931b49a tests: Test Deb{Changes,Buildinfo,Dsc} fallback comparisons.
adds bcd117c README.rst: Merge in content from CONTRIBUTING.
adds 9326ee8 README: We are not Debian-specific anymore.
adds 920d5fb progress: Reset prorgress bar internal statee after every test run.
adds 9095225 tests: Smoke test --progress output.
adds 6e71604 progress: Rewrite StatusFD to take a file object, not a file descriptor.
adds c9696b6 tests: Test the --status-fd output.
adds 26784c6 debian/control: Add python3-progressbar as a test dependency.
adds fabb7bc README: Keep history, explain this was started in Debian.
adds c601f2d Add a machine-readable JSON output format. (Closes: #850791)
adds 68504f2 Drop debugging code from previous commit.
adds c6f2be2 comparators.symlink: Drop strange debugging message.
adds db37e55 Fix errors when comparing directories with non-directories. (Closes: #835641)
adds 42c4c3a comparators.utils: Don't uselessly run xxd(1) on non-directories.
adds 03b8f89 comparators.utils: Tidy code that calls cmp(1)
adds dfd4866 diffoscope.presenters: Split non-utils out of utils presenter.
adds 26bae91 comparators.debian: Tidy formatting, etc to make it more VCS-friendly.
adds 59cd6ad comparators.debian: Drop DOT_CHANGES_FIELDS
adds 31e5138 comparators.Debian: Further tidying.
adds bf5eda4 Add missing trailing )
adds 62b3900 comparators.Debian: Show results from debugging packages last (Closes: #820427)
adds 30a2e5d diffoscope.presenters: Move output size utilities and exceptions out of HTML-specific presenter module.
adds 758139b diffoscope.presenters: Move base Presenter class to "utils" module.
adds 2003d09 presenters: Add a Presenter.start method to simplify logic.
adds 7479e16 presenters.text: Apply --max-report-size to --text reports. (Closes: #851147)
adds e444526 comparators.utils: Improve "Unpacking.." log message to include the source.
adds d0c97f8 compare_files: Improve "Comparing files X and Y" debug message.
adds d8898e8 comparators.utils.container: Tidy formatting.
adds 9eac636 diff: Use diffoscope.tempfiles over tempfile.TemporaryDirectory to ensure cleanup at end of diffoscope run.
adds 659c57d diff: Use os.path.join over manual path manipulation.
adds f0343d8 main: Clean all temp files in signal handler thread instead of attempting to bubble exception back to the main thread. (Closes: #852013)
adds 37649ac diffoscope.diff: Improve FIFO writing robustness.
adds d0975c6 diffoscope.diff: Drop contextlib import.
adds 83ebe3c Split --report-size into --max-text-report-size - the defaults for each are not really compatible and --text should emit everything by default.
adds aeb021a presenters.utils: Fix behaviour of setting report maximums to zero (ie. no limits)
adds 2e3a4a5 presenters.utils: Tidy and optimise create_limited_print_func
adds 5de41bc Release 71
adds 62023eb Release version 71
adds 27cb967 comparators.cpio: Tidy
adds 4c70ea7 Add a "skip_unless_module_exists" test decorator.
adds e04e4f7 Move many tests to use new @skip_unless_module_exists decorator.
adds 83e939e Progress tests require progressbar module (re. #854593)
adds 9d4113b Show local variables in pytest tracebacks.
adds 5696911 Device and RPM fallback comparisons needs xxd due to fixtures. (Closes: #854593)
adds 097dee5 Specify <html lang="en"> in HTML output. (re. #849411)
adds d7d7229 Release 72
adds 5597372 Release version 72
adds 29b4b5d debian/tests/pytest: Remove spurious clipboard contents.
adds 960b25e Release 73
adds cc89a87 Release version 73
adds 46d5003 Add missing Recommends for comparators. (Closes: #854655)
adds 0289e2e Release 74
adds 16ec797 Release version 74
adds 6ec3e00 Remove pointless use of a thread
adds 8b454a9 Rewrite find_spec line as a separate method for next commit.
adds 541de9e Importing submodules (ie. ``parent.child``) will attempt to import ``parent`` so we must catch that. (Closes: #854670)
adds 8929e49 Release 75
adds c3474bb Release version 75
adds 64f6ff1 Simplify call to subprocess.Popen
adds 7195a5c Don't write to arbitrary locations when extracting archive members
adds e0563c8 Better way of performing the entry name sanitisation
adds b468a28 Drop debian/changelog entry; it will be created by gbp upon release.
adds 632a408 Extract archive members using an auto-incrementing integer, avoiding the need to sanitise filenames. (Closes: #854723)
adds be768ec Release 76
adds 90c33e7 Release version 76
adds 520f8c6 Correct logic of module_exists, ensuring we correctly skip the debian.deb822 tests when python3-debian is not installed. (Closes: #854745)
adds e1775ed Invert all the module_exist logic to prevent multiple confusing negations.
adds f6745a1 main: Correct grammar in comment.
adds acebcc0 utils.libarchive: No need to track archive directory locations.
adds bb2ff3b Add --exclude option. (Closes: #854783)
adds ff1bfa1 Add PyPI badge to README.rst.
adds c7b8eaa Add .travis.yml from http://travis.debian.net.
adds e68dced No need to do complex string formatting just to convert an integer in a string
adds f379d1f Add CVE-2017-0359 to the changelog of v76
new 90dc3eb Comparison of containers using different formats.
new ed0bbc5 Drop libarchive check; prevent directories from being byte-compared instead.
new 6edd7df Keep filelist sorted for deterministic output, and add newline at the end.
new a55dc22 Add tests for cross-container comparison.
new 04d43f4 Check nested containers while comparing containers content.
new 49367d6 Add informative output for container type and file list.
new c9a83a9 Revert "utils.libarchive: No need to track archive directory locations."
new 313dc77 Change the tests for nested containers so they reflect the latest changes.
new 9570f1c Change the tests for containers to use existing test files.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (5a5c341)
\
N -- N -- N refs/heads/siamezzze/containers (9570f1c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omits" are not gone; other references still
refer to them. Any revisions marked "discards" are gone forever.
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.coveragerc | 4 +
.travis.yml | 1 +
CONTRIBUTING | 48 ---
README.rst | 110 +++++--
debian/changelog | 154 +++++++++
debian/control | 1 +
debian/rules | 2 +-
debian/source/lintian-overrides | 3 +
debian/tests/pytest | 2 +-
debian/upstream/signing-key.asc | 76 +++++
debian/watch | 2 +
diffoscope/__init__.py | 2 +-
diffoscope/comparators/__init__.py | 143 ++++++---
diffoscope/comparators/cpio.py | 18 +-
diffoscope/comparators/debian.py | 131 +++++---
diffoscope/comparators/device.py | 3 +-
diffoscope/comparators/directory.py | 2 +
diffoscope/comparators/elf.py | 2 +-
diffoscope/comparators/image.py | 2 +-
diffoscope/comparators/ps.py | 2 +-
diffoscope/comparators/squashfs.py | 22 +-
diffoscope/comparators/symlink.py | 1 -
diffoscope/comparators/utils/archive.py | 2 +-
diffoscope/comparators/utils/compare.py | 17 +-
diffoscope/comparators/utils/container.py | 33 +-
diffoscope/comparators/utils/file.py | 38 ++-
diffoscope/comparators/utils/fuzzy.py | 2 +-
diffoscope/comparators/utils/libarchive.py | 39 ++-
diffoscope/comparators/utils/specialize.py | 40 +--
diffoscope/comparators/zip.py | 8 +-
diffoscope/config.py | 6 +-
diffoscope/diff.py | 123 ++++----
diffoscope/exc.py | 2 +-
diffoscope/{logging.py => excludes.py} | 31 +-
diffoscope/external_tools.py | 4 +-
diffoscope/main.py | 98 +++---
diffoscope/presenters/{utils.py => formats.py} | 53 ++--
diffoscope/presenters/html/html.py | 21 +-
diffoscope/presenters/html/templates.py | 2 +-
diffoscope/presenters/json.py | 47 +++
diffoscope/presenters/markdown.py | 49 +++
diffoscope/presenters/restructuredtext.py | 57 ++++
diffoscope/presenters/text.py | 83 ++---
diffoscope/presenters/utils.py | 127 +++-----
diffoscope/progress.py | 15 +-
diffoscope/tools.py | 15 +-
tests/comparators/test_apk.py | 6 +-
tests/comparators/test_binary.py | 12 +-
tests/comparators/test_bzip2.py | 4 +-
tests/comparators/test_cbfs.py | 8 +-
tests/comparators/test_containers.py | 86 +++--
tests/comparators/test_cpio.py | 8 +-
tests/comparators/test_deb.py | 4 +-
tests/comparators/test_debian.py | 92 +++---
tests/comparators/test_device.py | 55 ++++
tests/comparators/test_dex.py | 4 +-
tests/comparators/test_directory.py | 46 ++-
tests/comparators/test_elf.py | 25 +-
tests/comparators/test_epub.py | 4 +-
tests/comparators/test_fonts.py | 4 +-
tests/comparators/test_fsimage.py | 23 +-
tests/comparators/test_gettext.py | 4 +-
tests/comparators/test_git.py | 5 +-
tests/comparators/test_gzip.py | 6 +-
tests/comparators/test_haskell.py | 5 +-
tests/comparators/test_icc.py | 4 +-
tests/comparators/test_ico_image.py | 6 +-
tests/comparators/test_ipk.py | 4 +-
tests/comparators/test_iso9660.py | 10 +-
tests/comparators/test_java.py | 4 +-
tests/comparators/test_javascript.py | 4 +-
tests/comparators/test_jpeg_image.py | 6 +-
tests/comparators/test_json.py | 12 +-
tests/comparators/test_macho.py | 4 +-
tests/comparators/test_mono.py | 4 +-
tests/comparators/test_openssh_pub_key.py | 4 +-
tests/comparators/test_pdf.py | 6 +-
tests/comparators/test_png.py | 4 +-
tests/comparators/test_ppu.py | 4 +-
tests/comparators/test_ps.py | 6 +-
tests/comparators/test_rlib.py | 8 +-
tests/comparators/test_rpm.py | 44 ++-
tests/comparators/test_sqlite.py | 4 +-
tests/comparators/test_squashfs.py | 8 +-
.../comparators/{utils/data.py => test_symlink.py} | 27 +-
tests/comparators/test_tar.py | 8 +-
tests/comparators/test_text.py | 6 +-
tests/comparators/test_utils.py | 17 +-
tests/comparators/test_xz.py | 4 +-
tests/comparators/test_zip.py | 10 +-
tests/comparators/utils/data.py | 5 +
tests/comparators/utils/nonexisting.py | 5 -
tests/comparators/utils/tools.py | 15 +
tests/conftest.py | 12 +
tests/data/containers_content_expected_diff | 3 -
tests/data/containers_filelist_expected_diff | 16 +-
tests/data/device_expected_diff | 32 ++
tests/data/device_expected_diff_reverse | 32 ++
tests/data/dot_buildinfo_fallback_expected_diff | 23 ++
tests/data/dot_changes_fallback_expected_diff | 29 ++
tests/data/dot_dsc_fallback_expected_diff | 16 +
tests/data/index.html | 154 +++++++++
.../data/nested_containers_filelist_expected_diff | 16 +-
.../data/nested_containers_filelist_expected_diff1 | 5 +
.../data/nested_containers_filelist_expected_diff2 | 8 +
tests/data/nested_containers_types_expected_diff | 2 +-
tests/data/nested_containers_types_expected_diff1 | 3 +
tests/data/nested_containers_types_expected_diff2 | 3 +
tests/data/output.colored.txt | 31 ++
tests/data/output.html | 348 +++++++++++++++++++++
tests/data/output.json | 33 ++
tests/data/output.md | 38 +++
tests/data/output.rst | 52 +++
tests/data/output.txt | 31 ++
tests/data/rpm_fallback_expected_diff | 115 +++++++
tests/data/symlink_expected_destination_diff | 3 +
tests/data/test1.tar.bz2 | Bin 986 -> 0 bytes
tests/data/test1.tar.gz | Bin 1000 -> 518 bytes
tests/data/test2.zip.bz2 | Bin 0 -> 822 bytes
tests/data/test3.cpio | Bin 512 -> 0 bytes
tests/data/test3.tar | Bin 10240 -> 0 bytes
tests/data/test_directory_device_diff | 3 +
tests/data/test_directory_file_diff | 3 +
tests/data/test_directory_symlink_diff | 3 +
tests/data/test_invalid.json | 1 +
tests/test_difference.py | 12 +-
tests/test_excludes.py | 85 +++++
tests/test_main.py | 162 ++++------
tests/test_presenters.py | 131 ++++++++
tests/test_progress.py | 66 ++++
130 files changed, 2834 insertions(+), 924 deletions(-)
create mode 100644 .coveragerc
delete mode 100644 CONTRIBUTING
create mode 100644 debian/source/lintian-overrides
create mode 100644 debian/upstream/signing-key.asc
create mode 100644 debian/watch
copy diffoscope/{logging.py => excludes.py} (58%)
copy diffoscope/presenters/{utils.py => formats.py} (71%)
create mode 100644 diffoscope/presenters/json.py
create mode 100644 diffoscope/presenters/markdown.py
create mode 100644 diffoscope/presenters/restructuredtext.py
create mode 100644 tests/comparators/test_device.py
copy tests/comparators/{utils/data.py => test_symlink.py} (65%)
delete mode 100644 tests/data/containers_content_expected_diff
create mode 100644 tests/data/device_expected_diff
create mode 100644 tests/data/device_expected_diff_reverse
create mode 100644 tests/data/dot_buildinfo_fallback_expected_diff
create mode 100644 tests/data/dot_changes_fallback_expected_diff
create mode 100644 tests/data/dot_dsc_fallback_expected_diff
create mode 100644 tests/data/index.html
create mode 100644 tests/data/nested_containers_filelist_expected_diff1
create mode 100644 tests/data/nested_containers_filelist_expected_diff2
create mode 100644 tests/data/nested_containers_types_expected_diff1
create mode 100644 tests/data/nested_containers_types_expected_diff2
create mode 100644 tests/data/output.colored.txt
create mode 100644 tests/data/output.html
create mode 100644 tests/data/output.json
create mode 100644 tests/data/output.md
create mode 100644 tests/data/output.rst
create mode 100644 tests/data/output.txt
create mode 100644 tests/data/rpm_fallback_expected_diff
create mode 100644 tests/data/symlink_expected_destination_diff
delete mode 100644 tests/data/test1.tar.bz2
create mode 100644 tests/data/test2.zip.bz2
delete mode 100644 tests/data/test3.cpio
delete mode 100644 tests/data/test3.tar
create mode 100644 tests/data/test_directory_device_diff
create mode 100644 tests/data/test_directory_file_diff
create mode 100644 tests/data/test_directory_symlink_diff
create mode 100644 tests/data/test_invalid.json
create mode 100644 tests/test_excludes.py
create mode 100644 tests/test_presenters.py
create mode 100644 tests/test_progress.py
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git
More information about the diffoscope
mailing list