I'd like to set the default context for diff to something greater than 3, such that it applies to all commands involving diffs (e.g., export, qrefresh). At first glance at the source, it would look like I could do this by adding the following to my ~/.hgrc : [diff] unified = 8 however, this produces the error message: $ hg export tip abort: Error in configuration section [diff] parameter 'unified': Not a boolean: 8 I can, in fact, set it to 0 or 1 to get 0 or 1 lines of context, but I can't set it to any other value. This is probably related to the nested get function in patch.diffopts calling ui.configbool for all the options.
I think you can do this by adding -U8 to your ~/.hgrc's [default] section. See also issue654.
Okay, so I spoke too soon. While my workaround below might work, this should be fixed (and get some testcases). I'm currently discussing a fix in IRC with pmezard.
I've add this to TipsAndTricks on the wiki
Revert to chatting. Tips & tricks don't actually fix the problem...
djc: Yes. It wasn't my intent to mark this as resolved. I could swear I haven't touched the status field.... Whatever. I totally agree that my addition to TipsAndTricks does not resolve this issue here. That's why I specifically wrote on TipsAndTricks that -U8 *only* affects hg diff: http://www.selenic.com/mercurial/wiki/index.cgi/TipsAndTricks?action=diff&rev2=121&rev1=120
There are 2 problems here: - cmdtable default value for --unified always override diff.unified - diff.unified is not correctly parsed - there are no tests for this I will take a look at it later today
Fixed in crew-stable and crew by 65029a3aafc2. Thanks !
In main, resolving.
--- Bug imported by bugzilla@serpentine.com 2012-05-12 08:49 EDT --- This bug was previously known as _bug_ 1076 at http://mercurial.selenic.com/bts/issue1076