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

[Sebastian Noack, 2017/08/16 09:16:13]

There should be a blank line below the license disclaimer.

[tlucas, 2017/08/16 10:24:24]

Done.

 
 import os
 import re
 import codecs
 import subprocess
 import tarfile
 import json
 
 from packager import readMetadata, getDefaultFileName
 
@@ skipping 24 matching lines @@
                         if os.path.basename(fileinfo.name) in ('.hgtags', '.hgignore'):
                             continue
                         filedata = repoarchive.extractfile(fileinfo)
                         fileinfo.name = re.sub(r'^[^/]+/', prefix, fileinfo.name)
                         archive.addfile(fileinfo, filedata)
             finally:
                 process.stdout.close()
                 process.wait()
 
 
+def repo_has_uncommitted():
+    """Checks if the given repository is clean"""
+    buff = subprocess.check_output(['hg', 'status'])
+
+    if len(buff):
+        print('Dirty / uncommitted changes in repository!')
+        return True
+
+    return False
+
+
+def repo_has_outgoing():
+    """Checks whether there would be outgoing changesets to the given path"""
+    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):
+    """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"""
+
+    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?')
+
+    while True:
+        choice = raw_input('Please choose (yes / no): ').lower()
+
+        if choice == 'yes':
+            return True
+        if choice == 'no':
+            return False
+
+        print('Please answer "yes" or "no"!')
+
+
+def can_safely_release():
+    # run repository-checks and bail out early, in case the user does not

[Sebastian Noack, 2017/08/16 09:16:13]

Perhaps this comment should rather be a docstring?

[tlucas, 2017/08/16 10:24:24]

Done, also reduced the sentence to a minimum.

+    # explicitly want to continue OR if the check would cause the process to
+    # abort anyway
+    if repo_has_uncommitted():
+        return False
+    if repo_has_incoming():
+        return False
+    if repo_has_outgoing():
+        return continue_with_outgoing()
+
+
 def run(baseDir, type, version, keyFile, downloadsRepo):
+    if not can_safely_release():
+        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':
         import buildtools.packagerChrome as packager
 
     # Replace version number in metadata file "manually", ConfigParser will mess
@@ skipping 57 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])