1517643 - [bzexport] context lines have wrong override order

Status: RESOLVED FIXED

(Developer Services :: Mercurial: bzexport, enhancement)

Description

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

It looks like `[diff] context` is currently winning over the more-specific `[bzexport] unified` setting. Waldo is getting 3 lines of context when exporting patches despite having [bzexport] unified = 8.

Comment 1

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

Attachment: [bzexport] unified should win over [diff] context

The logic is weird. The 'context' setting is retrieved from 'unified'. But the ordering was indeed backwards. This appears to fix it.

I'm not sure whether this will fix Waldo's problem, since mq patch files are uploaded unmodified.

Comment 2

[Jeff Walden [:Waldo]]

Over in bug 1517674 I have tested this patch out to upload attachment 9034334 [details] [diff] [review], and it does the trick.  My .hgrc is *mostly* https://gist.github.com/jswalden/7d6a9c17fb0f9c48080c4496d291eb8d -- my real .hgrc has some bzapi stuffs in it that I removed here, natch -- and it has [diff] unified = 3 in it but also [bzexport] unified = 8 that appears to successfully override it.

(I suppose I ought have changed that to 9 or something, to verify the setting is being picked up and not the 8-fallback this patch establishes, but hey, I can't test-run everything.  :-) )

Comment 3

[Chris Manchester (limited bugmail, email directly)]

Comment on attachment 9034311 [details] [diff] [review]
[bzexport] unified should win over [diff] context

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

This looks like a straightforward change but it's pretty far outside my usual area to review. Connor are you willing to take a look?

Comment 4

[Connor Sheehan [:sheehan]]

Comment on attachment 9034311 [details] [diff] [review]
[bzexport] unified should win over [diff] context

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

LGTM.

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/895996b39668
[bzexport] unified should win over [diff] context