[Reproducible-commits] [diffoscope] branch pu/new_file updated (1d4af05 -> 69f57bd)

Jérémy Bobbio lunar at moszumanska.debian.org
Thu Sep 3 09:40:49 UTC 2015


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

lunar pushed a change to branch pu/new_file
in repository diffoscope.

  discards  1d4af05   Add --new-file to treat absent files as empty
      adds  4e07554   Assume UTF-8 output if stdin does not advertise any encoding
      adds  636731a   Pass --force-local to cpio
      adds  6502dd0   Make directory comparison work again
      adds  9c7cc48   Give proper error message when run on non-existing files
       new  69f57bd   Add --new-file to treat absent files as empty

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   (1d4af05)
            \
             N -- N -- N   refs/heads/pu/new_file (69f57bd)

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:
 diffoscope/__main__.py              |  2 +-
 diffoscope/comparators/__init__.py  | 31 +++++++++----------
 diffoscope/comparators/binary.py    | 31 +++++++++++++++++--
 diffoscope/comparators/bzip2.py     |  2 +-
 diffoscope/comparators/cpio.py      |  2 +-
 diffoscope/comparators/debian.py    |  4 +--
 diffoscope/comparators/directory.py |  4 +--
 diffoscope/comparators/utils.py     |  4 +--
 diffoscope/difference.py            | 14 ++++-----
 tests/comparators/test_binary.py    |  8 ++++-
 tests/comparators/test_bzip2.py     |  8 +++--
 tests/comparators/test_cpio.py      |  3 +-
 tests/comparators/test_deb.py       |  3 +-
 tests/comparators/test_debian.py    |  3 +-
 tests/comparators/test_directory.py |  4 +++
 tests/comparators/test_elf.py       | 15 ++++++----
 tests/comparators/test_fonts.py     |  8 +++--
 tests/comparators/test_gettext.py   |  8 +++--
 tests/comparators/test_gzip.py      |  3 +-
 tests/comparators/test_ipk.py       |  3 +-
 tests/comparators/test_iso9660.py   |  3 +-
 tests/comparators/test_java.py      |  8 +++--
 tests/comparators/test_mono.py      |  8 +++--
 tests/comparators/test_pdf.py       |  8 +++--
 tests/comparators/test_png.py       |  8 +++--
 tests/comparators/test_rpm.py       |  3 +-
 tests/comparators/test_sqlite.py    |  8 +++--
 tests/comparators/test_squashfs.py  |  3 +-
 tests/comparators/test_tar.py       |  3 +-
 tests/comparators/test_text.py      |  8 +++--
 tests/comparators/test_xz.py        |  3 +-
 tests/comparators/test_zip.py       |  3 +-
 tests/test_main.py                  | 59 +++++++++++++++++++++++++++++++++++++
 33 files changed, 204 insertions(+), 81 deletions(-)
 create mode 100644 tests/test_main.py

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



More information about the Reproducible-commits mailing list