Kyle Lippincott <spectral@google.com> [Mon, 26 Jul 2021 15:02:23 -0700] rev 47777
help: correct config.profiling.freq name (frequency->freq)
Differential Revision: https://phab.mercurial-scm.org/D11217
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 28 Jul 2021 13:18:13 +0200] rev 47776
run-tests: use a small timeout for chg instance
There is case where the test runner fails to clean up the temporary files in
that case, spawned chg instance can stay around for 1 hours. Getting them to
shut down sooner cannot hurt.
(We should also use a more robust approach for this cleanup)
Differential Revision: https://phab.mercurial-scm.org/D11227
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 28 Jul 2021 14:56:10 +0200] rev 47775
run-tests: do not inherit file descriptor when running a command
This is one of the difference between python2 and python3 and could have been a
reason why test hang with python2 + chg. This does not seems to help the
hanging issue at all…
However, now that this is written lets reduce the difference between python2
and python3.
Differential Revision: https://phab.mercurial-scm.org/D11226
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 28 Jul 2021 14:55:06 +0200] rev 47774
dummyssh: make sure we don't inherit files descriptor to the children
This is one of the difference between python2 and python3 and could have been a
reason why test hang with python2 + chg. This does not seems to help the
hanging issue at all…
However, now that this is written lets reduce the difference between python2
and python3.
Differential Revision: https://phab.mercurial-scm.org/D11225
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 29 Jul 2021 02:20:26 +0200] rev 47773
tests: make test-serve works on system that allow user to bind low port
It is possible to encounter linux system configured in a way that allow port
< 1024 to be bound by any users. So we update a test to focus more on the actual
test: "resolving `daytime` to an actual port number.
The new auto-scaling CI runner provided by clever cloud is doing so. This is the
initial motivation for this change, but it seems useful anyway.
Differential Revision: https://phab.mercurial-scm.org/D11228
Augie Fackler <augie@google.com> [Thu, 29 Jul 2021 17:04:55 -0400] rev 47772
git: restore basic functionality (
issue6545)
It looks like a big refactor happened on dirstate, and the git extension was
just ignored.
Differential Revision: https://phab.mercurial-scm.org/D11234
Augie Fackler <augie@google.com> [Thu, 29 Jul 2021 17:03:35 -0400] rev 47771
dirstate: fix typo in docstring
Spotted while repairing git extension tests.
Differential Revision: https://phab.mercurial-scm.org/D11233
Matt Harbison <matt_harbison@yahoo.com> [Fri, 30 Jul 2021 00:11:56 -0400] rev 47770
typing: add several assertions to dirstatemap to appease pytype
I think it's been mentioned in IRC that these can't be None in this case. This
fixes:
File "/mnt/c/Users/Matt/hg/mercurial/dirstatemap.py", line 213, in addfile: unsupported operand type(s) for &: 'None' and 'int' [unsupported-operands]
No attribute '__and__' on None or '__rand__' on int
Called from (traceback):
line 290, in reset_state
File "/mnt/c/Users/Matt/hg/mercurial/dirstatemap.py", line 214, in addfile: unsupported operand type(s) for &: 'None' and 'int' [unsupported-operands]
No attribute '__and__' on None or '__rand__' on int
Called from (traceback):
line 290, in reset_state
Differential Revision: https://phab.mercurial-scm.org/D11235
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 26 Jul 2021 21:55:53 +0200] rev 47769
help: indicate how to run downgrade a repository using persistent nodemap
We have a couple of report of people needing this. I am not fan of pointing
people to a debug command, but we don't have much better to offer right now
Differential Revision: https://phab.mercurial-scm.org/D11214
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 26 Jul 2021 21:52:10 +0200] rev 47768
help: use the correct spelling for `slow-path` in persistent nodemap help
Differential Revision: https://phab.mercurial-scm.org/D11213
Martin von Zweigbergk <martinvonz@google.com> [Mon, 11 Mar 2019 10:59:35 -0700] rev 47767
fix: use scmutil.movedirstate() instead of reimplementing
I wrote this patch 2 years ago as a little cleanup. I wanted to
generally used `scmutil.movedirstate()` instead of manually updating
the dirstate because that is easy to get wrong. I didn't know until
today that the current code had a bug. So I added the test case two
patches before this one and dusted off this one patch. This is a
little slower than the previous code, as it diffs two
manifests. However, it fixes the bug and I don't think it's going to
be noticeably slower anyway.
Differential Revision: https://phab.mercurial-scm.org/D11210
Martin von Zweigbergk <martinvonz@google.com> [Mon, 11 Mar 2019 10:56:56 -0700] rev 47766
fix: rewrite writeworkingdir() to explicitly not work with merges
`hg fix` errors out early if there is an unfinished merge, so we
should have only one parent here. Making that explicit makes my next
patches simpler.
Differential Revision: https://phab.mercurial-scm.org/D11209
Martin von Zweigbergk <martinvonz@google.com> [Thu, 22 Jul 2021 17:12:56 -0700] rev 47765
tests: demonstrate bug in `hg fix` with incorrectly dirty working copy
If the parent commit needs formatting but the working copy already has
the correct formatting, then the working copy will be reported as
modified even though it's clean (because the size in the dirstate is
incorrect). Because the bug only occurs when the size changes, I
modified the formatter used in the test case to remove repeated
spaces.
Differential Revision: https://phab.mercurial-scm.org/D11208
Matt Harbison <matt_harbison@yahoo.com> [Wed, 21 Jul 2021 15:50:17 -0400] rev 47764
upgrade: byteify an i18n message
Differential Revision: https://phab.mercurial-scm.org/D11207
Matt Harbison <matt_harbison@yahoo.com> [Wed, 21 Jul 2021 15:34:35 -0400] rev 47763
typing: convert an annotation to an assertion in commands.py
Pytype was happy with the annotation at one point, but 2021.04.15 now complains.
Differential Revision: https://phab.mercurial-scm.org/D11206
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 20 Jul 2021 23:04:28 +0200] rev 47762
test: remove `sleep` usage in `test-nointerrupt.t` (
issue6271)
We move from sleep based synchronisation to file creation based synchronisation.
Sleeps is the path to the dark side.
Sleeps leads to flakiness.
Flakiness leads to anger.
Anger leads to hate.
Hate leads to suffering.
Differential Revision: https://phab.mercurial-scm.org/D11205
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 22 Jul 2021 03:13:37 +0530] rev 47761
Added signature for changeset
d7515d29761d
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 22 Jul 2021 03:13:30 +0530] rev 47760
Added tag 5.9rc0 for changeset
d7515d29761d
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 21 Jul 2021 22:52:09 +0200] rev 47759
branching: merge default into stable
This mark the start of the 5.9 freeze.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 19 Jul 2021 23:14:38 +0200] rev 47758
relnotes: document the change in the dirstate API
Differential Revision: https://phab.mercurial-scm.org/D11200
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 19 Jul 2021 08:56:56 +0200] rev 47757
dirstate: deprecate the `add` method
All users have been migrated.
Differential Revision: https://phab.mercurial-scm.org/D11199
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 18 Jul 2021 22:35:37 +0200] rev 47756
mq: replace `add` call with newer API
Differential Revision: https://phab.mercurial-scm.org/D11198
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 19 Jul 2021 08:59:00 +0200] rev 47755
largefile: use `update_file` instead of `add` in `synclfdirstate`
This is the newer, more semantic API.
Differential Revision: https://phab.mercurial-scm.org/D11197
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 19 Jul 2021 03:19:06 +0200] rev 47754
largefile: use `update_file` instead of `add` in `mergerecordupdates`
This is the newer, more semantic API.
Differential Revision: https://phab.mercurial-scm.org/D11196
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 19 Jul 2021 09:05:25 +0200] rev 47753
dirstate: deprecate the `drop` method
All users have been migrated.
Differential Revision: https://phab.mercurial-scm.org/D11195
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 19 Jul 2021 17:33:45 +0200] rev 47752
narrow: stop using `drop` in the `updateworkingcopy`
Let us use the new API instead.
Differential Revision: https://phab.mercurial-scm.org/D11194
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 18 Jul 2021 22:32:55 +0200] rev 47751
mq: replace `drop` call with newer API
Differential Revision: https://phab.mercurial-scm.org/D11193
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 19 Jul 2021 09:15:37 +0200] rev 47750
largefile: use `update_file` instead of `drop` during `rollback`
This is the newer, more semantic API.
Differential Revision: https://phab.mercurial-scm.org/D11192
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 19 Jul 2021 09:14:24 +0200] rev 47749
largefile: use `update_file` instead of `drop` in `synclfdirstate`
This is the newer, more semantic API.
Differential Revision: https://phab.mercurial-scm.org/D11191
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 19 Jul 2021 09:08:54 +0200] rev 47748
sparse: use `update_file` instead of `drop`
This is the newer, more semantic API.
Differential Revision: https://phab.mercurial-scm.org/D11190