Merge directives: current state

[John Arbash Meinel]

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

Aaron Bentley wrote:
> Hi all,
> 
> Just thought I'd mention that I've been working on merge directives, and
> made fair progress.

Its looking pretty good.

> 
> I've attached an example merge directive that contains a patch.  They
> can also contain bundles (in which case, they don't need a
> public_location), or no patch.
> 
> The top comment area is patch/email-armoured RIO format.  It's 76
> characters wide, and preserves \r and \n.  Next, I'll deal with
> trailing-space munging, but that's the last thing I have in mind.

Interesting. Just FYI the default in Mozilla clients is 72 chars. (Which
is why you see everything wrapped below). I don't strictly care about
what wrapping we use. But if we are going to wrap maybe something shorter?

Also, do you wrap all lines of content, or just the header?

Oh, and what happens if you have a string that ends in '\'. I don't see
how any of the strings right now would have it. But hypothetically do
you handle:

# entry: foo\

Where "foo\" is the actual value?

> 
> Some of the field names will be changing.  I need to add a header.  And
> the commandline is really embryonic at the moment.  I'm planning on
> handling signing at the command level.
> 
> But still, it doesn't seem too far from serviceable.
> 
> Aaron

- ------------------------------------------------------------------------

v- In your comments you mentioned including the list of gpg signatures
as part of the message header. So you need to somehow know what
signatures will be used, right?

# revision_id: aaron.bentley at utoronto.ca-20070301060310-0pt01rqke20k7ynr
# submit_location: http://panoramicfeedback.com/opensource/bzr/repo/merged\
# irective/
# testament_sha1: 91e86bbd2921c0bff7fcb936c90cc0040b4fcf21
# timestamp: Thu 2007-03-01 01:59:22.868068933 -0500
# public_location: http://code.aaronbentley.com/bzr/bzrrepo/mergedirective\
# /
#


For my personal aesthetics, it would be nicer if the wrapped lines were
indented. So that rather than:

# submit_location: http://panoramic\
# feedback.com/opensource/bzr/repo/\
# mergedirective/

You would get
# submit_location: http://panoramic\
#     feedback.com/opensource/bzr/re\
#     po/mergedirective/


I would recommend switching to a millisecond timestamp, rather than the
full 9 decimal (nanosecond) timestamp. I don't know what timestamp this
is (I assume it is new). But you can do:

timestamp = round(timestamp, 3)

Just some thoughts. Obviously you can take or leave what you want out of it.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF5uZlJdeBCYSNAAMRAlWGAKDTNKbFtCJTIJj0rnIy9SSn8GEfwQCgwYYT
RfSCbyn+R4q01eD0MD8Q/wI=
=WlJy
-----END PGP SIGNATURE-----