Issue 4354, 4355 - handle dirty/outdated repos on release

releaseAutomation.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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 __future__ import print_function
 
 import os
 import re
 import codecs
 import subprocess
 import tarfile
 import json
 
 from packager import readMetadata, getDefaultFileName
@@ skipping 48 matching lines @@
     try:
         subprocess.check_output(['hg', 'outgoing'])
         print('Detected outgoing changesets!')
         return True
     except subprocess.CalledProcessError as e:
         if e.returncode == 1:
             return False
         raise
 
 
-def repo_has_incoming(repo_paths):
+def repo_has_incoming(*repo_paths):
     """Checks whether the local repositories are up-to-date"""
     incoming = False
 
     for repo_path in repo_paths:
         try:
             subprocess.check_output(['hg', 'incoming', '-R', repo_path])
             print('Detected incoming changesets in "{}"'.format(repo_path))
             incoming = True
         except subprocess.CalledProcessError as e:
             if e.returncode != 1:
                 raise
 
     return incoming
 
 
 def continue_with_outgoing():
-    """Asks the user if he wants to continue despite facing warnings"""
+    """Asks the user if they want to continue despite facing warnings"""
 
     print('If you proceed with the release, they will be included in the '
           'release and pushed.')
-    print('Are you sure about continuing the release-process?')
+    print('Are you sure about continuing the release process?')
 
     while True:
-        choice = raw_input('Please choose (yes / no): ').lower()
+        choice = raw_input('Please choose (yes / no): ').lower().strip()
 
         if choice == 'yes':
             return True
         if choice == 'no':
             return False
 
-        print('Please answer "yes" or "no"!')
+
+def can_safely_release(*repo_paths):
+    """Run repository-checks in order to bail out early if necessary"""
+    if repo_has_uncommitted():
+        return False
+    if repo_has_incoming(*repo_paths):
+        return False
+    if repo_has_outgoing():
+        return continue_with_outgoing()
 
 
 def run(baseDir, type, version, keyFile, downloadsRepo):
-    # run repository-checks and bail out early, in case the user does not
-    # explicitly want to continue OR if the check would cause the process to
-    # abort anyway
-    def can_safely_release():
-        if repo_has_uncommitted():
-            return False
-        if repo_has_incoming():
-            return False
-        if repo_has_outgoing():
-            return continue_with_outgoing()
-
-    if not can_safely_release():
+    if not can_safely_release(baseDir, downloadsRepo):
         print('Aborting release.')
         return 1
 
     if type == 'gecko':
         import buildtools.packagerGecko as packager
     elif type == 'safari':
         import buildtools.packagerSafari as packager
     elif type == 'edge':
         import buildtools.packagerEdge as packager
     elif type == 'chrome':
@@ skipping 60 matching lines @@
     create_sourcearchive(baseDir, archivePath)
     downloads.append(archivePath)
 
     # Now add the downloads and commit
     subprocess.check_call(['hg', 'add', '-R', downloadsRepo] + downloads)
     subprocess.check_call(['hg', 'commit', '-R', downloadsRepo, '-m', 'Releasing %s %s' % (extensionName, version)])
 
     # Push all changes
     subprocess.check_call(['hg', 'push', '-R', baseDir])
     subprocess.check_call(['hg', 'push', '-R', downloadsRepo])