libmozdata 0.2.18__tar.gz → 0.2.20__tar.gz

{libmozdata-0.2.18/libmozdata.egg-info → libmozdata-0.2.20}/PKG-INFO

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

libmozdata-0.2.20/VERSION

@@ -0,0 +1 @@
+0.2.20

{libmozdata-0.2.18 → libmozdata-0.2.20}/libmozdata/phabricator.py

@@ -7,6 +7,7 @@ import collections
 import enum
 import json
 import logging
+import os
 from functools import cached_property
 from urllib.parse import urlencode, urlparse
 
@@ -19,7 +20,9 @@ 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, merged"
+    "PhabricatorPatch",
+    "id, phid, patch, base_revision, commits, merged, first_public_parent",
+    defaults=[None],
 )
 
 logger = logging.getLogger(__name__)
@@ -228,7 +231,13 @@ class PhabricatorAPI(object):
 
     def get_header(self):
         """Get the header to use each query"""
-        return {"User-Agent": self.USER_AGENT}
+        headers = {"User-Agent": self.USER_AGENT}
+
+        edge_key = os.environ.get("PHABRICATOR_EDGE_KEY")
+        if edge_key:
+            headers["Mozilla-Edge-Key"] = edge_key
+
+        return headers
 
     def search_diffs(
         self,
@@ -705,13 +714,33 @@ class PhabricatorAPI(object):
                 diff_phid=diff["phid"], attachments={"commits": True}
             )
             commits = diffs[0]["attachments"]["commits"].get("commits", [])
+            query_diffs = self.request("differential.querydiffs", ids=[diff["id"]])
+            properties = query_diffs.get(str(diff["id"]), {}).get("properties", {})
+            local_commits = properties.get("local:commits") or {}
+            if not local_commits:
+                logger.warn("Diff %s has no local:commits property", diff["id"])
+
+            first_public_parent = None
+            # local:commits is keyed by the local commit node, which may differ from
+            # the public commit identifier exposed by Phabricator's commits attachment
+            # hence iterating over values (there is only one in the dict but key unknown).
+            for local_commit in local_commits.values():
+                first_public_parent = local_commit.get("firstPublicParent")
+                if first_public_parent:
+                    break
             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, merged
+                diff["id"],
+                diff["phid"],
+                patch,
+                diff["baseRevision"],
+                commits,
+                merged,
+                first_public_parent,
             )
 
         # Load full diff when not provided by user

{libmozdata-0.2.18 → libmozdata-0.2.20/libmozdata.egg-info}/PKG-INFO

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

libmozdata-0.2.18/VERSION

@@ -1 +0,0 @@
-0.2.18