Sushil khanchi <sushilkhanchi97@gmail.com> [Fri, 23 Jul 2021 13:42:12 +0530] rev 48822
precheck: fix false warning about content-divergence creation
Before this patch, if we try to `hg prune` (without any successors) an
already obsoleted cset which has at least one successor, it would false
warn about new content-divergence. As we know, pruning cset without any
successors can not create any divergence.
Differential Revision: https://phab.mercurial-scm.org/D12002
Valentin Gatien-Baron <vgatien-baron@janestreet.com> [Thu, 24 Mar 2022 12:27:21 -0400] rev 48821
streamclone: avoid some obscure error in a corner case
I don't really know how, but I ran into this error:
$ hg clone --stream ssh://user@dummy/empty-repo local-empty-repo
streaming all changes
abort: unable to apply stream clone: unsupported format:
[255]
I think you need an empty list of requirements for this to happen,
which is weird, but an obscure error like this is not exactly helpful
either. Since this is the result of an encoding bug anyway, just fix
it.
Differential Revision: https://phab.mercurial-scm.org/D12402
Yuya Nishihara <yuya@tcha.org> [Tue, 29 Mar 2022 18:15:49 +0900] rev 48820
tags: fix typo in fast path detection of fnode resolution (issue6673)
If I understand it, mctx.readfast() is unreliable here if p1/p2 .hgtags
nodes differ, and tags on that branch would be randomly discarded
depending on which parent were picked.
The test case added by this patch would fail only on zstd-compressed
repository. I didn't try hard to stabilize the failure case.
Raphaël Gomès <rgomes@octobus.net> [Mon, 28 Mar 2022 17:24:41 +0200] rev 48819
dirstate-cext: properly invalidate mtime and data in `set_untracked`
This was forgotten about in the initial implementation and was revealed while
adding the `dirstate-v2` variant of `test-issue660.t`. Neither the existing
Python implementation nor the upcoming Rust implementation suffer from this
bug since they respectively have `None` and `Option<T>` to represent the lack
of information.
Differential Revision: https://phab.mercurial-scm.org/D12414
Joerg Sonnenberger <joerg@bec.de> [Tue, 22 Mar 2022 03:19:01 +0100] rev 48818
pullbundle: fix file name in the help text
It is pullbundles.manifest and not pullbundle.manifest.
Differential Revision: https://phab.mercurial-scm.org/D12391
Martin von Zweigbergk <martinvonz@google.com> [Mon, 21 Mar 2022 14:21:10 -0700] rev 48817
unamend: abort if commit was not created by `hg [un]amend`
`hg unamend` can currently undo any kind of rewrite, as long as it has
an obsmarker. However, that has quite unexpected results if you run it
after e.g. `hg rebase` (expecting it to behave like a generic `hg
undo` command), because it updates to the predecessor and leaves the
old changes in the working copy. I think it's better to allow `hg
unamend` only after `hg amend` (and after `hg unamend` because that's
documented as being supported).
Differential Revision: https://phab.mercurial-scm.org/D12390
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 17 Mar 2022 14:58:46 +0100] rev 48816
test: use `wait-on-file` in `test-racy-mutations.t`
The official utility scale its timeout with the run-tests.py one. So lets use
it.
Differential Revision: https://phab.mercurial-scm.org/D12382
Martin von Zweigbergk <martinvonz@google.com> [Fri, 18 Mar 2022 21:15:54 -0700] rev 48815
amend: fix amend with copies in extras
If copy information is stored only in the commit extras and not in
filelogs, then they get lost on amend if the file wasn't also modified
in the working copy. That's because we create `filectx` object from
the old commit in those cases, and the `.copysource()` of such objects
read only from the filelog. This patch fixes it by always creating a
new `memfilectx` in these cases, passing the calculated copy
information to it.
Differential Revision: https://phab.mercurial-scm.org/D12387
Martin von Zweigbergk <martinvonz@google.com> [Fri, 18 Mar 2022 21:37:22 -0700] rev 48814
tests: demonstrate that copy info in changeset gets lost on amend
When copy information is stored in changesets, it gets lost on
amend. We didn't notice that until now because our users at Google
have the config set to `compatibility`, which means copy information
is stored in both changeset and filelogs.
Differential Revision: https://phab.mercurial-scm.org/D12386
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 18 Mar 2022 18:09:46 +0100] rev 48813
ci: use the `v1.0` flavor of the docker images in the CI
This new versioning will help us to maintain backward compatibility in the
docker image. This will be useful to deal with mismatch between default/stable
in version and the re-run CI on older changesets in the future.
Once this changeset land on stable, we will have to merge it in default. Then
we can start make backward incompatible changes in a new image version.
Differential Revision: https://phab.mercurial-scm.org/D12388
Raphaël Gomès <rgomes@octobus.net> [Fri, 18 Mar 2022 16:15:44 +0100] rev 48812
rust-status: cap the number of concurrent threads to 16
During benchmarking it was determined that the use of more threads is very
advantageous... until we use more than 16. This is most likely due to some
resource contention (thrashing, etc.). Until we have time to figure out and
fix the underlying cause, let's just cap at 16 threads.
Differential Revision: https://phab.mercurial-scm.org/D12384
Julien Cristau <jcristau@debian.org> [Tue, 15 Mar 2022 14:45:47 +0100] rev 48811
test: update test-clone-stream.t to pass on bigendian
Fixes: a3cf460a6b1b ("stream-clone: also filter the requirement we put in the bundle 2")
Differential Revision: https://phab.mercurial-scm.org/D12377
Martin von Zweigbergk <martinvonz@google.com> [Tue, 15 Mar 2022 13:31:39 -0700] rev 48810
filemerge: when merge tool uses $output, don't leave markers in $local
As explained in the previous patch, we incorrectly leave conflict
markers in both `$local` and `$output` since D12190. I don't
understand why it broke but the fix is simple and clear after all the
recent refactoring.
Differential Revision: https://phab.mercurial-scm.org/D12379
Martin von Zweigbergk <martinvonz@google.com> [Tue, 15 Mar 2022 13:40:45 -0700] rev 48809
tests: demonstrate how conflict markers end up $local *and* $output
When a merge tool is configured to keep conflict markers, they are
supposed to be written to `$local` if `$output` is not mentioned in
the tool's `merge-tools.<tool>.args` config, and in `$output` if it is
mentioned. However, I broke the latter case in D12190.
Differential Revision: https://phab.mercurial-scm.org/D12378
Julien Cristau <jcristau@debian.org> [Mon, 14 Mar 2022 17:57:03 +0100] rev 48808
revlog: fix wrong type of rank_unknown variable
We treat "rank" as an int everywhere, but declare rank_unknown as a
char. On architectures where char is signed, that works out ok, but
when char is unsigned, rank_unknown is 255 instead of -1.
Differential Revision: https://phab.mercurial-scm.org/D12374
Luke Granger-Brown <hg@lukegb.com> [Mon, 14 Mar 2022 14:10:41 +0000] rev 48807
rust-hg-core: use correct type for libc hostname buffer
The type of libc::c_char is u8 on aarch64 rather than i8, which causes
the use of a specifically-typed constant to fail.
Differential Revision: https://phab.mercurial-scm.org/D12373
Raphaël Gomès <rgomes@octobus.net> [Tue, 01 Mar 2022 16:39:14 +0100] rev 48806
Added signature for changeset d4486810a179
Raphaël Gomès <rgomes@octobus.net> [Tue, 01 Mar 2022 16:39:06 +0100] rev 48805
Added tag 6.1 for changeset d4486810a179
Raphaël Gomès <rgomes@octobus.net> [Mon, 28 Feb 2022 18:34:23 +0100] rev 48804
merge: remove direct rustmod reference
We shouldn't rely on this member being present in `dirstate.py`, this creates
unnecessary coupling.
This also can trigger certain issues in edge-cases where the policy is changed
at runtime or multiple Python environments fight, which is an added bonus.
Differential Revision: https://phab.mercurial-scm.org/D12217
Raphaël Gomès <rgomes@octobus.net> [Mon, 21 Feb 2022 11:22:40 +0100] rev 48803
relnotes: add 6.1
Differential Revision: https://phab.mercurial-scm.org/D12205
Raphaël Gomès <rgomes@octobus.net> [Fri, 18 Feb 2022 13:14:32 +0100] rev 48802
relnotes: add 6.0.3
Differential Revision: https://phab.mercurial-scm.org/D12204
Raphaël Gomès <rgomes@octobus.net> [Fri, 18 Feb 2022 12:51:23 +0100] rev 48801
windows: adjust test output in test-merge-tools.t
Differential Revision: https://phab.mercurial-scm.org/D12216
Raphaël Gomès <rgomes@octobus.net> [Fri, 18 Feb 2022 12:51:06 +0100] rev 48800
windows: generalize output for test-status-tracked-key.t
Differential Revision: https://phab.mercurial-scm.org/D12215
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 22 Feb 2022 11:51:08 +0100] rev 48799
windows: skip a section of a test that is legitimately broken on windows
See the comment in the test itself.
Differential Revision: https://phab.mercurial-scm.org/D12214
Raphaël Gomès <rgomes@octobus.net> [Fri, 18 Feb 2022 14:32:26 +0100] rev 48798
Added signature for changeset c00d3ce4e94b
Raphaël Gomès <rgomes@octobus.net> [Fri, 18 Feb 2022 14:32:09 +0100] rev 48797
Added tag 6.1rc0 for changeset c00d3ce4e94b
Raphaël Gomès <rgomes@octobus.net> [Fri, 18 Feb 2022 14:27:43 +0100] rev 48796
branching: merge default into stable for 6.1 freeze
Raphaël Gomès <rgomes@octobus.net> [Fri, 18 Feb 2022 12:58:44 +0100] rev 48795
branching: merge 6.0.3 stable into default