Simon Sapin <simon.sapin@octobus.net> [Wed, 17 Feb 2021 20:49:53 +0100] rev 47950
rhg: Port Python’s `ui.configlist` as `Config::get_list`
This new method is not used yet outside of its own unit tests,
so this changeset should make no observable change.
The Rust parser implementation attempts to exactly replicate the behavior of
the Python one, even in edge cases where that behavior is… surprising.
New unit tests capture some of these edge cases.
This started as a line-by-line port. The main changes are:
* Pass around a parser mode enum instead of parser functions
* Inline the whole parser into one function
* Use `[u8]::get` which returns an `Option`,
instead of indexing after explicitly checking the length.
Differential Revision: https://phab.mercurial-scm.org/D11389
Simon Sapin <simon.sapin@octobus.net> [Fri, 03 Sep 2021 16:37:20 +0200] rev 47949
rust: Generalize the `trim_end_newlines` utility of byte strings
… into `trim_end_matches` that takes a callack.
Also add `trim_start_matches`.
Differential Revision: https://phab.mercurial-scm.org/D11388
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 30 Aug 2021 21:18:29 +0200] rev 47948
dirstate-item: move the C implementation to the same logic
Now that we know were we are going, we can update the C implementation.
Differential Revision: https://phab.mercurial-scm.org/D11387
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 31 Aug 2021 09:23:50 +0200] rev 47947
dirstate-item: introduce low level C function
Since a lot of logic is about to change, we need to isolate it into bits that
are easy reusable in the rest of the C code.
Especially we need to split the part that do the pure logic from the part that
do the Python wrapping.
Differential Revision: https://phab.mercurial-scm.org/D11386
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 27 Aug 2021 20:06:07 +0200] rev 47946
dirstate-item: factor some code in the C implementation
We have both `dirstate_item_from_v1_meth`, a class method, and
`dirstate_item_from_v1_data`, a function taking low level C argument.
Lets implement the former with the later.
Differential Revision: https://phab.mercurial-scm.org/D11385
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 27 Aug 2021 19:19:21 +0200] rev 47945
dirstate-item: `dirstate_item_from_v1_data` replaces make_dirstate_item
For different format, we will need multiple capsule anyways.
Differential Revision: https://phab.mercurial-scm.org/D11384
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 30 Aug 2021 18:45:54 +0200] rev 47944
pathutil: replace the `skip` argument of `dirs` with a boolean
It is ever only used for `r` file. So we make it a boolean this will give use
more versatility later as we will stop storing the state explicitly.
Differential Revision: https://phab.mercurial-scm.org/D11383
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Sep 2021 00:16:37 +0200] rev 47943
dirstate: clarify the message in nonnormal checking
The previous message was quite verbose and hard to understand. The new one
should be friendlier.
Differential Revision: https://phab.mercurial-scm.org/D11382
Augie Fackler <augie@google.com> [Wed, 08 Sep 2021 15:59:48 -0400] rev 47942
merge: with stable
Valentin Gatien-Baron <vgatien-baron@janestreet.com> [Fri, 10 Sep 2021 14:57:00 -0400] rev 47941
narrow: fix commits of empty files
The problem is that when committing a new file with empty contents (or
in general empty file with filelog p1 = -1), hg commit with narrow
doesn't create a filelog revision at all, which causes failures in
further commands.
The problem seems to be that:
- hg thinks that instead of creating a new filelog revision, it can
use the filelog's p1 (the nullrev)
- because it thinks the file contents is the same in that revision and
in p1
- because `narrowfilelog.cmp(nullrev, b'')` is True (unlike with
`filelog.cmp`)
It's not clear to me which `cmp` behaves better. But I think it makes
sense to change the commit code to not to "reuse" the null rev when
adding an empty file with filelog p1 == filelog p2 == -1. This is
consistent with never writing the null rev in the manifest, which `hg
verify` claims is an invariant:
```
inside/c@4: manifest refers to unknown revision
000000000000
```
Differential Revision: https://phab.mercurial-scm.org/D11400
Valentin Gatien-Baron <vgatien-baron@janestreet.com> [Fri, 10 Sep 2021 14:37:03 -0400] rev 47940
narrow: show repo corruption when commiting empty files
Differential Revision: https://phab.mercurial-scm.org/D11399
Kyle Lippincott <spectral@google.com> [Tue, 07 Sep 2021 11:50:12 -0700] rev 47939
filemerge: be more strict when detecting conflict markers, add `|` markers
I received a user complaint about detecting a line that contained 78 `=`
followed by `*/` as a conflict marker. We'll never generate that, we generate 7
identical characters and either the end of the line, or a space. Let's be
explicit about detecting exactly what we produce to reduce the chances of a
false positive.
While we're here, add `|||||||` as a detected conflict marker (generated with
the `keep-merge3` style conflicts).
Differential Revision: https://phab.mercurial-scm.org/D11391
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 27 Aug 2021 18:00:47 +0200] rev 47938
dirstate-item: implement `v1_mtime` with higher level block
This is much easier to read and maintain.
Differential Revision: https://phab.mercurial-scm.org/D11375
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 27 Aug 2021 17:59:00 +0200] rev 47937
dirstate-item: implement `v1_size` with higher level block
This is much easier to read and maintain.
Differential Revision: https://phab.mercurial-scm.org/D11374
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 27 Aug 2021 17:48:12 +0200] rev 47936
dirstate-item: implement v1_state with higher level block
This is much easier to read and maintain.
Differential Revision: https://phab.mercurial-scm.org/D11373
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 27 Aug 2021 18:04:49 +0200] rev 47935
dirstate-item: add more logic to `from_p2`
This seem semantically better even if this tracking case seems to always comes
with clean_p2 for now.
Differential Revision: https://phab.mercurial-scm.org/D11372
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 27 Aug 2021 17:14:54 +0200] rev 47934
dirstate-item: implement `merged_removed` in a simpler way
We can simply use the underlying attribute.
Differential Revision: https://phab.mercurial-scm.org/D11371
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 27 Aug 2021 17:12:39 +0200] rev 47933
dirstate-item: implement `removed` in a simpler way
We can simply use the underlying attribute.
Differential Revision: https://phab.mercurial-scm.org/D11370
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 27 Aug 2021 17:10:26 +0200] rev 47932
dirstate-item: implement `from_p2_removed` in a simpler way
We can simply use the underlying attribute.
Differential Revision: https://phab.mercurial-scm.org/D11369
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 27 Aug 2021 17:09:49 +0200] rev 47931
dirstate-item: implement `from_p2` in a simpler way
We can simply use the underlying attribute.
Differential Revision: https://phab.mercurial-scm.org/D11368
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 27 Aug 2021 17:09:06 +0200] rev 47930
dirstate-item: implement `merged` in a simpler way
We can simply use the underlying attribute.
Differential Revision: https://phab.mercurial-scm.org/D11367
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 27 Aug 2021 17:07:56 +0200] rev 47929
dirstate-item: implement `added` in a simpler way
We can simply use the underlying attribute.
Differential Revision: https://phab.mercurial-scm.org/D11366
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 27 Aug 2021 17:07:12 +0200] rev 47928
dirstate-item: implement `tracked` in a simpler way
We can simply use the underlying attribute.
Differential Revision: https://phab.mercurial-scm.org/D11365
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 27 Aug 2021 15:10:21 +0200] rev 47927
dirstate-item: keep the full information in memory (for pure form)
This changeset is finally reaching the area where we have been headed this whole
time. Since all implementation details are contained inside de DirstateItem
logic, we can change the way it is implemented.
So we store the information that are passed to the object and use them to
dynamically compute the "legacy" value.
For now we only do this for the Pure implementation, as this is a good
demonstration for the logic is fully insulated.
The next step will be the update the C code too, to implement the various method
with the new attribute (instead of the legacy one) and then start seriously
thinking about the parameters we feed into DirstateItem.
Differential Revision: https://phab.mercurial-scm.org/D11364
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 26 Aug 2021 16:50:14 +0200] rev 47926
dirstate-item: have all the logic go through the v1_ accessors
We are about to change the internal attribute. Having all the logic using the
old "legacy" accessors will help to have a smooth transition.
Differential Revision: https://phab.mercurial-scm.org/D11363
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 26 Aug 2021 16:39:00 +0200] rev 47925
dirstate-item: drop the deprecated __getitem__ variante
This is deprecated since 5.9.
Differential Revision: https://phab.mercurial-scm.org/D11362
Raphaël Gomès <rgomes@octobus.net> [Mon, 30 Aug 2021 12:25:57 +0200] rev 47924
branching: merge stable into default
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> [Fri, 27 Aug 2021 09:09:10 -0400] rev 47923
tests: normalize the way some debug output it matched
Differential Revision: https://phab.mercurial-scm.org/D11361
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> [Mon, 02 Aug 2021 23:46:26 -0400] rev 47922
tests: drop hgrc bits that have become the default
Differential Revision: https://phab.mercurial-scm.org/D11247
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> [Mon, 02 Aug 2021 23:43:40 -0400] rev 47921
tests: manual cleanup now that dummyssh usage is implied
Differential Revision: https://phab.mercurial-scm.org/D11246
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> [Mon, 02 Aug 2021 21:25:01 -0400] rev 47920
tests: rely on dummyssh being the default
This commit is exactly the result of running this command:
sed -i -e 's! *\(-e \|--ssh \|--config ui.ssh=\)[ \"]*$PYTHON[ \"]*$\(RUN\|\)TESTDIR/dummyssh[\"]* *! !g' -e '/^[ >]*ssh *=[ "]*$PYTHON[ "]*$\(RUN\|\)TESTDIR\/dummyssh[ "]*$/d' -e 's/^\( [$] .*[^ ]\) *$/\1/' *.t *.sh
Sometimes the tests can be simplified further, but I think it's
preferable to do the simplification separately.
Differential Revision: https://phab.mercurial-scm.org/D11245
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> [Mon, 02 Aug 2021 21:10:42 -0400] rev 47919
tests: setup dummyssh as the default ssh
To significantly reduce boilerplate in tests. One test is updated to
show that it works, I expect to do the rest in follow up commits.
Differential Revision: https://phab.mercurial-scm.org/D11244