Skip to content

Commit 15d7192

Browse files
committed
Bug 1529175 - update our arc fork and moz-phab to skip specific prompts; r=zalun!
When the MOZPHAB env var is set cinnabarc will bypass selected prompts. Set the env var, and tidy up related messages/warnings. Differential Revision: https://phabricator.services.mozilla.com/D31949
1 parent b4c3c4a commit 15d7192

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

moz-phab

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -765,10 +765,7 @@ class Repository(object):
765765
logger.warning("\n\n".join(warnings))
766766

767767
if unavailable_reviewers_warning:
768-
logger.warning(
769-
"\nYou're forcing unavailable reviewer(s).\nIf stuck, please read the "
770-
"discussion under https://bugzilla.mozilla.org/show_bug.cgi?id=1499205"
771-
)
768+
logger.warning("Notice: reviewer availability overridden.")
772769

773770
def check_arc(self):
774771
"""Check if arc can communicate with Phabricator."""
@@ -2081,7 +2078,7 @@ def show_commit_stack(
20812078
if validate:
20822079
# Check if target bug ID is the same as in the Phabricator revision
20832080
revision = get_revisions(repo.path, ids=[int(commit["rev-id"])])[0]
2084-
change_bug_id = (
2081+
change_bug_id = revision["fields"]["bugzilla.bug-id"] and (
20852082
commit["bug-id"] != revision["fields"]["bugzilla.bug-id"]
20862083
)
20872084
else:
@@ -3494,6 +3491,7 @@ def main(argv):
34943491

34953492
init_logging()
34963493
config = Config()
3494+
os.environ["MOZPHAB"] = "1"
34973495

34983496
if config.no_ansi:
34993497
HAS_ANSI = False

0 commit comments

Comments
 (0)