Improve logging in Repository.apply_build() (#83)

* Improve logging in Repository.apply_build()

* Nits

Co-authored-by: EvaBardou <[email protected]>

Author: EvaBardou

libmozevent/mercurial.py

@@ -150,9 +150,10 @@ def apply_build(self, build):
 
         # When base revision is missing, update to default revision
         hg_base = needed_stack[0].base_revision
+        build.base_revision = hg_base
         build.missing_base_revision = not self.has_revision(hg_base)
         if build.missing_base_revision:
-            logger.info(
+            logger.warning(
                 "Missing base revision from Phabricator",
                 revision=hg_base,
                 fallback=self.default_revision,
@@ -210,11 +211,15 @@ def get_author(commit):
             message += "Differential Diff: {}".format(patch.phid)
 
             logger.info("Applying patch", phid=patch.phid, message=message)
-            self.repo.import_(
-                patches=io.BytesIO(patch.patch.encode("utf-8")),
-                message=message.encode("utf-8"),
-                user=user.encode("utf-8"),
-            )
+            try:
+                self.repo.import_(
+                    patches=io.BytesIO(patch.patch.encode("utf-8")),
+                    message=message.encode("utf-8"),
+                    user=user.encode("utf-8"),
+                )
+            except Exception as e:
+                logger.error("Failed to apply patch: {}".format(e), phid=patch.phid)
+                raise
 
     def add_try_commit(self, build):
         """

libmozevent/phabricator.py

@@ -46,6 +46,7 @@ def __init__(self, request):
         self.reviewers = []
         self.diff = None
         self.stack = []
+        self.base_revision = None
         self.missing_base_revision = False
 
     def __str__(self):