swh.loader.mercurial 3.6.2__py3-none-any.whl → 3.6.3__py3-none-any.whl

swh/loader/mercurial/directory.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2023 The Software Heritage developers
+# Copyright (C) 2023  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information

swh/loader/mercurial/hgutil.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2023  The Software Heritage developers
+# Copyright (C) 2020-2026  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
@@ -9,11 +9,13 @@ from functools import partial
 from typing import Dict, List, Mapping, NewType, Optional, Set
 
 # The internal Mercurial API is not guaranteed to be stable.
-from mercurial import bookmarks, context, error, hg, smartset, util
+from mercurial import bookmarks, context, error, hg, initialization, smartset, util
 import mercurial.ui
 
 from swh.loader.core.utils import clone_with_timeout
 
+initialization.init()
+
 NULLID = mercurial.node.nullid
 HgNodeId = NewType("HgNodeId", bytes)
 Repository = hg.localrepo
@@ -57,10 +59,11 @@ def branching_info(repo: hg.localrepo, ignored: Set[int]) -> BranchingInfo:
     branch_closed_heads = defaultdict(list)
     all_bookmarks = bookmarks.listbookmarks(repo)
 
-    for branch_name, heads in repo.branchmap().items():
+    branchmap = repo.branchmap()
+    for branch_name in branchmap:
         # Sort the heads by node id since it's stable and doesn't depend on local
         # topology like cloning order.
-        for head in sorted(heads):
+        for head in sorted(branchmap.branchheads(branch_name, closed=True)):
             head = repo[head]
             if head.rev() in ignored:
                 # This revision or one of its ancestors is corrupted, ignore it

swh/loader/mercurial/tests/test_directory.py

@@ -8,7 +8,7 @@ from pathlib import Path
 
 import pytest
 
-from swh.core.nar import Nar
+from swh.core.nar import Nar, NarHashAlgo
 from swh.loader.exception import NotFound
 from swh.loader.mercurial.directory import HgCheckoutLoader, clone_repository
 from swh.loader.mercurial.hgutil import repository
@@ -22,7 +22,7 @@ from swh.model.hashutil import hash_to_bytes
 
 
 def compute_nar_hash_for_ref(
-    repo_url: str, ref: str, hash_name: str = "sha256", temp_dir: str = "/tmp"
+    repo_url: str, ref: str, hash_name: NarHashAlgo = "sha256", temp_dir: str = "/tmp"
 ) -> str:
     """Compute the nar from a hg checked out by hg."""
     tmp_path = Path(os.path.join(temp_dir, "compute-nar"))

