Mercurial > public > mercurial-scm > hg-stable
diff mercurial/help/config.txt @ 15528:a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
splitblock() was added to handle blocks returned by bdiff.blocks() which differ
only by blank lines but are not made only of blank lines. I do not know exactly
how it could happen but mdiff.blocks() threshold behaviour makes me think it
can if those blocks are made of very popular lines mixed with popular blank
lines. If it is proven to be wrong, the function can be dropped.
The first implementation made annotate share diff configuration entries. But it
looks like users will user -w/b for annotate but not for diff, on both the
command line and hgweb. Since the latter cannot use command line entries, we
introduce a new [annotate] section duplicating the diff whitespace options.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Fri, 18 Nov 2011 12:04:31 +0100 |
| parents | e174353e8cda |
| children | 6f2eee68f6a5 |
line wrap: on
line diff
--- a/mercurial/help/config.txt Sun Nov 20 19:14:36 2011 +0100 +++ b/mercurial/help/config.txt Fri Nov 18 12:04:31 2011 +0100 @@ -227,6 +227,24 @@ processed before shell aliases and will thus not be passed to aliases. + +``annotate`` +"""""""" + +Settings used when displaying file annotations. All values are +Booleans and default to False. See ``diff`` section for related +options for the diff command. + +``ignorews`` + Ignore white space when comparing lines. + +``ignorewsamount`` + Ignore changes in the amount of white space. + +``ignoreblanklines`` + Ignore changes whose lines are all blank. + + ``auth`` """""""" @@ -364,8 +382,9 @@ ``diff`` """""""" -Settings used when displaying diffs. Everything except for ``unified`` is a -Boolean and defaults to False. +Settings used when displaying diffs. Everything except for ``unified`` +is a Boolean and defaults to False. See ``annotate`` section for +related options for the annotate command. ``git`` Use git extended diff format.