libmozdata 0.2.10__tar.gz → 0.2.11__tar.gz

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

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

libmozdata-0.2.11/VERSION

@@ -0,0 +1 @@
+0.2.11

{libmozdata-0.2.10 → libmozdata-0.2.11}/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.11}/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.11/libmozdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: libmozdata
-Version: 0.2.10
+Version: 0.2.11
 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