mercurial.git
4 years agoTolerate SIGINT getting the kill in test-stdio.py.
Tristan Seligmann [Mon, 17 Aug 2020 08:30:26 +0000 (10:30 +0200)]
Tolerate SIGINT getting the kill in test-stdio.py.

Forwarded: https://bz.mercurial-scm.org/show_bug.cgi?id=6402

Gbp-Pq: Name 0005-Tolerate-SIGINT-getting-the-kill-in-test-stdio.py.patch

4 years agoDisabled hginstallscripts @LIBDIR@ replacement in setup.py.
Stefano Rivera [Sun, 16 Aug 2020 09:03:07 +0000 (11:03 +0200)]
Disabled hginstallscripts @LIBDIR@ replacement in setup.py.

Bug-Debian: http://bugs.debian.org/620087
Bug-Ubuntu: https://bugs.launchpad.net/bugs/745250
Forwarded: not-needed

setup.py replaces @LIBDIR@ in the hg script, with a path that differs between
Python versions.
libdir in hg doesn't need to be set if mercurial is available in the public
namespace, as it is in Debian.
hg doesn't alter sys.paths if this replacement hasn't happened.

Gbp-Pq: Name deb_specific__disable_libdir_replacement.patch

4 years agodeb_specific__optional-dependencies
Python Applications Packaging Team [Sun, 16 Aug 2020 09:03:07 +0000 (11:03 +0200)]
deb_specific__optional-dependencies

Suggest Debian packages for some optional dependencies.

Gbp-Pq: Name deb_specific__optional-dependencies

4 years agodeb_specific__hgk.py
Python Applications Packaging Team [Sun, 16 Aug 2020 09:03:07 +0000 (11:03 +0200)]
deb_specific__hgk.py

Set default hgk path for hgk outside bin.

Gbp-Pq: Name deb_specific__hgk.py.patch

4 years agodeb_specific__test_zstd_s390x
Debian Python Team [Wed, 25 Aug 2021 17:54:04 +0000 (18:54 +0100)]
deb_specific__test_zstd_s390x

# HG changeset patch
# User Julien Cristau <jcristau@debian.org>
# Date 1629904487 -7200
#      Wed Aug 25 17:14:47 2021 +0200
# Branch stable
# Node ID e11f903fd7a6e80b6168c7ef6e28f20349e681e2
# Parent  132819e1fa1565b45fc09093ebbfbe991b0a0f5d
tests: allow for variation in zstd output as seen on s390x and powerpc

Gbp-Pq: Name deb_specific__test_zstd_s390x.patch

4 years agoproposed_upstream__doctest.path
Debian Python Team [Wed, 25 Aug 2021 17:54:04 +0000 (18:54 +0100)]
proposed_upstream__doctest.path

# HG changeset patch
# User Julien Cristau <jcristau@debian.org>
# Date 1589916203 -7200
#      Tue May 19 21:23:23 2020 +0200
# Node ID de789b6b188b62cf38c5c5cfe760cff9a48c52f5
# Parent  3b7aabd02e11fcfc015b3a90a0c52d971a7b8a83
test: make test-doctest.py work when it's not run from a mercurial repo

This assumption fails when building and running tests from a source
tarball, e.g.

Differential Revision: https://phab.mercurial-scm.org/D8571

Gbp-Pq: Name proposed_upstream__doctest.path

4 years agoproposed_upstream__revlog_s390x_part2
Debian Python Team [Wed, 25 Aug 2021 17:54:04 +0000 (18:54 +0100)]
proposed_upstream__revlog_s390x_part2

# HG changeset patch
# User Julien Cristau <jcristau@debian.org>
# Date 1629841355 -7200
#      Tue Aug 24 23:42:35 2021 +0200
# Branch stable
# Node ID 132819e1fa1565b45fc09093ebbfbe991b0a0f5d
# Parent  518dd67482c0bde8636d1a5e6f10cb369b522e1f
revlog: fix more type confusion in index_replace_sidedata_info (issue6580)

We were telling python that "rev" was a Py_ssize_t (via the "n" format),
but it was actually an int.

Differential Revision: https://phab.mercurial-scm.org/D11335

Gbp-Pq: Name proposed_upstream__revlog_s390x_part2.patch

4 years agoproposed_upstream__revlog_s390x_part1
Debian Python Team [Wed, 25 Aug 2021 17:54:04 +0000 (18:54 +0100)]
proposed_upstream__revlog_s390x_part1

# HG changeset patch
# User Julien Cristau <jcristau@mozilla.com>
# Date 1629801874 -7200
#      Tue Aug 24 12:44:34 2021 +0200
# Branch stable
# Node ID 518dd67482c0bde8636d1a5e6f10cb369b522e1f
# Parent  df94c13ddf60b5c355db04d9a6dde9ce80d58df3
revlog: fix type confusion with sidedata_comp_len (issue6580)

The format string uses "i" (int) for sidedata_comp_len, so we shouldn't
be passing a pointer to Py_ssize_t to PyArg_ParseTuple.  On 64-bit
big-endian, this would result in python only writing to the upper 32
bits, and things go downhill from there.

Differential Revision: https://phab.mercurial-scm.org/D11334

Gbp-Pq: Name proposed_upstream__revlog_s390x_part1.patch

4 years agomercurial (5.9-3) unstable; urgency=medium
Julien Cristau [Wed, 25 Aug 2021 17:54:04 +0000 (18:54 +0100)]
mercurial (5.9-3) unstable; urgency=medium

  * Further adjust tests for endianness-related variations.
  * Silence yet another test warning about `which`.

[dgit import unpatched mercurial 5.9-3]

4 years agoImport mercurial_5.9-3.debian.tar.xz
Julien Cristau [Wed, 25 Aug 2021 17:54:04 +0000 (18:54 +0100)]
Import mercurial_5.9-3.debian.tar.xz

[dgit import tarball mercurial 5.9-3 mercurial_5.9-3.debian.tar.xz]

4 years agoImport mercurial_5.9.orig.tar.gz
Julien Cristau [Mon, 23 Aug 2021 15:04:40 +0000 (16:04 +0100)]
Import mercurial_5.9.orig.tar.gz

[dgit import orig mercurial_5.9.orig.tar.gz]