[diffoscope] 01/03: Merge branch 'experimental'

Chris Lamb chris at chris-lamb.co.uk
Sun Jun 18 10:04:37 CEST 2017


This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository diffoscope.

commit b84748070810705a1c3673ad6701ecd491d5b621
Merge: dcfffcb 56fcdec
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Jun 18 15:21:47 2017 +0800

    Merge branch 'experimental'
    
    * experimental: (154 commits)
      More ydiff/linediff from diffoscope.{difference => diff} to group unified_diff related things together
      difference: has_children -> has_visible_children, and take into account comments
      Add various traverse_* methods to Difference
      Move side-by-side and linediff algorithms to difference.py
      Refactor html-dir presenter to be a class instance, avoiding global state
      Document the 'h' variable in our raw_feeder
      Split diffoscope.difference into feeders.
      Tidy diffoscope/difference.py
      html-dir: show/hide diff comments, which can be very large
      PEP8-ify some files.
      Explicitly specify keepends=True over comment.
      Reorder and rename FIFOFeeder arguments to prevent tools incorrectly parsing as a SyntaxError.
      Remove extraneous whitespace around cmdclass invokation
      Reword comment.
      Add comparator for Fontconfig cache files.
      Make tests less brittle and remove pointless cases
      tools: extend external Arch Linux tools
      Use unicode chars for the +/- controls instead of hacky punctuation
      Don't show +/- controls for differences with no children
      Fix create_limited_print_func
      ...

 .travis.yml                                        |    1 +
 README.rst                                         |   23 +-
 debian/README.source                               |    4 +-
 debian/changelog                                   |   84 +
 debian/control                                     |   13 +-
 debian/copyright                                   |   12 +
 debian/diffoscope.1.rst                            |   11 +-
 debian/gbp.conf                                    |    3 +-
 debian/rules                                       |   53 +-
 diffoscope/__init__.py                             |    2 +-
 diffoscope/comparators/__init__.py                 |   10 +
 diffoscope/comparators/apk.py                      |   57 +
 diffoscope/comparators/ar.py                       |   11 +-
 diffoscope/comparators/bzip2.py                    |    9 +-
 diffoscope/comparators/deb.py                      |    9 +-
 diffoscope/comparators/debian.py                   |   13 +-
 diffoscope/comparators/debian_fallback.py          |   12 +-
 diffoscope/comparators/dex.py                      |    7 +-
 diffoscope/comparators/directory.py                |   54 +-
 diffoscope/comparators/{png.py => docx.py}         |   29 +-
 diffoscope/comparators/{png.py => dtb.py}          |   22 +-
 diffoscope/comparators/fontconfig.py               |   91 +
 diffoscope/comparators/fsimage.py                  |    4 -
 diffoscope/comparators/gif.py                      |  104 +
 diffoscope/comparators/gzip.py                     |    7 +-
 diffoscope/comparators/image.py                    |  111 +-
 diffoscope/comparators/iso9660.py                  |   49 +-
 diffoscope/comparators/macho.py                    |    3 +-
 diffoscope/comparators/{png.py => odt.py}          |   29 +-
 diffoscope/comparators/{png.py => ogg.py}          |   25 +-
 diffoscope/comparators/{png.py => pcap.py}         |   31 +-
 diffoscope/comparators/{png.py => pgp.py}          |   33 +-
 diffoscope/comparators/png.py                      |   33 +-
 diffoscope/comparators/ps.py                       |    4 +-
 diffoscope/comparators/rdata.py                    |   94 +
 diffoscope/comparators/rust.py                     |    7 +-
 diffoscope/comparators/squashfs.py                 |  152 +-
 diffoscope/comparators/utils/archive.py            |    9 +
 diffoscope/comparators/utils/command.py            |   10 +-
 diffoscope/comparators/utils/compare.py            |   18 +-
 diffoscope/comparators/utils/container.py          |  130 +-
 diffoscope/comparators/utils/file.py               |   43 +-
 diffoscope/comparators/utils/fuzzy.py              |    4 +-
 diffoscope/comparators/utils/libarchive.py         |   28 +-
 diffoscope/comparators/xz.py                       |    7 +-
 diffoscope/comparators/zip.py                      |   12 +-
 diffoscope/config.py                               |    3 +
 diffoscope/diff.py                                 |  308 +-
 diffoscope/difference.py                           |  294 +-
 diffoscope/exc.py                                  |    5 +
 diffoscope/excludes.py                             |   20 +-
 diffoscope/external_tools.py                       |   42 +
 diffoscope/feeders.py                              |  104 +
 diffoscope/logging.py                              |    4 +-
 diffoscope/main.py                                 |  130 +-
 .../{comparators/utils/filenames.py => path.py}    |   17 +-
 diffoscope/presenters/formats.py                   |  173 +-
 diffoscope/presenters/html/__init__.py             |    3 +-
 diffoscope/presenters/html/html.py                 |  700 +-
 diffoscope/presenters/html/linediff.py             |   94 -
 diffoscope/presenters/html/templates.py            |   18 +-
 diffoscope/presenters/json.py                      |   42 +-
 diffoscope/presenters/text.py                      |   27 +-
 diffoscope/presenters/utils.py                     |   19 +-
 diffoscope/profiling.py                            |   15 +-
 diffoscope/progress.py                             |  149 +-
 .../utils => diffoscope/readers}/__init__.py       |   14 +-
 diffoscope/readers/json.py                         |   51 +
 diffoscope/{__init__.py => readers/utils.py}       |    6 +-
 diffoscope/tempfiles.py                            |    2 +
 diffoscope/tools.py                                |   33 +-
 setup.py                                           |    7 +-
 tests/__init__.py                                  |    0
 tests/comparators/__init__.py                      |    0
 tests/comparators/test_apk.py                      |   41 +-
 .../comparators/test_archive.py                    |   25 +-
 tests/comparators/test_binary.py                   |   40 +-
 tests/comparators/test_bzip2.py                    |    6 +-
 tests/comparators/test_cbfs.py                     |   70 +-
 tests/comparators/test_cpio.py                     |    6 +-
 tests/comparators/test_deb.py                      |    6 +-
 tests/comparators/test_debian.py                   |    6 +-
 tests/comparators/test_device.py                   |    4 +-
 tests/comparators/test_dex.py                      |    6 +-
 tests/comparators/test_directory.py                |    2 +-
 tests/comparators/{test_png.py => test_docx.py}    |   40 +-
 .../{test_openssh_pub_key.py => test_dtb.py}       |   46 +-
 tests/comparators/test_elf.py                      |    4 +-
 tests/comparators/test_epub.py                     |    4 +-
 .../{test_git.py => test_fontconfig.py}            |   28 +-
 tests/comparators/test_fonts.py                    |    4 +-
 tests/comparators/test_fsimage.py                  |    4 +-
 tests/comparators/test_gettext.py                  |    4 +-
 tests/comparators/test_gif.py                      |   69 +
 tests/comparators/test_git.py                      |    2 +-
 tests/comparators/test_gzip.py                     |    2 +-
 tests/comparators/test_haskell.py                  |    4 +-
 tests/comparators/test_icc.py                      |    8 +-
 tests/comparators/test_ico_image.py                |   16 +-
 tests/comparators/test_ipk.py                      |    2 +-
 tests/comparators/test_iso9660.py                  |    4 +-
 tests/comparators/test_java.py                     |    4 +-
 tests/comparators/test_javascript.py               |    4 +-
 tests/comparators/test_jpeg_image.py               |   19 +-
 tests/comparators/test_json.py                     |    4 +-
 tests/comparators/test_macho.py                    |    4 +-
 tests/comparators/test_mono.py                     |    4 +-
 tests/comparators/{test_png.py => test_odt.py}     |   40 +-
 tests/comparators/{test_png.py => test_ogg.py}     |   40 +-
 tests/comparators/test_openssh_pub_key.py          |    4 +-
 tests/comparators/{test_png.py => test_pcap.py}    |   40 +-
 tests/comparators/test_pdf.py                      |    6 +-
 tests/comparators/{test_png.py => test_pgp.py}     |   40 +-
 tests/comparators/test_png.py                      |   16 +-
 tests/comparators/test_ppu.py                      |    6 +-
 tests/comparators/test_ps.py                       |    6 +-
 tests/comparators/test_rdata.py                    |   53 +
 tests/comparators/test_rlib.py                     |    8 +-
 tests/comparators/test_rpm.py                      |    6 +-
 tests/comparators/test_sqlite.py                   |    6 +-
 tests/comparators/test_squashfs.py                 |    6 +-
 tests/comparators/test_symlink.py                  |    2 +-
 tests/comparators/test_tar.py                      |    4 +-
 tests/comparators/test_text.py                     |    4 +-
 tests/comparators/test_utils.py                    |    4 +-
 tests/comparators/test_xz.py                       |    6 +-
 tests/comparators/test_zip.py                      |   16 +-
 tests/conftest.py                                  |   30 +-
 tests/data/archive1.tar                            |  Bin 0 -> 10240 bytes
 tests/data/archive2.tar                            |  Bin 0 -> 10240 bytes
 .../cbfs_listing_no_legacy_header_expected_diff    |    6 +
 tests/data/devicetree1.dtb                         |  Bin 0 -> 68260 bytes
 tests/data/devicetree2.dtb                         |  Bin 0 -> 68323 bytes
 tests/data/devicetree_expected_diff                |   71 +
 tests/data/docx_expected_diff                      |    3 +
 tests/data/fontconfig_expected_diff                |   18 +
 tests/data/gif_expected_diff                       |  181 +
 tests/data/index.html                              |  154 -
 tests/data/odt_expected_diff                       |    5 +
 tests/data/ogg_expected_diff                       |  556 ++
 tests/data/output.html                             |  348 -
 tests/data/output.json                             |   45 +-
 tests/data/pcap_expected_diff                      | 8784 ++++++++++++++++++++
 tests/data/pgp_expected_diff                       |   14 +
 tests/data/quine.gz                                |  Bin 0 -> 250 bytes
 tests/data/quine.zip                               |  Bin 0 -> 440 bytes
 tests/data/quine_a.deb                             |  Bin 0 -> 644 bytes
 tests/data/quine_b.deb                             |  Bin 0 -> 644 bytes
 tests/data/quine_deb_expected_diff                 |    5 +
 tests/data/quine_expected_diff                     |    3 +
 tests/data/rds_expected_diff                       |   52 +
 tests/data/test1-le64.cache-4                      |  Bin 0 -> 14208 bytes
 tests/data/test1.docx                              |  Bin 0 -> 4046 bytes
 tests/data/test1.gif                               |  Bin 0 -> 1791 bytes
 tests/data/test1.odt                               |  Bin 0 -> 7922 bytes
 tests/data/test1.ogg                               |  Bin 0 -> 5940 bytes
 tests/data/test1.pcap                              |  Bin 0 -> 84442 bytes
 tests/data/test1.pgp                               |   17 +
 tests/data/test1.rdx                               |  Bin 0 -> 276 bytes
 tests/data/test1.txt                               |    1 +
 tests/data/test2-le64.cache-4                      |  Bin 0 -> 15384 bytes
 tests/data/test2.docx                              |  Bin 0 -> 4046 bytes
 tests/data/test2.gif                               |  Bin 0 -> 793 bytes
 tests/data/test2.odt                               |  Bin 0 -> 7931 bytes
 tests/data/test2.ogg                               |  Bin 0 -> 4567 bytes
 tests/data/test2.pcap                              |  Bin 0 -> 85965 bytes
 tests/data/test2.pgp                               |   17 +
 tests/data/test2.rdx                               |  Bin 0 -> 276 bytes
 tests/data/test3.apk                               |  Bin 0 -> 571 bytes
 tests/data/test3.gif                               |  Bin 0 -> 854 bytes
 tests/data/test3.zip                               |  Bin 0 -> 571 bytes
 tests/data/test4.gif                               |  Bin 0 -> 2094 bytes
 tests/data/zip_bsdtar_expected_diff                |    4 +
 tests/test_difference.py                           |   48 +
 tests/test_presenters.py                           |   76 +-
 tests/test_progress.py                             |    2 +-
 tests/test_quines.py                               |   71 +
 tests/test_readers.py                              |   50 +
 .../{comparators/test_symlink.py => test_tools.py} |   28 +-
 tests/{comparators => }/utils/__init__.py          |    0
 tests/{comparators => }/utils/data.py              |   16 +-
 tests/{comparators => }/utils/nonexisting.py       |    0
 tests/{comparators => }/utils/tools.py             |    0
 183 files changed, 13137 insertions(+), 2030 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git


More information about the diffoscope mailing list