[diffoscope] branch lamby/843531-avoid-walking-through-packages-twice updated (c2fae66 -> b6cc3cc)

Chris Lamb chris at chris-lamb.co.uk
Fri Dec 23 10:48:16 CET 2016

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

lamby pushed a change to branch lamby/843531-avoid-walking-through-packages-twice
in repository diffoscope.

  discards  c2fae66   Avoid walking through packages twice when comparing two .changes (Closes: #843531)
      adds  120d0cf   comparators.debian: No need to keep .buildinfo file descriptor open.
      adds  77f08b9   bin/diffoscope: Use os.path.join "properly" as we are already using it.
      adds  760005e   bin/diffoscope: Use typical sys.path.insert(0, ...) method to modify sys.path
      adds  fe1f589   bin/diffoscope: Use immutable tuple over mutable list for clarity.
      adds  cd1cd41   bin/diffoscope: Ensure that running from Git always uses that checkout's modules.
      adds  b3cb6d1   Change icc-recognizing regexp to reflect changes in file type description. (Closes: #848814)
      adds  40a9aeb   Release 64
      adds  6eeeba2   Release version 64
      adds  0309e93   Use ssh-keygen for comparing OpenSSH public keys
      adds  4879cd7   Remove inline styles from col elements
      adds  3e5adbe   Tidy "comparing" debugging message in compare_files
      adds  6fedebd   Clarify what "same content" means in compare_files debug message.
      adds  813ac14   Clarify that this debugging statement is regarding Binary.has_same_content, not a subclass
      adds  8dde15f   Correct "instantiating" typo.
       new  b6cc3cc   Avoid walking through packages twice when comparing two .changes (Closes: #843531)

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   (c2fae66)
             N -- N -- N   refs/heads/lamby/843531-avoid-walking-through-packages-twice (b6cc3cc)

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 1 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:
 bin/diffoscope                                     | 11 ++--
 debian/changelog                                   | 58 ++++++++++++++++++++++
 debian/control                                     |  1 +
 diffoscope/__init__.py                             |  2 +-
 diffoscope/comparators/__init__.py                 |  5 +-
 diffoscope/comparators/binary.py                   |  4 +-
 diffoscope/comparators/debian.py                   | 26 +++++-----
 diffoscope/comparators/icc.py                      |  2 +-
 .../comparators/{javascript.py => openssh.py}      | 14 +++---
 diffoscope/exc.py                                  |  3 ++
 diffoscope/presenters/html.py                      | 10 +++-
 ...{test_javascript.py => test_openssh_pub_key.py} | 30 +++++------
 tests/data/openssh_pub_key_expected_diff           |  3 ++
 tests/data/test_openssh_pub_key1.pub               |  1 +
 tests/data/test_openssh_pub_key2.pub               |  1 +
 15 files changed, 125 insertions(+), 46 deletions(-)
 copy diffoscope/comparators/{javascript.py => openssh.py} (76%)
 copy tests/comparators/{test_javascript.py => test_openssh_pub_key.py} (58%)
 create mode 100644 tests/data/openssh_pub_key_expected_diff
 create mode 100644 tests/data/test_openssh_pub_key1.pub
 create mode 100644 tests/data/test_openssh_pub_key2.pub

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

More information about the diffoscope mailing list