Fri, 18 Nov 2011 14:16:47 +0100 mdiff: split lines in allblocks() only when necessary
Patrick Mezard <pmezard@gmail.com> [Fri, 18 Nov 2011 14:16:47 +0100] rev 15529
mdiff: split lines in allblocks() only when necessary These are only required to handle the --ignore-blank-lines case
Fri, 18 Nov 2011 12:04:31 +0100 annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com> [Fri, 18 Nov 2011 12:04:31 +0100] rev 15528
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.
Sun, 20 Nov 2011 19:14:36 +0100 setup: fix py2exe generation broken by c3a6ec304055 (issue3116)
Pascal Quantin <pascal.quantin@gmail.com> [Sun, 20 Nov 2011 19:14:36 +0100] rev 15527
setup: fix py2exe generation broken by c3a6ec304055 (issue3116) Py2exe is patching default distutils Distribution class. This patch ensures that the right one is taken when calling hgdist class.
Fri, 18 Nov 2011 12:01:04 +0100 mdiff: make diffblocks() return all blocks, matching and changed
Patrick Mezard <pmezard@gmail.com> [Fri, 18 Nov 2011 12:01:04 +0100] rev 15526
mdiff: make diffblocks() return all blocks, matching and changed Annotate uses matching blocks not changed ones.
Fri, 18 Nov 2011 11:53:38 +0100 mdiff: extract blocks whitespace normalization in diffblocks()
Patrick Mezard <pmezard@gmail.com> [Fri, 18 Nov 2011 11:53:38 +0100] rev 15525
mdiff: extract blocks whitespace normalization in diffblocks() We want to reuse it in annotate for whitespace normalization.
Thu, 17 Nov 2011 23:02:18 -0600 merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 17 Nov 2011 23:02:18 -0600] rev 15524
merge with crew
Thu, 17 Nov 2011 23:01:58 -0600 setup: backout 8504699d1aa6
Matt Mackall <mpm@selenic.com> [Thu, 17 Nov 2011 23:01:58 -0600] rev 15523
setup: backout 8504699d1aa6 Change wasn't compatible with Python 2.x
Wed, 16 Nov 2011 03:45:14 +0100 tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Nov 2011 03:45:14 +0100] rev 15522
tests: don't use stdout redirection for test data Stdout redirection is not binary safe everywhere - for example not on windows with msys.
Wed, 16 Nov 2011 03:45:14 +0100 tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Nov 2011 03:45:14 +0100] rev 15521
tests: hide 'No such file or directory' messages Windows will use a different and localized message.
Wed, 16 Nov 2011 03:45:14 +0100 tests: add missing '(glob)'s to match '\' in paths in test output on windows
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Nov 2011 03:45:14 +0100] rev 15520
tests: add missing '(glob)'s to match '\' in paths in test output on windows
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip