lp:~cjwatson/pmr

Author: Colin Watson
Author Date: 2016-10-07 10:05:17 UTC

Improve authorship of git merges

Rather than allowing all merge commits to appear to be authored by the
pmr operator, which produces unhelpful output in git log, show the merge
as being authored by the author of the most recent commit in the merged
branch.

Author: Colin Watson
Author Date: 2016-09-29 13:23:59 UTC

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.

Author: Colin Watson
Author Date: 2016-09-12 22:20:42 UTC

Produce nicer git commit messages

This avoids ugly "Merge commit '<hash>' into <merge-id>" messages, and
causes the commit_message field on merge proposals to mean something.
We now always create a merge commit, and construct a commit message that
includes the merge proposal ID, a shortened version of the repository
and path that match the titles of merge proposals in the Launchpad web
UI, and the commit_message field from the merge proposal. For example,
one might end up with:

  Merge #300000 from ~contributor/project:branch

  Rotate weasels instead of stoats

  Stoats object to being rotated, so rotate weasels instead. Unless
  otherwise specified, mustelid-rotation is through 180 degrees.