Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 24 Feb 2019 19:55:20 +0100] rev 41810
test: generate the `test-sparse-revlog` artifact when slow-test is allowed
The `test-sparse-revlog.t` logic requires a large bundle to be generated. This
bundle can be reused from one run to the next but its initial generation is
slow. With this patch, if the bundle is missing and slow tests are permitted,
the bundle will be generated during the test run.
This should ensure that CI run this test.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 24 Feb 2019 19:56:23 +0100] rev 41809
runtest: also update slow test timeout during `#if` clauses
For a `#if slow` test to be useful, we need the test timeout to be increased.
Without this, the slow section would likely be killed before it finish.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 24 Feb 2019 19:56:08 +0100] rev 41808
runtest: move slow timeout process earlier in the `_hghave` method
Before this changesets, early returns might prevent this logic to apply. It
seem safer to run it sooner.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 24 Feb 2019 19:56:34 +0100] rev 41807
runtest: extract the logic that update timeout for slow tests
We want to use the "slow" test logic not only for "#require" clauses but also in
"#if" clauses. For this to be useful we need the logic to bump the timeout in at
least two spots. The first step it to factor it out.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 24 Feb 2019 19:56:40 +0100] rev 41806
tests: increase timeout for slow test
Test case `test-sparse-revlog.t` need some artifact (a bundle) build before it
can run. The artifact is expensive to build, but can be reused from one run to
the other. We are about to update that test to make the artifact building
automatic if `--allow-slow-tests` is passed. However, we need a bump the
timeout a bit to make sure the artifact building as time to finish.
We could maybe teach run-tests.py how to directly handle such artifacts.
However since there is only one of them for now, this seems premature.
There are also some room to speed up the bundle creation for
test-sparse-revlog.t
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 25 Feb 2019 18:51:08 -0800] rev 41805
merge with stable
Boris Feld <boris.feld@octobus.net> [Wed, 02 Jan 2019 03:07:52 +0100] rev 41804
rewriting: add an option for rewrite commands to use the archived phase
Using the archived phase for cleanup provide the same effect than stripping,
but in a faster, append-only way.
We keep the feature experimental for now until it gets a bit more testing.
Boris Feld <boris.feld@octobus.net> [Tue, 16 Oct 2018 15:48:00 +0200] rev 41803
strip: introduce a soft strip option
This is the first user-accessible way to use the archived phase introduced in
4.8. This implements a feature discussed during the Stockholm sprint, using
the archived phase for hiding changesets.
The archived phase behaves exactly as stripping: changesets are no longer
visible, but pulling/unbundling them will make then reappear. The only notable
difference is that unlike hard stripping, soft stripping does not affect
obsmarkers.
The next changeset will make use of the archived phase for history rewriting
command. However, having a way to manually trigger the feature first seems a
necessary step before exposing users to this phase; there is a way to
un-archived changesets (unbundling), so there must be a way to archive them
again.
Adding a flag to strip is a good way to provide access to the feature without
taking a too big risk on the final UI we want. The flag is experimental so it
won't be exposed by default.
Using the archived phase is faster and less traumatic for the repository than
actually stripping changesets.
Pulkit Goyal <pulkit@yandex-team.ru> [Mon, 25 Feb 2019 16:49:01 +0300] rev 41802
branchcache: move loading of branch names and nodes into it's own function
This will help me in implementing lazy loading of the branchcache in upcoming
patches.
Differential Revision: https://phab.mercurial-scm.org/D6023
mitchell plamann <mplamann@janestreet.com> [Wed, 20 Feb 2019 15:02:59 -0500] rev 41801
bundle2: don't send "shared" requirement when cloning from a share
Differential Revision: https://phab.mercurial-scm.org/D5985
mitchell plamann <mplamann@janestreet.com> [Wed, 20 Feb 2019 14:57:00 -0500] rev 41800
tests: demonstrate failure when cloning from a share via bundle2
Differential Revision: https://phab.mercurial-scm.org/D5984
Navaneeth Suresh <navaneeths1998@gmail.com> [Fri, 22 Feb 2019 00:54:06 +0530] rev 41799
mq: disable qrecord during histedit (issue5981)
qrecord during histedit may lead to deadlock-like situations. qpop will throw
an error on called during histedit even after qrecord-ing those changes. This
patch makes qrecord to abort on histedit.
Differential Revision: https://phab.mercurial-scm.org/D5997
Martin von Zweigbergk <martinvonz@google.com> [Wed, 20 Feb 2019 21:57:39 -0800] rev 41798
committablectx: move status-related methods closer together
The modified()/added()/removed()/deleted() clearly belong very close
to status(). I separated them in committablectx by the new
p[12]copies() methods. This brings the close again. Sorry about the
churn.
Differential Revision: https://phab.mercurial-scm.org/D5996
Augie Fackler <augie@google.com> [Thu, 21 Feb 2019 23:07:54 -0500] rev 41797
tests: add test for hg-test-mode emacs code
This is just coverage for the compilation-mode support, but that was
enough of a hassle that I wanted to have it covered somehow. Test
methodology is _extremely_ cargo-culted from the test for
compilation-mode in emacs, so I still have no idea what I'm doing.
Differential Revision: https://phab.mercurial-scm.org/D6003
Augie Fackler <augie@google.com> [Thu, 21 Feb 2019 23:06:18 -0500] rev 41796
hghave: add check for GNU emacs
Differential Revision: https://phab.mercurial-scm.org/D6002
Augie Fackler <augie@google.com> [Thu, 21 Feb 2019 20:12:39 -0500] rev 41795
contrib: also linkify tracebacks in compilation output when using hg-test-mode
Differential Revision: https://phab.mercurial-scm.org/D6001
Augie Fackler <augie@google.com> [Thu, 21 Feb 2019 19:59:00 -0500] rev 41794
contrib: add compilation-mode linking for our test output
These regular expressions will cause compilation-mode buffers in emacs
to link to source when there are check-code errors in the output of a
.t test.
In the true tradition of this file, I also have no idea what I'm doing.
Differential Revision: https://phab.mercurial-scm.org/D6000
Pulkit Goyal <pulkit@yandex-team.ru> [Fri, 22 Feb 2019 03:52:10 +0530] rev 41793
diff: make sure we output stat even when --git is not passed (issue4037) (BC)
Before this patch, `hg diff --stat` will give an empty output. It will not show
the stat information. I debugged and found that the underlying code does not
return the diff header and due to that, other code paths fails to parse that as
a diff.
I looked into why we don't return diff headers in quiet mode and found the
behavior is from 8f8bb77d560e70bcc95577e4dfa877df18d876ab which does not have
any mention about why it is done. We also show the diff headers in git, so I
think it's fine showing diff header in normal diff in quiet mode.
Differential Revision: https://phab.mercurial-scm.org/D6007
Pulkit Goyal <pulkit@yandex-team.ru> [Sat, 23 Feb 2019 04:50:46 +0530] rev 41792
tests: add test to demonstrate issue4037
`hg diff --stat -q --config diff.git=0` does not output anything whereas it
should print the stat. This is a quiet old bug dating to 2013 and looking at
code I think it exists it since 2005 or when --stat was introduced. The next
patch will fix the bug.
Differential Revision: https://phab.mercurial-scm.org/D6006
Martin von Zweigbergk <martinvonz@google.com> [Fri, 18 Jan 2019 11:07:46 -0800] rev 41791
grep: reuse getrenamedfn() from scmutil
My motivation is to reduce uses of filectx.renamed(). Reusing
scmutil.getrenamedfn() also means that we get some caching of copy
information per file and revision. I don't think that matters for `hg
grep` (I doubt it speeds up significantly, and I doubt it wastes
significant memory), but I'm not sure.
Differential Revision: https://phab.mercurial-scm.org/D6022
Martin von Zweigbergk <martinvonz@google.com> [Thu, 21 Feb 2019 10:54:29 -0800] rev 41790
templatekw: move getrenamedfn() to scmutil (API)
The function is already used by `hg log` (for following renames, not
for templates), so it seems it does not belong in templatekw.
Differential Revision: https://phab.mercurial-scm.org/D6021
Martin von Zweigbergk <martinvonz@google.com> [Sat, 23 Feb 2019 09:32:07 -0800] rev 41789
mq: get copy source from context object instead of from filelog
This removes dependence on filelog.renamed().
Differential Revision: https://phab.mercurial-scm.org/D6020
Martin von Zweigbergk <martinvonz@google.com> [Sat, 23 Feb 2019 09:30:49 -0800] rev 41788
mq: slightly modernize by using context object
Context objects have existed since mid-2006.
Differential Revision: https://phab.mercurial-scm.org/D6019
Martin von Zweigbergk <martinvonz@google.com> [Sat, 23 Feb 2019 09:15:36 -0800] rev 41787
absorb: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6018
Martin von Zweigbergk <martinvonz@google.com> [Mon, 11 Feb 2019 15:28:04 -0800] rev 41786
fix: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6017
Martin von Zweigbergk <martinvonz@google.com> [Sun, 25 Mar 2018 22:07:35 -0700] rev 41785
memfilefromctx: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6016
Martin von Zweigbergk <martinvonz@google.com> [Wed, 27 Dec 2017 22:32:27 -0800] rev 41784
largefiles: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6015
Martin von Zweigbergk <martinvonz@google.com> [Wed, 27 Dec 2017 22:31:24 -0800] rev 41783
commit: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6014
Martin von Zweigbergk <martinvonz@google.com> [Wed, 27 Dec 2017 22:31:00 -0800] rev 41782
tests: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6013
Martin von Zweigbergk <martinvonz@google.com> [Mon, 26 Mar 2018 10:41:42 -0700] rev 41781
templatekw: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6012
Martin von Zweigbergk <martinvonz@google.com> [Wed, 27 Dec 2017 22:27:05 -0800] rev 41780
convert: migrate to new method for getting copy source
Differential Revision: https://phab.mercurial-scm.org/D6011
Martin von Zweigbergk <martinvonz@google.com> [Sun, 25 Mar 2018 21:30:31 -0700] rev 41779
context: move equivalent renamed() implementations to superclass
Now that renamed() in workingfilectx and in overlayfilectx are written
in terms of copysource(), they are functionally identical and can be
reused.
Differential Revision: https://phab.mercurial-scm.org/D6010
Martin von Zweigbergk <martinvonz@google.com> [Sun, 25 Mar 2018 21:28:30 -0700] rev 41778
context: rewrite renamed() in terms of new copysource() where appropriate
It's only the filectx for committed files that have the copy source's
nodeid easily available; workingfilectx's and overlayfilectx's
renamed() simply find the nodeid by looking in the changeset's p1's
manifest.
Differential Revision: https://phab.mercurial-scm.org/D6009
Martin von Zweigbergk <martinvonz@google.com> [Sun, 25 Mar 2018 21:32:16 -0700] rev 41777
context: add specialized way of getting copy source file only
I'm working on support for storing copy metadata in the changeset
instead of the filelog. I don't intend to include the file nodeid
there, but most callers don't need that anyway. This patch introduces
a method similar to ctx.renamed(), but the new method returns only the
source filename, not the nodeid. Subsequent patches will move callers
over to this new method.
Differential Revision: https://phab.mercurial-scm.org/D6008
Martin von Zweigbergk <martinvonz@google.com> [Thu, 21 Feb 2019 21:27:42 -0800] rev 41776
changegroup: move non-pruning of non-ellipsis manifests to _prunemanifests()
Google has an extension that overrides _prunemanifests() and removes
nodes that we fetch using another mechanism. That broke when
_prunemanifests() no longer got called. It works again if we move the
check for "not self._ellipses" inside _prunemanifests().
Differential Revision: https://phab.mercurial-scm.org/D6004
Kyle Lippincott <spectral@google.com> [Thu, 21 Feb 2019 19:11:35 -0800] rev 41775
context: use includematcher when checking dir/file conflicts
This is for performance; patternmatcher can't easily interpret its results to
make visitchildrenset be the "optimal" set of paths to inspect, but
includematcher can. Since there aren't any special patterns being used here, I
believe that the two matchers are equivalent.
Differential Revision: https://phab.mercurial-scm.org/D5999
Kyle Lippincott <spectral@google.com> [Thu, 21 Feb 2019 19:11:28 -0800] rev 41774
tests: change the paths slightly in test-rebase-inmemory.t
c/c was a little difficult to understand (and verify that it was the *correct*
'c/' that was being talked about), and it's useful to have multiple directories
to prove that we are able to detect this even if there's no files (just a
subdirectory) in the immediate directory that's conflicting.
Differential Revision: https://phab.mercurial-scm.org/D5998
Georges Racinet <georges.racinet@octobus.net> [Wed, 16 Jan 2019 16:19:26 +0100] rev 41773
rust-cpython: using rustext.dagop.headrevs in revlog
As with the previous oxidation series, revlog plays the role
of the factory, either using its parents function, or passing the
index.
We include below results of revsetbenchmarks.py taken on the
PyPy repository on those of contrib/all-revsets.tx that involve
`heads()`.
In most of the cases, this seems to be either neutral or an improvement.
In the cases where it's actually a bit slower, we suspect that differences
in `heads()` performance is actually burried in variance on the incoming
revset (probably several orders of magnitude slower).
The precheck for filtered revisions of parent changeset has a significative
performance benefit, too.
Result by revset
================
Revision:
0) 0c7b353ce100; rust-cpython: binding for headrevs()
1) Parent of this changeset; changelog: prefilter in headrevs()
2) This changeset
revset #0: heads(commonancestors(last(head(), 2)))
plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast
0) 0.001379 0.001361 0.001381 0.001410 0.001393 0.001372 0.001414 0.001387 0.001411 0.001429 0.001415
1) 0.001351 0.001373 0.001383 0.001392 0.001401 0.001385 0.001405 0.001406 0.001385 0.001424 0.001399
2) 0.001365 0.001362 0.001375 0.001393 0.001370 0.001365 0.001413 0.001386 0.001377 0.001415 0.001411
revset #1: heads(commonancestors(head()))
plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast
0) 0.047578 0.048578 0.047764 0.048065 0.047289 0.047305 0.047729 0.047370 0.047611 0.048005 0.047755
1) 0.048072 0.047471 0.048351 0.048193 0.048380 0.047968 0.047683 0.047355 0.048587 0.047044 0.048299
2) 0.047124 0.046699 0.046896 0.047250 0.046920 0.047379 0.046855 0.047753 0.047289 0.047219 0.046991
revset #2: heads(all())
plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast
0) 0.037654 0.037814 0.037149 0.037457 0.037609 0.037053 0.036825 0.037054 0.037739 0.036816 0.037604
1) 0.021845 58% 0.022172 58% 0.022148 59% 0.022059 58% 0.022261 59% 0.022246 60% 0.021691 58% 0.021967 59% 0.022156 58% 0.021820 59% 0.023141 61%
2) 0.014459 66% 0.014470 65% 0.014420 65% 0.014413 65% 0.014421 64% 0.014492 65% 0.014512 66% 0.014579 66% 0.014500 65% 0.014501 66% 0.014537 62%
revset #3: heads(-10000:-1)
plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast
0) 0.003696 0.003681 0.003719 0.003746 0.003725 0.003750 0.003692 0.003747 0.003712 0.003754 0.003763
1) 0.002131 57% 0.002142 58% 0.002147 57% 0.002203 58% 0.002143 57% 0.002208 58% 0.002158 58% 0.002182 58% 0.002169 58% 0.002209 58% 0.002201 58%
2) 0.001490 69% 0.001524 71% 0.001515 70% 0.001528 69% 0.001531 71% 0.001520 68% 0.001549 71% 0.001542 70% 0.001560 71% 0.001559 70% 0.001544 70%
revset #4: (-5000:-1000) and heads(-10000:-1)
plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast
0) 0.003832 0.003816 0.003747 0.003814 0.003749 0.003894 0.003784 0.003796 0.003915 0.003829 0.003795
1) 0.002282 59% 0.002208 57% 0.002220 59% 0.002240 58% 0.002210 58% 0.002276 58% 0.002250 59% 0.002250 59% 0.002311 59% 0.002230 58% 0.002241 59%
2) 0.001658 72% 0.001662 75% 0.001568 70% 0.001599 71% 0.001588 71% 0.001696 74% 0.001615 71% 0.001593 70% 0.001710 73% 0.001622 72% 0.001616 72%
revset #5: heads(matching(tip, "author"))
plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast
0) 7.826449 7.563260 7.581034 7.688493 7.634001 7.777860 7.768228 8.026097 7.767422 7.565254 7.938643
1) 7.750766 7.562555 7.660426 7.574089 7.492220 7.438582 7.562015 7.530635 93% 7.636343 7.636712 7.645113
2) 7.617941 7.519601 7.584922 7.507653 7.547440 7.524436 7.575291 7.883991 7.792142 7.709622 7.868595
revset #6: heads(matching(tip, "author")) and -10000:-1
plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast
0) 7.744489 7.728684 7.734065 7.928513 7.875949 7.883727 7.815492 7.791335 7.784793 7.761218 7.815731
1) 7.808956 7.480446 7.618759 7.920270 7.676343 7.803613 7.770210 7.713100 7.584420 7.767335 7.825140
2) 7.519987 7.938748 106% 7.805328 7.694162 7.750129 7.714229 7.603825 7.580734 7.555291 7.524207 7.504580
revset #7: (-10000:-1) and heads(matching(tip, "author"))
plain min max first last reverse rev..rst rev..ast sort sor..rst sor..ast
0) 7.909321 7.694357 7.666021 7.538686 7.771821 7.876217 7.852103 7.812727 7.545919 7.788860 7.764585
1) 7.749232 7.683715 7.968393 7.895257 7.764160 8.314884 105% 7.921697 7.882613 7.867209 7.684707 7.544501
2) 7.824903 7.784605 7.727846 7.566613 7.581994 7.539205 90% 7.555316 7.535572 7.581786 7.901795 7.662832
Georges Racinet <georges.racinet@octobus.net> [Wed, 20 Feb 2019 11:49:06 +0100] rev 41772
changelog: prefilter in headrevs()
In case where headrevs() is called on some revisions, we perform
the check that aren't filtered in advance, and switch revlog to
use its unchecked form.
This allows to work with alternative implementations that don't have knowledge
of the filtering system, such as the Rust one.
Georges Racinet <gracinet@anybox.fr> [Thu, 21 Feb 2019 11:23:10 +0100] rev 41771
tests: fixed test too dependent on actual exception wording
On one of the machines I use to run the tests prior to submission,
the default Python is 2.7.5, with the following wording:
must be encoded string without NULL bytes, not str
This third form (and possible future ones) are motivation to
use a wider catching regexp.
Augie Fackler <augie@google.com> [Sun, 13 Jan 2019 20:27:00 -0500] rev 41770
contrib: enforce wrapping too-long lines with () instead of \
This is the style I prefer, and an anecdotal exploration of styles
recommended in style guides etc. Further, to quote pep8:
> The preferred way of wrapping long lines is by using Python's implied
> line continuation inside parentheses, brackets and braces. Long lines
> can be broken over multiple lines by wrapping expressions in
> parentheses. These should be used in preference to using a backslash
> for line continuation.
So I think this is a virtuous change.
Differential Revision: https://phab.mercurial-scm.org/D5995
Augie Fackler <augie@google.com> [Wed, 20 Feb 2019 18:02:28 -0500] rev 41769
cleanup: prefer nested context managers to \-continuations
I'd prefer Python accept a tuple of context managers, but alas it
isn't meant to be. This will have to suffice.
Differential Revision: https://phab.mercurial-scm.org/D5994
Augie Fackler <augie@google.com> [Wed, 20 Feb 2019 19:28:51 -0500] rev 41768
cleanup: use () to wrap long lines instead of \
This is a little less brittle, and often helps indentation. In a
surprising number of cases the entire cleanup was deleting the \, as
the expression was *already* parenthesized in a workable way.
Differential Revision: https://phab.mercurial-scm.org/D5993
Augie Fackler <augie@google.com> [Sun, 13 Jan 2019 20:13:22 -0500] rev 41767
tests: use () instead of \ to wrap lines
This should auto-format more consistently, and is slightly more
typical Python.
Differential Revision: https://phab.mercurial-scm.org/D5992
Martin von Zweigbergk <martinvonz@google.com> [Wed, 20 Feb 2019 20:49:41 -0800] rev 41766
merge with stable
Martin von Zweigbergk <martinvonz@google.com> [Tue, 19 Feb 2019 15:42:45 -0800] rev 41765
copies: do copy tracing based on ctx.p[12]copies() if configured
This adds an option to do copy tracing in a changeset-optimized
way. If the metadata is stored in filelogs, this is obviously going to
be suboptimal. The point is that it provides a way of transitioning to
changeset-stored metadata.
Some of the tests behave a little differently, but they all seem
resonable to me.
The config option may very well be renamed later when it's clearer
what options we want and how they will behave.
When the test suite is run with --extra-config-opt to use the new copy
tracing, all tests pass, besides test-copies.t (which fails in the
same way as you can see in this patch).
`hg debugpathcopies 4.0 4.8` reports 82 copies. With this option
enabled, the only difference is this:
-mercurial/pure/bdiff.py -> mercurial/cffi/bdiff.py
+setup_bdiff_cffi.py -> mercurial/cffi/bdiff.py
I believe that happened because it was renamed in different ways on
different sides of a merge and the new algorithm arbitrarily prefers
copies that happened on p1. The runtime is about 0.85 seconds with the
old copy tracing and 5.7 seconds with the new copy tracing. That's
kind of slow, but actually better than I had expected.
Differential Revision: https://phab.mercurial-scm.org/D5991
Martin von Zweigbergk <martinvonz@google.com> [Fri, 18 Jan 2019 13:13:30 -0800] rev 41764
context: introduce p[12]copies() methods and debugp[12]copies commands
As mentioned earlier, I'm working on support for storing copy metadata
in the changeset instead of in the filelog.
In order to transition a repo from storing metadata in filelogs to
storing it in the changeset, I'm going to provide a config option for
reading the metadata from the changeset, but falling back to getting
it from the filelog if it's not in the changeset. In this compatiblity
mode, the changeset-optmized algorithms will be used. We will then
need to convert the filelog copy metadata to look like that provided
by changeset copy metadata. This patch introduces methods that do just
that.
By having these methods here, we can start writing changeset-optimized
algorithms that should work already before we add any support for
storing the metadata in the changesets.
This commit also includes new debugp[12]copies commands and exercises
them in test-copies.t.
Differential Revision: https://phab.mercurial-scm.org/D5990
Martin von Zweigbergk <martinvonz@google.com> [Thu, 14 Feb 2019 22:46:18 -0800] rev 41763
copies: filter out copies when target is not in destination manifest
When chaining a series of commits that copied a file with a series
that removed the destination file, we would still include the copy in
the result. Similar to the previous patch, I have checked that `hg
status --copies` is not affected by this bug, but I wouldn't be
surprised if some commands are.
Differential Revision: https://phab.mercurial-scm.org/D5989