914269 - Imported patches have redundant header lines

Status: RESOLVED FIXED

(Developer Services :: Mercurial: qimportbz, defect)

Description

[Gregory Szorc [:gps]]

I just ran |hg qimport bz://891766| and the resulting raw file in my mq directory has redundant patch header lines:

# vim: se ft=diff :
# HG changeset patch
# User Askeing Yen <[e-mail]>
# Date 1378694797 -28800
Bug 891766 - Add gecko's git commit info in B2G build. r=?

# HG changeset patch
# User Askeing Yen <[e-mail]>
# Date 1378694797 -28800
# Node ID b98ce9700d948d465f5a7a38a628bc3733fa4549
# Parent  c7cc85e13f7ab547bcf062985d5ddb2eb09f2e6a
Bug 891766 - Add gecko's git commit info in B2G build. r=?

diff --git a/toolkit/content/buildconfig.html b/toolkit/content/buildconfig.html
--- a/toolkit/content/buildconfig.html
+++ b/toolkit/content/buildconfig.html
<actual diff>

I'm running Mercurial 2.7.0.

The raw patch in the referenced bug seems fine and |hg qimport -n foo https://bug891766.bugzilla.mozilla.org/attachment.cgi?id=801374| did the right thing, so this smells like a qimportbz bug.

Comment 1

[Ed Morley [:emorley]]

Attachment: Patch v1

Strip the original header from imported patches, to avoid duplication when we add the cleaned up version later on. Borrows the regexp from:
http://selenic.com/hg/file/79e5de2bfa8c/mercurial/patch.py#l163

Comment 2

[Steve Fink [:sfink] [:s:]]

Comment on attachment 801936 [details] [diff] [review]
Patch v1

Review of attachment 801936 [details] [diff] [review]:
-----------------------------------------------------------------

Ugh, another magic regex copy/paste. But once again, the original isn't usefully accessible.

I haven't actually tried this, but the approach seems sound given where you got the regex from. Thanks!

Comment 3

[Ed Morley [:emorley]]

Cheers :-)

https://hg.mozilla.org/users/robarnold_cmu.edu/qimportbz/rev/e1be488e64f4