[MERGE/RFC] Merge directive support

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:
> John Arbash Meinel has voted +1 (conditional).
> Status is now: Conditionally approved

Thanks for your comments.  I've followed virtually all of them and
submitted.

> One problem with gpg signing a patch, is that it makes the '-' lines a
> little ugly. Specifically:
> - -def format_highres_date(t, offset=0):
> - -    """Format a date, such that it includes higher precision in the
> - -    seconds field.
> 
> This doesn't have a whole lot to do with your patch, but it is probably
> something that we want to teach BundleBuggy about.

For list use, I don't expect people to be signing their submissions.  In
fact, it would make more sense for someone *else* to sign them.

For BB, you're right, and BB already has functionality for stripping a
GPG signature.  I just need to apply that to patch display, and get it
to handle leading hyphens.

> Also calling them "to_patch_lines" and "read_patch_stanza" doesn't quite
> fit. These really aren't "patch lines". Maybe "to_width_limited" or
> something like that.

I've left them as "patch_lines", because this RIO variant is
specifically designed to be included in patches, which are subsequently
emailed.  I suppose a more descriptive name would be
"to_patch_mail_lines", but it's kinda long and not much clearer.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF8eXn0F+nu1YWqI0RAiu5AJ9pVLFlbWUb/EmHTskETqcHrrqQBQCfb/6O
iCvMMKZyhkPBy7nlsVfEL2I=
=J883
-----END PGP SIGNATURE-----