##// END OF EJS Templates
patchbomb: respect --in-reply-to for all mails if no intro message is sent...
Thomas Arendsen Hein -
r17859:d38d90ad stable
parent child Browse files
Show More
@@ -496,8 +496,6 b' def patchbomb(ui, repo, *revs, **opts):'
496 if not parent.endswith('>'):
496 if not parent.endswith('>'):
497 parent += '>'
497 parent += '>'
498
498
499 first = True
500
501 sender_addr = email.Utils.parseaddr(sender)[1]
499 sender_addr = email.Utils.parseaddr(sender)[1]
502 sender = mail.addressencode(ui, sender, _charsets, opts.get('test'))
500 sender = mail.addressencode(ui, sender, _charsets, opts.get('test'))
503 sendmail = None
501 sendmail = None
@@ -509,9 +507,8 b' def patchbomb(ui, repo, *revs, **opts):'
509 if parent:
507 if parent:
510 m['In-Reply-To'] = parent
508 m['In-Reply-To'] = parent
511 m['References'] = parent
509 m['References'] = parent
512 if first:
510 if not parent or 'X-Mercurial-Node' not in m:
513 parent = m['Message-Id']
511 parent = m['Message-Id']
514 first = False
515
512
516 m['User-Agent'] = 'Mercurial-patchbomb/%s' % util.version()
513 m['User-Agent'] = 'Mercurial-patchbomb/%s' % util.version()
517 m['Date'] = email.Utils.formatdate(start_time[0], localtime=True)
514 m['Date'] = email.Utils.formatdate(start_time[0], localtime=True)
@@ -1663,8 +1663,8 b' no intro message in non-interactive mode'
1663 Subject: [PATCH 2 of 2] b
1663 Subject: [PATCH 2 of 2] b
1664 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1664 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1665 Message-Id: <97d72e5f12c7e84f8506.61@*> (glob)
1665 Message-Id: <97d72e5f12c7e84f8506.61@*> (glob)
1666 In-Reply-To: <8580ff50825a50c8f716.60@*> (glob)
1666 In-Reply-To: <baz>
1667 References: <8580ff50825a50c8f716.60@*> (glob)
1667 References: <baz>
1668 User-Agent: Mercurial-patchbomb/* (glob)
1668 User-Agent: Mercurial-patchbomb/* (glob)
1669 Date: Thu, 01 Jan 1970 00:01:01 +0000
1669 Date: Thu, 01 Jan 1970 00:01:01 +0000
1670 From: quux
1670 From: quux
General Comments 0
You need to be logged in to leave comments. Login now