Merge pull request #126 from kellda/squash

Document `squash` and `squash-` commands

Author: pietroalbini

homu/html/index.html

@@ -66,6 +66,8 @@ <h3>Commands</h3>
                 <li><code>rollup</code>: Mark the PR as likely to merge without issue, short for <code>rollup=always</code></li>
                 <li><code>rollup-</code>: Unmark the PR as <code>rollup</code>.</li>
                 <li><code>rollup=maybe|always|iffy|never</code>: Mark the PR as "always", "maybe", "iffy", and "never" rollup-able.</li>
+                <li><code>squash</code>: Squash all commits into one just before performing the merge.</li>
+                <li><code>squash-</code>: Do not squash commits before merging.</li>
                 <li><code>retry</code>: Signal that the PR is not bad, and should be retried by buildbot.</li>
                 <li><code>try</code>: Request that the PR be tested by buildbot, without accepting it.</li>
                 <li><code>force</code>: Stop all the builds on the configured builders, and proceed to the next PR.</li>

homu/main.py

@@ -921,6 +921,10 @@ def create_merge(state, repo_cfg, branch, logger, git_cfg,
         state.title,
         state.body)
 
+    squash_msg = '{}\n\n{}'.format(
+        state.title,
+        state.body)
+
     desc = 'Merge conflict'
     comment = (
         'This pull request and the master branch diverged in a way that cannot'
@@ -1028,18 +1032,18 @@ def create_merge(state, repo_cfg, branch, logger, git_cfg,
                             'merge-base',
                             base_sha,
                             state.head_sha)).decode('ascii').strip()
-                    git_editor = os.environ['GIT_EDITOR']
-                    os.environ['GIT_EDITOR'] = "sed -i '2,/^$/s/^pick\b/s/'"
+                    utils.logged_call(git_cmd(
+                        'reset',
+                        '--soft',
+                        merge_base_sha))
                     utils.logged_call(git_cmd(
                         '-c',
                         'user.name=' + git_cfg['name'],
                         '-c',
                         'user.email=' + git_cfg['email'],
-                        'rebase',
-                        '-i',
-                        '--onto',
-                        merge_base_sha, base_sha))
-                    os.environ['GIT_EDITOR'] = git_editor
+                        'commit',
+                        '-m',
+                        squash_msg))
                 except subprocess.CalledProcessError:
                     desc = 'Squashing failed'
                     comment = ''