i18n-pt_BR: synchronized with
00276525e2b7
help: Backed out changeset
e99facd2cd2a, description of file urls
This help entry didn't try to describe the 'localhost' notation. It described a
non-standard host-less notation where 'local' just was the first part of a
sample relative path. It describe "urls" with relative and absolute paths like:
file://file.txt
file:///tmp/file.txt
file://c:/tmp/file.txt
revset: follow(nosuchfile) should give an empty set (
issue3114)
subrepo: fix git status false positive (
issue3109)
It turns out there's a separate command to force git to look at file contents
if the stat has changed.
mdiff: replace wscleanup() regexps with C loops
On my system it reduces:
hg annotate -w mercurial/commands.py
from 36s to less than 8s, to be compared with 6.3s when run without whitespace
options.
mdiff: split lines in allblocks() only when necessary
These are only required to handle the --ignore-blank-lines case
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.
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.
mdiff: make diffblocks() return all blocks, matching and changed
Annotate uses matching blocks not changed ones.