[diffoscope] branch jwnx_parallel_diffoscope updated (01716b7 -> da34df2)

Juliana Oliveira jwnx-guest at moszumanska.debian.org
Fri Mar 9 05:11:33 CET 2018

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

jwnx-guest pushed a change to branch jwnx_parallel_diffoscope
in repository diffoscope.

  discards  01716b7   diff: updated regex to match lines with only a '\n' char
  discards  ee7befe   difference: makes dill import depend on Config.parallel
  discards  2d469df   comparators: utils: command: replaces .stderr_content by .stderr
  discards  09e82ee   comparators: utils: command: adds STDERR_MAX_LINES back
  discards  7e436f3   comparators: zip: replaces .wait() override by .returncode
  discards  0b84a43   comparators: utils: command: removes decode from stdout
  discards  632abfe   {feeders/diff/command}: fixes FIFO writting and parsing from stdout
  discards  7a68dae   diff: replaces Popen by subprocess.run
  discards  664fada   main: adds check_parallel on initialization
  discards  44dbf9d   difference: adds condition for parallel execution
  discards  5dbe4d5   config: adds parallel flag
  discards  fb1f8a7   setup.py: adds multiprocess and dill as requirements
  discards  e252cbd   comparators: utils: archive: catches FileNotFoundError
  discards  c9119c0   difference: adds error treatment to ComparisonPool.map(command_and_feeder)
  discards  7fe93bd   comparators: utils: command: replaces subprocess.Popen by .run
  discards  c28f098   parallel: comparison_pool: reworks map function
  discards  4a47dc4   tempfiles: catches FileNotFoundError for DIR
  discards  84d02ba   difference: from_command_exc: adds pool.map on command execution
  discards  b1983ef   parallel: comparison_pool: implements map method
  discards  d911991   parallel: adds comparison_pool class
  discards  5ba5c49   main: adds --jobs flag
      adds  40dca4b   Clarify "Unidentified file" log message as we did try and lookup via the comparators first.
      adds  59dc181   comparators.macho: If the If the LLVM disassembler does not work, try the internal one. (Closes: #886736)
      adds  35a2ce9   comparators.macho: Always strip the filename, not just when by itself.
      adds  e51e801   diffoscope.main: Don't shadow 'os' import.
      adds  ae117fe   diffoscope.main: Tidy ListToolsAction argparse action command.
      adds  990f473   presenters.html: Mark imports as noqa.
      adds  26ec6a1   diffoscope.main: Add spaces around operators.
      adds  2fa37b1   compararators.bzip: Drop unused os.path import.
      adds  066b09f   comparators.utils.container: Ensure we use a multiple of 4 spaces.
      adds  41075d7   comparators.utils.specialize: Ensure block comment starts with '# '.
      adds  1ad4055   diffoscope.presenters.html: Tidy some long lines.
      adds  720305c   diffoscope.presenters.html: Invert logic as we use unconditional control flow.
      adds  14317f5   tests.test_progress: flake8 file
      adds  c32d58e   tests.utils.tools: Drop whitespace from end of file.
      adds  b5ba6a9   diffoscope.comparators.zip: Drop unnecessary else after return
      adds  304660a   tests.comparators.test_elf: Return "unknown" if we can't parse the readelf version number eg. for FreeBSD. We don't skip those tests; as they should still run. (Closes: #886963)
      adds  34b54b4   Return '0' as the version if we can't parse one; it should be harmless.
      adds  9bcbb51   Flake8 comparators/json.py.
      adds  2a758d3   Do some cheap fuzzy parsing to detect JSON files not named .json. (re. #888112)
      adds  0376170   Reflow conditional for next commit.
      adds  f7ced27   Also match unicode JSON files.
      adds  ee86038   Rework parsing for next commit
      adds  de1abea   Also look for "[" when fuzzy-matching JSON.
      adds  1b121ea   Optionally compare JSON files using Python jsondiff module. (Closes: #888112)
      adds  8f8bc71   Report differences in extended file attributes when comparing files. (Closes: #888401)
      adds  5fcd718   Sort output of xattr.get_all - according to listxattr(2) they are unsorted.
      adds  26d8a66   debian: Add an explicit build-depends and recommends on e2fsprogs.
      adds  59eb4bf   Show extended filesystem metadata (etc.) even when directly comparing two files, not just when we specify two directories. (Closes: #888402)
      adds  cea2124   Don't require that presenter tests are run at a specific time and by, well, me.
      adds  b4c0be0   Mostly restore the behaviour of file comparison and --exclude-directory-metadata
      adds  9844353   Fix test by running compare_root_paths to set global defaults
      adds  498edb5   More long-term fix for the shared-singleton issue
      adds  016a89e   {tempfiles, utils.archive}: catches FileNotFoundError
      adds  e1869c3   diff: wrap long regular expression for improved readability
      adds  f23787d   comparators: java: adds support for procyon-decompiler
      adds  b7332b6   comparators/java: wrap some lines
      adds  2bf2f0f   Drop debugging code in Android tests.
      adds  c1e29ac   Add support for comparing XMLBeans binary schemas.
      adds  8fbd7e3   Add support for comparing Berkeley DB files. This is currently incomplete because the Berkeley DB libraries do not return the same uid/hash reliably (it returns "random" memory contents) so we must strip those from the human-readable output. (Closes: #890528)
      adds  7b8998e   comparators.json: fix UnicodeDecodeError with a non-UTF8 locale.
      adds  f93fb4c   {command, feeders, diff}: replaces subprocess.Popen by .run
      adds  5d57eca   {command, zip, feeders}: replaces .wait by new .returncode property
      adds  26db582   comparators: utils: command: removes .wait
      adds  997a5f6   comparators: utils: command: replaces .stderr_content by .stderr
      adds  cd6c778   d/copyright: update for the new year.
      adds  b1d35c0   d/control: Bump Standards-Version to 4.1.3, no changes needed.
      adds  8fdd327   d/rules: simplify.
      adds  686f3af   comparators.json: fixup 7b8998e for py < 3.6: decode the input if we get that far to try a .load()
      adds  3f779d0   Draft changelog for v91
      adds  b32d1c4   Release v91
      adds  5541c76   Print a nicer error message if you only specify one file by mistake.
      adds  c38d7ec   Don't show progress bar if we passed --debug; it just gets in the way.
      adds  c1d2d18   comparators.utils.file: Avoid some necessary indentation around unconditional control flow.
      adds  60b5768   comparators.apk: Tidy unnecessary assignment.
      adds  b692cbd   Additionally extract the classes.dex file from .apk files; apktool does not do this by default which was was preventing us recursing into it to find differences. Thanks to Hans-Christoph Steiner <hans at eds.org> for the report. (Closes: #890904)
      adds  808954e   comparators.apk: Let classes.dex extraction be optional.
      adds  7345efa   Recursively reset the permissions of temporary directories prior to deletion to ensure that non-writable permissions such as 0555 are removed and do not cause a traceback. (Closes: #891363)
      adds  99c0a78   tempfiles: save a bunch of syscalls, by resetting the permissions only when we actually need to do it.
      adds  d64ce7e   Reflow long lines after indentation.
      adds  e41abe0   Move DOS/MBR check into the testsuite.
      adds  010fd51   Drop unused imports
      adds  b35c2cc   Import LooseVersion as LooseVersion.
      adds  33a6e70   Add two spaces before inline comment.
      adds  e37c629   Use more Pythonic `old_level` variable name (over `oldLabel`).
      adds  39bd9ea   Drop blank line.
      adds  bac56a5   Don't use ambiguous `l` variable names.
      adds  a5f4486   Add a blank line before (and after) nested definition.
      adds  e813b51   Add whitespace around operators.
      adds  e580d20   Ensure 4-line indentation.
       new  9bf20f0   parallel: adds comparison_pool class
       new  fe90493   {config, main}: adds check_parallel on init
       new  da34df2   difference: adds comparison_pool.map to command execution

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   (01716b7)
             N -- N -- N   refs/heads/jwnx_parallel_diffoscope (da34df2)

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 3 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:
 debian/changelog                                   |  63 +++++++++
 debian/control                                     |   9 +-
 debian/copyright                                   |   4 +-
 debian/rules                                       |  11 +-
 diffoscope/__init__.py                             |   2 +-
 diffoscope/comparators/__init__.py                 |   2 +
 diffoscope/comparators/apk.py                      |   9 +-
 diffoscope/comparators/{pcap.py => berkeley_db.py} |  31 +++--
 diffoscope/comparators/bzip2.py                    |   1 -
 diffoscope/comparators/directory.py                |  22 ++-
 diffoscope/comparators/gzip.py                     |   1 -
 diffoscope/comparators/java.py                     |  54 +++++++-
 diffoscope/comparators/json.py                     |  60 ++++++--
 diffoscope/comparators/macho.py                    |  39 ++++--
 diffoscope/comparators/png.py                      |   1 -
 diffoscope/comparators/utils/command.py            |  28 ++--
 diffoscope/comparators/utils/compare.py            |  17 ++-
 diffoscope/comparators/utils/container.py          |   2 +-
 diffoscope/comparators/utils/file.py               |   3 +-
 diffoscope/comparators/utils/specialize.py         |   8 +-
 diffoscope/comparators/{odt.py => xsb.py}          |  27 ++--
 diffoscope/comparators/zip.py                      |   4 +-
 diffoscope/config.py                               |  59 ++++----
 diffoscope/diff.py                                 |  24 +++-
 diffoscope/difference.py                           |  13 +-
 diffoscope/external_tools.py                       |   9 ++
 diffoscope/logging.py                              |   4 +-
 diffoscope/main.py                                 |  62 ++++++---
 diffoscope/parallel/comparison_pool.py             |   5 +-
 diffoscope/presenters/html/__init__.py             |   2 +-
 diffoscope/presenters/html/html.py                 |  72 +++++++---
 diffoscope/progress.py                             |   4 +-
 diffoscope/tempfiles.py                            |   9 ++
 setup.py                                           |   2 -
 tests/comparators/test_android.py                  |   3 -
 .../{test_odt.py => test_berkeley_db.py}           |  34 ++---
 tests/comparators/test_deb.py                      |   1 -
 tests/comparators/test_elf.py                      |  14 +-
 tests/comparators/test_java.py                     |  40 +++++-
 tests/comparators/test_macho.py                    |   9 +-
 tests/comparators/test_rlib.py                     |   6 +-
 tests/comparators/test_utils.py                    |   2 +
 tests/comparators/{test_odt.py => test_xsb.py}     |  30 ++--
 tests/data/berkeley_db_expected_diff               |  66 +++++++++
 ...ass_expected_diff => javap_class_expected_diff} |   0
 tests/data/procyon_class_expected_diff             |   9 ++
 tests/data/{test1.macho => test1.db}               | Bin 24840 -> 32768 bytes
 tests/data/test1.xsb                               | Bin 0 -> 1546 bytes
 tests/data/{fuzzy-tar-in-tar1.tar => test2.db}     | Bin 20480 -> 16384 bytes
 tests/data/test2.xsb                               | Bin 0 -> 1546 bytes
 tests/data/xsb_expected_diff                       | 153 +++++++++++++++++++++
 tests/test_presenters.py                           |   1 -
 tests/test_progress.py                             |  23 ++--
 diffoscope/path.py => tests/test_source.py         |  15 +-
 tests/utils/__init__.py                            |   4 +-
 tests/utils/tools.py                               |   2 -
 56 files changed, 809 insertions(+), 266 deletions(-)
 copy diffoscope/comparators/{pcap.py => berkeley_db.py} (63%)
 copy diffoscope/comparators/{odt.py => xsb.py} (73%)
 copy tests/comparators/{test_odt.py => test_berkeley_db.py} (62%)
 copy tests/comparators/{test_odt.py => test_xsb.py} (63%)
 create mode 100644 tests/data/berkeley_db_expected_diff
 rename tests/data/{class_expected_diff => javap_class_expected_diff} (100%)
 create mode 100644 tests/data/procyon_class_expected_diff
 copy tests/data/{test1.macho => test1.db} (63%)
 mode change 100755 => 100644
 create mode 100644 tests/data/test1.xsb
 copy tests/data/{fuzzy-tar-in-tar1.tar => test2.db} (75%)
 create mode 100644 tests/data/test2.xsb
 create mode 100644 tests/data/xsb_expected_diff
 copy diffoscope/path.py => tests/test_source.py (71%)

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

More information about the diffoscope mailing list