Merge "Un-nest some sections of code"

1 files changed, 89 insertions, 83 deletions

diff --git a/pbr/packaging.py b/pbr/packaging.py
index d6aeb64..1538be9 100644
--- a/pbr/packaging.py
+++ b/pbr/packaging.py
@@ -253,95 +253,101 @@ def write_git_changelog(git_dir=None, dest_dir=os.path.curdir,
     """Write a changelog based on the git changelog."""
     should_skip = get_boolean_option(option_dict, 'skip_changelog',
                                      'SKIP_WRITE_GIT_CHANGELOG')
-    if not should_skip:
-        new_changelog = os.path.join(dest_dir, 'ChangeLog')
-        # If there's already a ChangeLog and it's not writable, just use it
-        if (os.path.exists(new_changelog)
-                and not os.access(new_changelog, os.W_OK)):
-            return
-        log.info('[pbr] Writing ChangeLog')
-        if git_dir is None:
-            git_dir = _get_git_directory()
-        if git_dir:
-            log_cmd = ['log', '--oneline', '--decorate']
-            changelog = _run_git_command(log_cmd, git_dir)
-            first_line = True
-            with io.open(new_changelog, "w",
-                         encoding="utf-8") as changelog_file:
-                changelog_file.write("CHANGES\n=======\n\n")
-                for line in changelog.split('\n'):
-                    line_parts = line.split()
-                    if len(line_parts) < 2:
-                        continue
-                    # Tags are in a list contained in ()'s. If a commit
-                    # subject that is tagged happens to have ()'s in it
-                    # this will fail
-                    if line_parts[1].startswith('(') and ')' in line:
-                        msg = line.split(')')[1].strip()
-                    else:
-                        msg = " ".join(line_parts[1:])
-
-                    if "tag:" in line:
-                        tags = [
-                            tag.split(",")[0]
-                            for tag in line.split(")")[0].split("tag: ")[1:]]
-                        tag = _get_highest_tag(tags)
-
-                        underline = len(tag) * '-'
-                        if not first_line:
-                            changelog_file.write('\n')
-                        changelog_file.write(
-                            ("%(tag)s\n%(underline)s\n\n" %
-                             dict(tag=tag,
-                                  underline=underline)))
-
-                    if not msg.startswith("Merge "):
-                        if msg.endswith("."):
-                            msg = msg[:-1]
-                        changelog_file.write(
-                            ("* %(msg)s\n" % dict(msg=msg)))
-                    first_line = False
+    if should_skip:
+        return
+
+    new_changelog = os.path.join(dest_dir, 'ChangeLog')
+    # If there's already a ChangeLog and it's not writable, just use it
+    if (os.path.exists(new_changelog)
+            and not os.access(new_changelog, os.W_OK)):
+        return
+    log.info('[pbr] Writing ChangeLog')
+    if git_dir is None:
+        git_dir = _get_git_directory()
+    if not git_dir:
+        return
+
+    log_cmd = ['log', '--oneline', '--decorate']
+    changelog = _run_git_command(log_cmd, git_dir)
+    first_line = True
+    with io.open(new_changelog, "w",
+                 encoding="utf-8") as changelog_file:
+        changelog_file.write("CHANGES\n=======\n\n")
+        for line in changelog.split('\n'):
+            line_parts = line.split()
+            if len(line_parts) < 2:
+                continue
+            # Tags are in a list contained in ()'s. If a commit
+            # subject that is tagged happens to have ()'s in it
+            # this will fail
+            if line_parts[1].startswith('(') and ')' in line:
+                msg = line.split(')')[1].strip()
+            else:
+                msg = " ".join(line_parts[1:])
+
+            if "tag:" in line:
+                tags = [
+                    tag.split(",")[0]
+                    for tag in line.split(")")[0].split("tag: ")[1:]]
+                tag = _get_highest_tag(tags)
+
+                underline = len(tag) * '-'
+                if not first_line:
+                    changelog_file.write('\n')
+                changelog_file.write(
+                    ("%(tag)s\n%(underline)s\n\n" %
+                     dict(tag=tag,
+                          underline=underline)))
+
+            if not msg.startswith("Merge "):
+                if msg.endswith("."):
+                    msg = msg[:-1]
+                changelog_file.write(
+                    ("* %(msg)s\n" % dict(msg=msg)))
+            first_line = False
 
 
 def generate_authors(git_dir=None, dest_dir='.', option_dict=dict()):
     """Create AUTHORS file using git commits."""
     should_skip = get_boolean_option(option_dict, 'skip_authors',
                                      'SKIP_GENERATE_AUTHORS')
-    if not should_skip:
-        old_authors = os.path.join(dest_dir, 'AUTHORS.in')
-        new_authors = os.path.join(dest_dir, 'AUTHORS')
-        # If there's already an AUTHORS file and it's not writable, just use it
-        if (os.path.exists(new_authors)
-                and not os.access(new_authors, os.W_OK)):
-            return
-        log.info('[pbr] Generating AUTHORS')
-        ignore_emails = '(jenkins@review|infra@lists|jenkins@openstack)'
-        if git_dir is None:
-            git_dir = _get_git_directory()
-        if git_dir:
-            authors = []
-
-            # don't include jenkins email address in AUTHORS file
-            git_log_cmd = ['log', '--format=%aN <%aE>']
-            authors += _run_git_command(git_log_cmd, git_dir).split('\n')
-            authors = [a for a in authors if not re.search(ignore_emails, a)]
-
-            # get all co-authors from commit messages
-            co_authors_out = _run_git_command('log', git_dir)
-            co_authors = re.findall('Co-authored-by:.+', co_authors_out,
-                                    re.MULTILINE)
-            co_authors = [signed.split(":", 1)[1].strip()
-                          for signed in co_authors if signed]
-
-            authors += co_authors
-            authors = sorted(set(authors))
-
-            with open(new_authors, 'wb') as new_authors_fh:
-                if os.path.exists(old_authors):
-                    with open(old_authors, "rb") as old_authors_fh:
-                        new_authors_fh.write(old_authors_fh.read())
-                new_authors_fh.write(('\n'.join(authors) + '\n')
-                                     .encode('utf-8'))
+    if should_skip:
+        return
+
+    old_authors = os.path.join(dest_dir, 'AUTHORS.in')
+    new_authors = os.path.join(dest_dir, 'AUTHORS')
+    # If there's already an AUTHORS file and it's not writable, just use it
+    if (os.path.exists(new_authors)
+            and not os.access(new_authors, os.W_OK)):
+        return
+    log.info('[pbr] Generating AUTHORS')
+    ignore_emails = '(jenkins@review|infra@lists|jenkins@openstack)'
+    if git_dir is None:
+        git_dir = _get_git_directory()
+    if git_dir:
+        authors = []
+
+        # don't include jenkins email address in AUTHORS file
+        git_log_cmd = ['log', '--format=%aN <%aE>']
+        authors += _run_git_command(git_log_cmd, git_dir).split('\n')
+        authors = [a for a in authors if not re.search(ignore_emails, a)]
+
+        # get all co-authors from commit messages
+        co_authors_out = _run_git_command('log', git_dir)
+        co_authors = re.findall('Co-authored-by:.+', co_authors_out,
+                                re.MULTILINE)
+        co_authors = [signed.split(":", 1)[1].strip()
+                      for signed in co_authors if signed]
+
+        authors += co_authors
+        authors = sorted(set(authors))
+
+        with open(new_authors, 'wb') as new_authors_fh:
+            if os.path.exists(old_authors):
+                with open(old_authors, "rb") as old_authors_fh:
+                    new_authors_fh.write(old_authors_fh.read())
+            new_authors_fh.write(('\n'.join(authors) + '\n')
+                                 .encode('utf-8'))
 
 
 def _find_git_files(dirname='', git_dir=None):