Mercurial > hg
changeset 21727:5f98ad8fb8d9
patchbomb: reorder header insertions to clarify code
This is done as its own change to make the changes to test-patchbomb.t
easier to review.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Sat, 07 Jun 2014 11:32:37 -0400 |
parents | fae032549ca2 |
children | 0f73ed629362 |
files | hgext/patchbomb.py tests/test-patchbomb.t |
diffstat | 2 files changed, 32 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/patchbomb.py Sat Jun 07 11:06:15 2014 -0400 +++ b/hgext/patchbomb.py Sat Jun 07 11:32:37 2014 -0400 @@ -515,6 +515,7 @@ m['Message-Id'] = genmsgid(m['X-Mercurial-Node']) if not firstpatch: firstpatch = m['Message-Id'] + m['X-Mercurial-Series-Id'] = firstpatch except TypeError: m['Message-Id'] = genmsgid('patchbomb') if parent: @@ -522,10 +523,6 @@ m['References'] = parent if not parent or 'X-Mercurial-Node' not in m: parent = m['Message-Id'] - # For 0 of N messages, we won't have seen a patch yet, so - # don't try and produce an X-Mercurial-Series-Id. - if firstpatch: - m['X-Mercurial-Series-Id'] = firstpatch m['User-Agent'] = 'Mercurial-patchbomb/%s' % util.version() m['Date'] = email.Utils.formatdate(start_time[0], localtime=True)
--- a/tests/test-patchbomb.t Sat Jun 07 11:06:15 2014 -0400 +++ b/tests/test-patchbomb.t Sat Jun 07 11:32:37 2014 -0400 @@ -103,9 +103,9 @@ X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 2 Message-Id: <8580ff50825a50c8f716.121@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.121@*> (glob) In-Reply-To: <patchbomb.120@*> (glob) References: <patchbomb.120@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.121@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:02:01 +0000 From: quux @@ -135,9 +135,9 @@ X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 2 Message-Id: <97d72e5f12c7e84f8506.122@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.121@*> (glob) In-Reply-To: <patchbomb.120@*> (glob) References: <patchbomb.120@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.121@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:02:02 +0000 From: quux @@ -624,9 +624,9 @@ X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 2 Message-Id: <8580ff50825a50c8f716.61@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux @@ -660,9 +660,9 @@ X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 2 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:02 +0000 From: quux @@ -819,9 +819,9 @@ X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 3 Message-Id: <8580ff50825a50c8f716.61@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux @@ -857,9 +857,9 @@ X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 3 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:02 +0000 From: quux @@ -895,9 +895,9 @@ X-Mercurial-Series-Index: 3 X-Mercurial-Series-Total: 3 Message-Id: <a2ea8fc83dd8b93cfd86.63@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:03 +0000 From: quux @@ -1151,9 +1151,9 @@ X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 3 Message-Id: <8580ff50825a50c8f716.61@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux @@ -1198,9 +1198,9 @@ X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 3 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:02 +0000 From: quux @@ -1245,9 +1245,9 @@ X-Mercurial-Series-Index: 3 X-Mercurial-Series-Total: 3 Message-Id: <a2ea8fc83dd8b93cfd86.63@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:03 +0000 From: quux @@ -1332,9 +1332,9 @@ X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 1 Message-Id: <ff2c9fa2018b15fa74b3.61@*> (glob) + X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux @@ -1386,9 +1386,9 @@ X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 1 Message-Id: <ff2c9fa2018b15fa74b3.61@*> (glob) + X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux @@ -1441,9 +1441,9 @@ X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 2 Message-Id: <8580ff50825a50c8f716.61@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux @@ -1473,9 +1473,9 @@ X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 2 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:02 +0000 From: quux @@ -1649,9 +1649,9 @@ X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 2 Message-Id: <8580ff50825a50c8f716.61@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux @@ -1687,9 +1687,9 @@ X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 2 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:02 +0000 From: quux @@ -1734,9 +1734,9 @@ X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 1 Message-Id: <7aead2484924c445ad8c.60@*> (glob) + X-Mercurial-Series-Id: <7aead2484924c445ad8c.60@*> (glob) In-Reply-To: <baz> References: <baz> - X-Mercurial-Series-Id: <7aead2484924c445ad8c.60@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux @@ -1777,9 +1777,9 @@ X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 2 Message-Id: <8580ff50825a50c8f716.60@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.60@*> (glob) In-Reply-To: <baz> References: <baz> - X-Mercurial-Series-Id: <8580ff50825a50c8f716.60@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux @@ -1809,9 +1809,9 @@ X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 2 Message-Id: <97d72e5f12c7e84f8506.61@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.60@*> (glob) In-Reply-To: <baz> References: <baz> - X-Mercurial-Series-Id: <8580ff50825a50c8f716.60@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux @@ -1867,9 +1867,9 @@ X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 2 Message-Id: <8580ff50825a50c8f716.61@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux @@ -1899,9 +1899,9 @@ X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 2 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:02 +0000 From: quux @@ -1994,9 +1994,9 @@ X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 2 Message-Id: <8580ff50825a50c8f716.61@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux @@ -2026,9 +2026,9 @@ X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 2 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:02 +0000 From: quux @@ -2120,9 +2120,9 @@ X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 2 Message-Id: <8580ff50825a50c8f716.61@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:01 +0000 From: quux @@ -2152,9 +2152,9 @@ X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 2 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob) + X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) In-Reply-To: <patchbomb.60@*> (glob) References: <patchbomb.60@*> (glob) - X-Mercurial-Series-Id: <8580ff50825a50c8f716.61@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Thu, 01 Jan 1970 00:01:02 +0000 From: quux @@ -2329,9 +2329,9 @@ X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 6 Message-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob) + X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob) In-Reply-To: <patchbomb.315532860@*> (glob) References: <patchbomb.315532860@*> (glob) - X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Tue, 01 Jan 1980 00:01:01 +0000 From: test @@ -2360,9 +2360,9 @@ X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 6 Message-Id: <909a00e13e9d78b575ae.315532862@*> (glob) + X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob) In-Reply-To: <patchbomb.315532860@*> (glob) References: <patchbomb.315532860@*> (glob) - X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Tue, 01 Jan 1980 00:01:02 +0000 From: test @@ -2398,9 +2398,9 @@ X-Mercurial-Series-Index: 3 X-Mercurial-Series-Total: 6 Message-Id: <a2ea8fc83dd8b93cfd86.315532863@*> (glob) + X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob) In-Reply-To: <patchbomb.315532860@*> (glob) References: <patchbomb.315532860@*> (glob) - X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Tue, 01 Jan 1980 00:01:03 +0000 From: test @@ -2445,9 +2445,9 @@ X-Mercurial-Series-Index: 4 X-Mercurial-Series-Total: 6 Message-Id: <240fb913fc1b7ff15ddb.315532864@*> (glob) + X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob) In-Reply-To: <patchbomb.315532860@*> (glob) References: <patchbomb.315532860@*> (glob) - X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Tue, 01 Jan 1980 00:01:04 +0000 From: test @@ -2476,9 +2476,9 @@ X-Mercurial-Series-Index: 5 X-Mercurial-Series-Total: 6 Message-Id: <5d5ef15dfe5e7bd3a4ee.315532865@*> (glob) + X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob) In-Reply-To: <patchbomb.315532860@*> (glob) References: <patchbomb.315532860@*> (glob) - X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Tue, 01 Jan 1980 00:01:05 +0000 From: test @@ -2508,9 +2508,9 @@ X-Mercurial-Series-Index: 6 X-Mercurial-Series-Total: 6 Message-Id: <2f9fa9b998c5fe3ac2bd.315532866@*> (glob) + X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob) In-Reply-To: <patchbomb.315532860@*> (glob) References: <patchbomb.315532860@*> (glob) - X-Mercurial-Series-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob) User-Agent: Mercurial-patchbomb/* (glob) Date: Tue, 01 Jan 1980 00:01:06 +0000 From: test