libmozdata 0.2.10__tar.gz → 0.2.12__tar.gz

{libmozdata-0.2.10/libmozdata.egg-info → libmozdata-0.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: libmozdata
-Version: 0.2.10
+Version: 0.2.12
 Summary: Library to access and aggregate several Mozilla data sources.
 Home-page: https://github.com/mozilla/libmozdata
 Author: Mozilla Release Management

libmozdata-0.2.12/VERSION

@@ -0,0 +1 @@
+0.2.12

{libmozdata-0.2.10 → libmozdata-0.2.12}/libmozdata/lando.py

@@ -3,6 +3,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from collections import namedtuple
+from urllib.parse import urljoin
+
 import requests
 
 from . import config
@@ -91,3 +94,60 @@ class LandoWarnings(object):
 
         if len(current_warnings):
             return self.del_warnings(current_warnings)
+
+
+# Represent the commit in both mercurial & git sources, using full hashes
+CommitMap = namedtuple("CommitMap", "git_hash, hg_hash")
+
+
+class LandoMissingCommit(Exception):
+    """
+    Raised when a commit is not available on Lando CommitMap API
+    """
+
+
+class LandoCommitMapAPI:
+    """
+    Anonymous API calls on Lando API to convert mercurial <=> git commits
+    """
+
+    def __init__(self, api_url="https://lando.moz.tools/api/"):
+        self.api_url = api_url
+        assert self.api_url.endswith("/"), "Lando API url must end with a /"
+        self.USER_AGENT = config.get("User-Agent", "name", required=True)
+
+    def request(self, method, repository, revision) -> CommitMap:
+        """
+        Call a conversion method on Lando API and return a CommitMap object
+        with both full hashes
+        """
+        url = urljoin(self.api_url, f"{method}/{repository}/{revision}")
+        resp = requests.get(
+            url,
+            headers={
+                "User-Agent": self.USER_AGENT,
+            },
+        )
+        if not resp.ok:
+            if resp.status_code == 404:
+                raise LandoMissingCommit(
+                    f"No commit found for {method} {revision}@{repository}"
+                )
+
+            raise Exception(
+                f"Failed to resolve {method} {revision}@{repository}: {resp.text}"
+            )
+
+        return CommitMap(**resp.json())
+
+    def git2hg(self, revision: str, repository="firefox") -> CommitMap:
+        """
+        Convert a git hash into a mercurial one
+        """
+        return self.request("git2hg", repository, revision)
+
+    def hg2git(self, revision: str, repository="firefox") -> CommitMap:
+        """
+        Convert a mercurial hash into a git one
+        """
+        return self.request("hg2git", repository, revision)

{libmozdata-0.2.10 → libmozdata-0.2.12}/libmozdata/phabricator.py

@@ -19,7 +19,7 @@ HGMO_JSON_REV_URL_TEMPLATE = "https://hg.mozilla.org/mozilla-central/json-rev/{}
 MOZILLA_PHABRICATOR_PROD = "https://phabricator.services.mozilla.com/api/"
 
 PhabricatorPatch = collections.namedtuple(
-    "PhabricatorPatch", "id, phid, patch, base_revision, commits"
+    "PhabricatorPatch", "id, phid, patch, base_revision, commits, merged"
 )
 
 logger = logging.getLogger(__name__)
@@ -692,14 +692,25 @@ class PhabricatorAPI(object):
             assert "id" in diff
             assert "phid" in diff
             assert "baseRevision" in diff
+
+            # Load diff's revision to get its status
+            revision = self.load_revision(rev_phid=diff["revisionPHID"])
+            status = revision["fields"]["status"]
+            merged = status["closed"] is True and status["value"] == "published"
+
+            # Load the patch itself (raw format)
             patch = self.load_raw_diff(diff["id"])
             diffs = self.search_diffs(
                 diff_phid=diff["phid"], attachments={"commits": True}
             )
             commits = diffs[0]["attachments"]["commits"].get("commits", [])
-            logger.info("Adding patch #{} to stack".format(diff["id"]))
+            logger.info(
+                "Adding patch #{} to stack ({})".format(
+                    diff["id"], "merged" if merged else "non-merged"
+                )
+            )
             return PhabricatorPatch(
-                diff["id"], diff["phid"], patch, diff["baseRevision"], commits
+                diff["id"], diff["phid"], patch, diff["baseRevision"], commits, merged
             )
 
         # Load full diff when not provided by user

{libmozdata-0.2.10 → libmozdata-0.2.12}/libmozdata/release_owners.py

@@ -3,6 +3,7 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import requests
+from requests.exceptions import HTTPError
 
 from . import config, utils
 from .wiki_parser import InvalidWiki, WikiParser
@@ -36,10 +37,17 @@ def get_owners():
     if _OWNERS is not None:
         return _OWNERS
 
-    html = requests.get(
+    resp = requests.get(
         OWNERS_URL,
         headers={"User-Agent": config.get("User-Agent", "name", required=True)},
-    ).text.encode("ascii", errors="ignore")
+    )
+    try:
+        resp.raise_for_status()
+    except HTTPError as e:
+        raise InvalidWiki("Failed to load wiki data") from e
+
+    html = resp.text.encode("ascii", errors="ignore")
+
     parser = WikiParser(tables=[0])
     try:
         parser.feed(html)

{libmozdata-0.2.10 → libmozdata-0.2.12/libmozdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: libmozdata
-Version: 0.2.10
+Version: 0.2.12
 Summary: Library to access and aggregate several Mozilla data sources.
 Home-page: https://github.com/mozilla/libmozdata
 Author: Mozilla Release Management

libmozdata-0.2.10/VERSION

@@ -1 +0,0 @@
-0.2.10