Mercurial > hg
changeset 1605:428e0a9c9968
merge with mainline
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Wed, 28 Dec 2005 07:22:26 -0800 |
| parents | da3f1121721b (diff) fb4149eebdd4 (current diff) |
| children | ba625c8083d8 |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/patchbomb Wed Dec 28 00:27:05 2005 -0600 +++ b/contrib/patchbomb Wed Dec 28 07:22:26 2005 -0800 @@ -128,6 +128,10 @@ # 'Patch subject is complete summary.') #body += '\n\n\n' + if opts['plain']: + while patch and patch[0].startswith('# '): patch.pop(0) + if patch: patch.pop(0) + while patch and not patch[0].strip(): patch.pop(0) if opts['diffstat']: body += cdiffstat('\n'.join(desc), patch) + '\n\n' body += '\n'.join(patch) @@ -159,6 +163,7 @@ self.lines = [] commands.export(ui, repo, *args, **{'output': exportee(patches), + 'switch_parent': False, 'text': None}) jumbo = [] @@ -251,6 +256,7 @@ optspec = [('c', 'cc', [], 'email addresses of copy recipients'), ('d', 'diffstat', None, 'add diffstat output to messages'), ('f', 'from', '', 'email address of sender'), + ('', 'plain', None, 'omit hg patch header'), ('n', 'test', None, 'print messages that would be sent'), ('s', 'subject', '', 'subject of introductory message'), ('t', 'to', [], 'email addresses of recipients')]