1367606 - Clean up the Mercurial configs included with MozillaBuild

Status: RESOLVED FIXED

(Firefox Build System :: MozillaBuild, task)

Description

[Ryan VanderMeulen [:RyanVM]]

Due to some changes upstream, our configs need some updating. Might as well fix bug 1342829 as part of this too.

Comment 1

[Ryan VanderMeulen [:RyanVM]]

Attachment: initial attempt at cleanup

I'm not seeing any horribly odd behavior locally with this so far, but I'm also not entirely sure what I should be on the lookout for. The |pagermode = ansi| setting is still needed or things like |hg out| won't be properly colorized.

Comment 2

[Gregory Szorc [:gps]]

Comment on attachment 8871555 [details] [diff] [review]
initial attempt at cleanup

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

::: mercurial.ini
@@ +6,1 @@
>  progress =

Please also remove progress while you are here, as it is also in core and enabled by default now.

@@ -27,5 @@
>  [fsmonitor]
>  mode = off
>  
> -[pager]
> -pager = less.exe -mnFRSXQ

I think we'll still want to define pager.pager and use less.exe. This is because the default pager on Windows is "more." less.exe likely supports more color than more.com and has more features, so we should stick to less.exe.

Also, we /may/ need to specify the color mode still. There are still some upstream bugs related to that. But they should get fixed in the next release.

Comment 3

[Ryan VanderMeulen [:RyanVM]]

Attachment: cleanup mercurial configs

I did some color tweaks that make for a much nicer default experience too (such as avoiding blue on black text). Overall, I think everything's working as expected from local testing. As always, feedback welcome if there's any other changes you think would be worthwhile to include.

Comment 4

[Gregory Szorc [:gps]]

Comment on attachment 8874914 [details] [diff] [review]
cleanup mercurial configs

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

::: mercurial.ini
@@ +45,5 @@
>  merge.priority=-100
> +
> +[pager]
> +pager = less.exe -mnFRSXQ
> +quiet = True

pager.quiet was removed ~5 years ago. Please delete it.

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/mozilla-build/rev/c0865e73124d
Update the Mercurial config shipped with MozillaBuild. r=gps