diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py --- a/hgext/patchbomb.py +++ b/hgext/patchbomb.py @@ -384,7 +384,7 @@ def patchbomb(ui, repo, *revs, **opts): ui.write('\n') - parent = None + parent = opts.get('in_reply_to') or None sender_addr = email.Utils.parseaddr(sender)[1] sender = mail.addressencode(ui, sender, _charsets, opts.get('test')) @@ -458,6 +458,8 @@ emailopts = [ _('write messages to mbox file instead of sending them')), ('s', 'subject', '', _('subject of first message (intro or single patch)')), + ('', 'in-reply-to', '', + _('"message identifier to reply to"')), ('t', 'to', [], _('email addresses of recipients')), ] diff --git a/tests/test-patchbomb b/tests/test-patchbomb --- a/tests/test-patchbomb +++ b/tests/test-patchbomb @@ -117,3 +117,6 @@ echo "% test inline for multiple named/u hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i 0:1 | \ fixheaders +echo "% test inreplyto" +hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz tip | \ + fixheaders diff --git a/tests/test-patchbomb.out b/tests/test-patchbomb.out --- a/tests/test-patchbomb.out +++ b/tests/test-patchbomb.out @@ -837,3 +837,38 @@ diff -r 8580ff50825a -r 97d72e5f12c7 b +b --=== +% test inreplyto +This patch series consists of 1 patches. + + +Displaying [PATCH] Added tag two, two.diff for changeset ff2c9fa2018b ... +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [PATCH] Added tag two, two.diff for changeset ff2c9fa2018b +X-Mercurial-Node: 2c502b2db30e1ddd5e4ecabd68d9002f6c77a5a3 +Message-Id: <2c502b2db30e1ddd5e4e.60@ +In-Reply-To: baz +References: baz +Date: Thu, 01 Jan 1970 00:01:00 +0000 +From: quux +To: foo +Cc: bar + +# HG changeset patch +# User test +# Date 0 0 +# Node ID 2c502b2db30e1ddd5e4ecabd68d9002f6c77a5a3 +# Parent 91c0d1bdb4bc9cfd3b38a53a5ec53e9ae412a275 +Added tag two, two.diff for changeset ff2c9fa2018b + +diff -r 91c0d1bdb4bc -r 2c502b2db30e .hgtags +--- a/.hgtags Thu Jan 01 00:00:00 1970 +0000 ++++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 +@@ -2,3 +2,5 @@ + 8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo + 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one + 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one.patch ++ff2c9fa2018b15fa74b33363bda9527323e2a99f two ++ff2c9fa2018b15fa74b33363bda9527323e2a99f two.diff +