{swh_loader_mercurial-3.6.2.dist-info → swh_loader_mercurial-3.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swh.loader.mercurial
-Version: 3.6.2
+Version: 3.6.3
 Summary: Software Heritage Mercurial Loader
 Author-email: Software Heritage developers <swh-devel@inria.fr>
 Project-URL: Homepage, https://gitlab.softwareheritage.org/swh/devel/swh-loader-mercurial
@@ -21,7 +21,7 @@ Requires-Dist: click
 Requires-Dist: patool
 Requires-Dist: python-dateutil
 Requires-Dist: python-hglib
-Requires-Dist: mercurial
+Requires-Dist: mercurial>=7.2
 Requires-Dist: swh.model>=6.13.0
 Requires-Dist: swh.storage>=2.4.1
 Requires-Dist: swh.scheduler>=0.0.39
@@ -31,7 +31,7 @@ Requires-Dist: click; extra == "testing"
 Requires-Dist: patool; extra == "testing"
 Requires-Dist: python-dateutil; extra == "testing"
 Requires-Dist: python-hglib; extra == "testing"
-Requires-Dist: mercurial; extra == "testing"
+Requires-Dist: mercurial>=7.2; extra == "testing"
 Requires-Dist: swh.model>=6.13.0; extra == "testing"
 Requires-Dist: swh.storage>=2.4.1; extra == "testing"
 Requires-Dist: swh.scheduler>=0.0.39; extra == "testing"
@@ -39,7 +39,7 @@ Requires-Dist: swh.loader.core>=5.24.0; extra == "testing"
 Requires-Dist: celery-types; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-mock; extra == "testing"
-Requires-Dist: swh.core[http]>=4.5.0; extra == "testing"
+Requires-Dist: swh.core[http]>=4.5.3; extra == "testing"
 Requires-Dist: swh.loader.core[testing]>=5.24.0; extra == "testing"
 Requires-Dist: swh.scheduler[pytest]>=3.1.0; extra == "testing"
 Requires-Dist: swh.storage[pytest]>=3.1.0; extra == "testing"

{swh_loader_mercurial-3.6.2.dist-info → swh_loader_mercurial-3.6.3.dist-info}/RECORD

@@ -1,8 +1,8 @@
 swh/loader/mercurial/__init__.py,sha256=ioPrVqbM_-w8sEwWUKEw9jCTbzQTkWwMaJM77D7YItM,745
 swh/loader/mercurial/archive_extract.py,sha256=gMSxvwIxZu5-Ei9a7ZeNCjZV-wBMIBTGonUutZ16yhE,1981
 swh/loader/mercurial/converters.py,sha256=qrL63I-6ezmICJa7cTB_jlS0kiPfHGL3xH8NXJTF1nU,1040
-swh/loader/mercurial/directory.py,sha256=UA5Hie6cSgGd21LE-QPPVE7aeiSzvpndzIMNULG7EUI,3354
-swh/loader/mercurial/hgutil.py,sha256=tg-QX2jRod9kUZ-nGPv30Km11Z1hTf4zINYL1T7eakk,5142
+swh/loader/mercurial/directory.py,sha256=u0ZH6FWWeVUYkA6xlZLye2nCTFlC3GDjMgd-fiaGkFA,3355
+swh/loader/mercurial/hgutil.py,sha256=GqpOCRNIZ-o6ruT-tYyV-E9xZVq4Km7vaRpzPDfUupY,5234
 swh/loader/mercurial/identify.py,sha256=9QQqI6MywQiZ62bm0JD_TNMjMlYdqJPzmHGFsl3cWGM,16604
 swh/loader/mercurial/loader.py,sha256=t2DFn75NfHLFWdEGhcQFe1f7c6as1CRxOYAqUu_1zRA,30036
 swh/loader/mercurial/py.typed,sha256=bWew9mHgMy8LqMu7RuqQXFXLBxh2CRx0dUbSx-3wE48,27
@@ -12,7 +12,7 @@ swh/loader/mercurial/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 swh/loader/mercurial/tests/conftest.py,sha256=xMFVE0tp9bbspeywcIpS5gDjeZF_SMWcIgvyrsybuXQ,1671
 swh/loader/mercurial/tests/loader_checker.py,sha256=lcOoO4viwqfUgKKm9sUBhw5_uyS93pyT-BMWDnPxgzU,2353
 swh/loader/mercurial/tests/test_converters.py,sha256=5r02CYtZ85xdK00wcfDjmWJo1Qr4BHOYHtjxWaHOVhY,2155
-swh/loader/mercurial/tests/test_directory.py,sha256=rs-p4lRApMo4ayiTe-2z2HMnro4AOO_Pfj6WH1SGY8w,6861
+swh/loader/mercurial/tests/test_directory.py,sha256=9EjAGcQvjpcb4lzJbMgEWiNrB5T1E5Lej2dNELI4fH8,6882
 swh/loader/mercurial/tests/test_identify.py,sha256=Dp21Ic8b8HMt3hcdqHzPuTpInTk4WLD-yjf7u79PJZM,3016
 swh/loader/mercurial/tests/test_loader.py,sha256=D4DdHTO_-zA6rK06b829mF1tl8Io3RJ9-H7WX2HTHCA,27002
 swh/loader/mercurial/tests/test_tasks.py,sha256=7vB4HSlmN7QKyA4p7ZnKRCmb4PgsY0qnW96KUJVjuzs,1970
@@ -33,10 +33,10 @@ swh/loader/mercurial/tests/data/the-sandbox.json,sha256=baIwB2DbiXkwzxoA0Z8vDFlt
 swh/loader/mercurial/tests/data/the-sandbox.tgz,sha256=MkJ6Nx_CDRkFlox9dcfq-I2ktFa2niAeAT2f7ClvrtY,13309
 swh/loader/mercurial/tests/data/transplant.json,sha256=h9akY1VS5nv5LOoiZuiJ3tg9ikkeciqdpjpeyGFR_p0,633
 swh/loader/mercurial/tests/data/transplant.tgz,sha256=eoS3hnKcIOkNrx3pj8lj3lMP7_V8EEjg4rmNI0qO1Vs,3206
-swh_loader_mercurial-3.6.2.dist-info/licenses/AUTHORS,sha256=CfkR1t8Z3y1NSRjmzMBmWzN55CEqCDCIXp1XtqzAjf4,117
-swh_loader_mercurial-3.6.2.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-swh_loader_mercurial-3.6.2.dist-info/METADATA,sha256=Jgd4h1TQfBSIXFfSVh3PdN3gAWmzcLxVZWwNeCTzEeY,3140
-swh_loader_mercurial-3.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-swh_loader_mercurial-3.6.2.dist-info/entry_points.txt,sha256=KR1-Noi4WbxrdetuNh-QSOSVVp12_NT04aa5nK3YO5o,202
-swh_loader_mercurial-3.6.2.dist-info/top_level.txt,sha256=8XlamXOHbQHPR7Tn7kZa8F4ufiLuK-BL_bZje5MY9hw,4
-swh_loader_mercurial-3.6.2.dist-info/RECORD,,
+swh_loader_mercurial-3.6.3.dist-info/licenses/AUTHORS,sha256=CfkR1t8Z3y1NSRjmzMBmWzN55CEqCDCIXp1XtqzAjf4,117
+swh_loader_mercurial-3.6.3.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+swh_loader_mercurial-3.6.3.dist-info/METADATA,sha256=JtybLPGwP5Hd0j7a85JYuNkJXMfCsVp4fg2QRtoFatM,3150
+swh_loader_mercurial-3.6.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+swh_loader_mercurial-3.6.3.dist-info/entry_points.txt,sha256=KR1-Noi4WbxrdetuNh-QSOSVVp12_NT04aa5nK3YO5o,202
+swh_loader_mercurial-3.6.3.dist-info/top_level.txt,sha256=8XlamXOHbQHPR7Tn7kZa8F4ufiLuK-BL_bZje5MY9hw,4
+swh_loader_mercurial-3.6.3.dist-info/RECORD,,

{swh_loader_mercurial-3.6.2.dist-info → swh_loader_mercurial-3.6.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any