Merge ~cjwatson/pmr:better-git-commit-messages-2 into ~thomir-deactivatedaccount/pmr:master

[Colin Watson]

Refine git commit messages further

This moves the commit message provided by the user to the start, which
means it will show up more prominently in cgit and the like. The extra
information added by pmr is still present in git-idiomatic key/value
pairs at the end, and it'll be easier to extend if we want to add other
things there later.

Setting a commit message is now required.

Moves the commit message provided by the user to the start, which means it will show up more prominently in cgit and the like. The extra information added by pmr is still present in git-idiomatic key/value pairs at the end, and it'll be easier to extend if we want to add other things there later.

Setting a commit message is now required.

58d1ef6... by Shawn Wang on 2016-11-07

add one-shot option

1061013... by Shawn Wang on 2016-11-07

move one_shot option into merge_mergable_on_project

d133b51... by Shawn Wang on 2016-11-08

a few style tweaks.

21982ef... by Shawn Wang on 2016-11-08

Merge #310165 from ~shawn111/pmr:one-shot

Unmerged commits

c52ee7d... by Colin Watson on 2016-09-29

Refine git commit messages further

This moves the commit message provided by the user to the start, which
means it will show up more prominently in cgit and the like. The extra
information added by pmr is still present in git-idiomatic key/value
pairs at the end, and it'll be easier to extend if we want to add other
things there later.

21982ef... by Shawn Wang on 2016-11-08

Merge #310165 from ~shawn111/pmr:one-shot

d133b51... by Shawn Wang on 2016-11-08

a few style tweaks.

1061013... by Shawn Wang on 2016-11-07

move one_shot option into merge_mergable_on_project

58d1ef6... by Shawn Wang on 2016-11-07

add one-shot option

diff --git a/process-merge-requests b/process-merge-requests
index 02b59a6..69c1d04 100755
--- a/process-merge-requests
+++ b/process-merge-requests
@@ -165,9 +165,17 @@ def merge_git_proposal(branch_merge_proposal):
     target_url = get_rw_git_url(branch_merge_proposal.target_git_repository)
     target_path = branch_merge_proposal.target_git_path
     target_branch = target_path.split('/')[-1]
-    commit_message = 'Merge #{0} from {1}'.format(merge_id, source_identity)
-    if branch_merge_proposal.commit_message is not None:
-        commit_message += '\n\n' + branch_merge_proposal.commit_message
+    if branch_merge_proposal.commit_message is None:
+        branch_merge_proposal.createComment(
+            subject='Commit message not set', vote='Needs Fixing',
+            content='You must set a commit message.')
+        branch_merge_proposal.setStatus(
+            status='Needs review', revid=reviewed_revid)
+        _logger.error("Commit message not set")
+        return
+    commit_message = '{0}\n\nBranch: {1}\nMerge-Proposal: {2}'.format(
+        branch_merge_proposal.commit_message.rstrip('\n'),
+        source_identity, merge_id)
     _logger.info(_("Setting up git merge"))
     _logger.info(_(" - source: %s:%s"), source_url, source_path)
     _logger.info(_("   revision: %s"), reviewed_revid)
@@ -258,7 +266,7 @@ def merge_bzr_proposal(branch_merge_proposal):
     _logger.info(_("Bzr merge completed"))
 
 
-def merge_mergable_on_project(project):
+def merge_mergable_on_project(project, one_shot=False):
     """Merge all approved merge requests on a given project."""
     _logger.debug("Inspecting merge requests on project: %s", project.web_link)
     num_seen = 0
@@ -278,6 +286,9 @@ def merge_mergable_on_project(project):
         else:
             assert branch_merge_proposal.target_git_repository_link is None
             merge_bzr_proposal(branch_merge_proposal)
+        if one_shot:
+            _logger.info(_("Only landing one request in one-shot mode."))
+            return
     if num_seen == 0:
         _logger.debug(_("There are no merge proposals present at this time"))
 
@@ -310,19 +321,35 @@ def main():
     parser.add_argument(
         'project_list', metavar=_('PROJECT'), nargs="+",
         help=_("name of the launchpad project to process"))
+    parser.add_argument(
+        "--one-shot", action='store_true', default=False,
+        help=_("Only check for approved merge requests once, "
+               "and land at most one of them."))
     ns = parser.parse_args()
     _logger.info(_("Logging into launchpad.net"))
     lp = Launchpad.login_with('process-merge-requests', ns.lp_api_url)
+
+    projects = []
+    for project_name in ns.project_list:
+        try:
+            project = lp.projects[project_name]
+        except KeyError:
+            raise parser.error(
+                "No such project: %s" % project_name)
+        projects.append(project)
+
+    if ns.one_shot:
+        if len(ns.project_list) > 1:
+            raise parser.error(
+                "The --one-shot option may only be used with a single project.")
+        merge_mergable_on_project(projects[0], one_shot=True)
+        return
+
     _logger.info(_("Checking for new things to land every minute..."))
     try:
         while True:
-            for project_name in ns.project_list:
-                try:
-                    project = lp.projects[project_name]
-                except KeyError:
-                    _logger.error(_("No such project: %s"), project_name)
-                else:
-                    merge_mergable_on_project(project)
+            for project in projects:
+                merge_mergable_on_project(project)
             time.sleep(60)
     except KeyboardInterrupt:
         pass