Augie Fackler <augie@google.com> [Wed, 11 Jul 2018 13:41:47 -0400] rev 38654
py3: whitelist 3 more passing tests caught with the ratchet
Differential Revision: https://phab.mercurial-scm.org/D3921
Yuya Nishihara <yuya@tcha.org> [Tue, 10 Jul 2018 22:55:30 +0900] rev 38653
grep: hide cryptic revision number by default
I believe nobody would want to see the "2147483647:" prefix while grepping
working directory files.
The wdir revision is still visible if "-r wdir()" is specified since a revset
may point to more than one revisions, and it seems confusing to change the
visibility dynamically by the number of the matched revisions.
Differential Revision: https://phab.mercurial-scm.org/D3920
Yuya Nishihara <yuya@tcha.org> [Wed, 11 Jul 2018 22:06:04 +0900] rev 38652
grep: restore pre-9ef10437bb88 behavior, enable wdir search by tweakdefaults
Unfortunately, python-hglib relies on the original grep behavior and is
documented as such. Even though we agreed to introduce the BC, we shouldn't
break existing libraries.
So this patch flips the default again and move the new default to
ui.tweakdefaults. We could instead use HGPLAIN to turn this flag off, but
that would be rather confusing as the old/new behaviors are quite different.
Differential Revision: https://phab.mercurial-scm.org/D3919
Yuya Nishihara <yuya@tcha.org> [Wed, 11 Jul 2018 21:51:47 +0900] rev 38651
grep: add config knob to enable/disable the default wdir search
This allows us to conditionally enable the new behavior to unbreak
python-hglib. See the next patch.
The config option is undocumented since the --all-files is still experimental
and isn't fully implemented. It can be moved to [experimental] if that's
preferred.
Differential Revision: https://phab.mercurial-scm.org/D3918
Yuya Nishihara <yuya@tcha.org> [Wed, 11 Jul 2018 21:35:31 +0900] rev 38650
grep: search working directory files by default if --all-files is specified
The default was -rtip:0 before, but "--all-files -rtip:0" would be the most
useless combination, and it isn't supported yet. Let's change the default to
something useful.
This isn't flagged as BC since --all-files isn't released.
Differential Revision: https://phab.mercurial-scm.org/D3917
Yuya Nishihara <yuya@tcha.org> [Wed, 11 Jul 2018 21:23:18 +0900] rev 38649
grep: reject --diff --all-files
This combination doesn't make any sense since --diff is the flag to search
change history, whereas --all-files is to include unmodified contents.
Differential Revision: https://phab.mercurial-scm.org/D3916
Yuya Nishihara <yuya@tcha.org> [Wed, 11 Jul 2018 21:15:52 +0900] rev 38648
grep: rename --allfiles to --all-files
This matches the config name to be added.
Note that we don't have to keep the old flag since it isn't released yet.
Differential Revision: https://phab.mercurial-scm.org/D3915
Boris Feld <boris.feld@octobus.net> [Wed, 11 Jul 2018 13:48:44 +0200] rev 38647
debugdeltachain: protect against 0 readsize
If you don't read any data, read density should be 1.
Paul Morelle <paul.morelle@octobus.net> [Thu, 21 Jun 2018 18:19:57 +0200] rev 38646
debugdeltachain: avoid division by zero when a chain is empty
The two ratios chainratio and extraratio are computed using dividers
that may be zero when the file is empty.
As the denominators are integers, the limit of the ratio "just before zero" is
the numerator value itself.
If the numerator itself is zero, the ratio value is still meaningful: in both
cases, a "good" value is a low ratio, and a size of zero is the optimal case.
Danny Hooper <hooper@google.com> [Mon, 09 Jul 2018 15:33:49 -0700] rev 38645
tests: prevent conflict markers in test case from triggering warnings
Broadly, having lines that begin with several '<' tends to trigger tools that
try to warn you about unresolved conflicts. It will save some headaches to
tweak this string literal to avoid that.
Differential Revision: https://phab.mercurial-scm.org/D3897
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 12:20:57 +0200] rev 38644
revlog: enforce chunk slicing down to a certain size
Limit maximum chunk size to 4x final size when reading a revision from a
revlog. We only apply this logic when the target size is known from the
revlog.
Ideally, revlog's delta chain would be written in a way that does not trigger
this extra slicing often. However, having this second guarantee that we won't
read unexpectedly large amounts of memory in all cases is important for the
future. Future delta chain building algorithms might have good reason to
create delta chain with such characteristics.
Including this code in core as soon as possible will make Mercurial 4.7
forward-compatible with such improvement.
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 11:57:33 +0200] rev 38643
revlog: postprocess chunk to slice them down to a certain size
After the density slicing is done, we enforce a maximum chunk size to avoid
memory consumption issue.
Boris Feld <boris.feld@octobus.net> [Wed, 11 Jul 2018 00:35:01 -0700] rev 38642
revlog: add function to slice chunk down to a given size
It is possible to encounter situations where the slicing based on density did
not achieve chunk smaller than the 4*textlength limit. To avoid extra memory
consumption in those cases, we need to be able to break down chunk to a given
size. Actual caller comes in the next changesets.
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 11:53:36 +0200] rev 38641
revlog: extract density based slicing into its own function
We are going to introduce another slicing step. We start by extracting the
existing one into its own function.
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 10:34:33 +0200] rev 38640
revlog: document and test _slicechunk
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 10:18:46 +0200] rev 38639
revlog: add a doctest for _segmentspan
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 10:04:44 +0200] rev 38638
revlog: add a doctest to _trimchunk
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 10:04:31 +0200] rev 38637
revlog: introduce a tiny mock of a revlog class
This will be used in various function doctest added in the next changesets.
The class seems small enough to live in the module directly.
Paul Morelle <paul.morelle@octobus.net> [Thu, 17 May 2018 15:10:36 +0200] rev 38636
revlog: _segmentspan computes the byte span of a segment
Refactor out this code to be used somewhere else in a next changeset
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 15:17:05 -0700] rev 38635
revlog: early return in _slicechunk when span is already small enough
If the full span is smaller than the minimum gap size we'll consider, we know we
won't do any slicing and we can return earlier.
Paul Morelle <paul.morelle@octobus.net> [Tue, 19 Jun 2018 15:03:58 +0200] rev 38634
revlog: early return in _slicechunk when density is already good
We don't need to do anything if we know we won't enter the second while loop.
Save the overhead of the first loop by returning earlier.
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 02:33:43 +0200] rev 38633
sparse-read: discard gap below 65K only
Testing on actual data shows that 65K is more efficient in both time and memory
than 256K.
Paul Morelle <paul.morelle@octobus.net> [Fri, 22 Jun 2018 17:12:24 +0200] rev 38632
sparse-read: target density of 50% instead of 25%
The target density value is wrong. The default target chain span is
4*text-length. However, the target max chain payload is 2*text-length. So
default target density should be 50% (2/4) not 25% (1/4).
Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com> [Fri, 06 Jul 2018 00:39:21 +0530] rev 38631
grep: change default behaviour to search working directory files (BC)
With this patch, grep searches on the working directory by default
and looks for all files tracked by the working directory and greps on them.
### OLD BEHAVIOUR
$ hg init a
$ cd a
$ echo "some text">>file1
$ hg add file1
$ hg commit -m "adds file1"
$ hg mv file1 file2
$ hg grep "some"
`file2:1:some text`
`file1:0:some text`
This behaviour is undesirable since file1 is not in the current history and was
renamed as file2, so the second result was redundant and confusing.
### NEW BEHAVIOUR
$ hg init a
$ cd a
$ echo "some text">>file1
$ hg add file1
$ hg commit -m "adds file1"
$ hg mv file1 file2
$ hg grep "some"
`file2:2147483647:some text`
Differential Revision: https://phab.mercurial-scm.org/D3826
Sune Foldager <cryo@cyanite.org> [Tue, 10 Jul 2018 13:18:34 +0200] rev 38630
patch: don't separate \r and \n when colorizing diff output
When displaying diffs, \r at the end of a line is treated as trailing
whitespace. This causes an ANSI escape code to be inserted between \r and \n.
Some programs, such as less since version 530 (maybe earlier, but at least not
version 487) displays ^M when it encounters a lone \r. This causes a lot of
noise in diff output on Windows, where \r\n is used to terminate lines.
We avoid that by treating both \n and \r\n as end of line when considering
trailing whitespace.
Matt Harbison <matt_harbison@yahoo.com> [Sat, 07 Jul 2018 23:38:06 -0400] rev 38629
hook: add support for disabling the shell to native command translation
I think having it on by default is the right thing to do, but this is an escape
hatch if someone has a command that shouldn't be mangled. The inspiration is
the priority prefix. The translation does nothing on non Windows platforms, so
the default value is selected to avoid printing a useless note by default.
Matt Harbison <matt_harbison@yahoo.com> [Sat, 07 Jul 2018 23:47:49 -0400] rev 38628
hook: narrow the 'priority' prefix check to align with the documentation
A prefix like 'priorityfoo' is meaningless, but `hg help config.hooks` calls out
the dot.
Matt Harbison <matt_harbison@yahoo.com> [Sat, 07 Jul 2018 22:13:56 -0400] rev 38627
windows: don't consider '$$' to be an escaped '$' when translating to cmd.exe
This functionality was inherited from `os.path.expandvars()`. But the point of
adding this translating code is to be able to write a portable hook, and bash
wouldn't replace '$$' with '$'. Escaping with '\' works, and is portable.