evolve merge requestshttps://foss.heptapod.net/mercurial/evolve/-/merge_requests2022-11-22T10:37:23Zhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/468evolve: raise StateError when trying to prev/next from uncommitted merge2022-11-22T10:37:23ZAnton Shestakovevolve: raise StateError when trying to prev/next from uncommitted mergePierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/467prune: CLI flags validation and more exit codes2022-11-22T10:18:04ZAnton Shestakovprune: CLI flags validation and more exit codesPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/466python-compat: adapt to Python 3.11 BC breakage with `random.sample`2022-11-22T13:09:31ZRaphaël Gomèspython-compat: adapt to Python 3.11 BC breakage with `random.sample`As per https://docs.python.org/3/whatsnew/3.11.html#porting-to-python-3-11:
"The population parameter of `random.sample()` must be a sequence, and
automatic conversion of sets to lists is no longer supported.
Also, if the sample size is...As per https://docs.python.org/3/whatsnew/3.11.html#porting-to-python-3-11:
"The population parameter of `random.sample()` must be a sequence, and
automatic conversion of sets to lists is no longer supported.
Also, if the sample size is larger than the population size,
a `ValueError` is raised"Raphaël GomèsRaphaël Gomèshttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/465FQBN during exchange2022-11-29T09:08:17ZAnton ShestakovFQBN during exchangePierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/464topic: add unidentified quokka2022-11-16T03:06:16ZAnton Shestakovtopic: add unidentified quokkaThe quokka is a small macropod about the size of a domestic cat. We already
have a wallaby in the list, here's another, distinct, marsupial of the same
family. This one is unidentified, however.The quokka is a small macropod about the size of a domestic cat. We already
have a wallaby in the list, here's another, distinct, marsupial of the same
family. This one is unidentified, however.Anton ShestakovAnton Shestakovhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/463next: properly handle cases when user selects an aspiring child2022-11-16T03:06:06ZAnton Shestakovnext: properly handle cases when user selects an aspiring childWhen there are ambiguous next changesets and only some of them need to be
evolved, and user picks one of them, next used to simply update to it without
evolving. Now we check if it's an aspiring child and evolve it before updating
to it....When there are ambiguous next changesets and only some of them need to be
evolved, and user picks one of them, next used to simply update to it without
evolving. Now we check if it's an aspiring child and evolve it before updating
to it.
In test-prev-next.t, this case was previously handled by a separate hg evolve
--update call. Without this fix, hg next would simply update to the revision 5
("added d", which is still unstable) without evolving it.
Thanks to Sebastian Unger, who spotted this bug on Evolve Testers mailing list.Anton ShestakovAnton Shestakovhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/462topics: add special label and color for topic you touched2022-11-24T13:01:19ZPierre-Yves Davidtopics: add special label and color for topic you touchedThis will make it easier to spot your own topic.
One the long run, this should probably be related to namespace.
I am not fully convinced by the visual result either, but that is already more
useful than nothing.This will make it easier to spot your own topic.
One the long run, this should probably be related to namespace.
I am not fully convinced by the visual result either, but that is already more
useful than nothing.Anton ShestakovAnton Shestakovhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/461fold: provide better guidance on two non-adjacent revs2023-04-25T02:37:59ZJason R. Coombsfold: provide better guidance on two non-adjacent revsSome users have reported confusion when they invoke ``hg fold --exact revA revC`` where the two revisions are not adjacent. This common confusion could be ameliorated by detecting the condition and suggesting the likely intention (``hg f...Some users have reported confusion when they invoke ``hg fold --exact revA revC`` where the two revisions are not adjacent. This common confusion could be ameliorated by detecting the condition and suggesting the likely intention (``hg fold --exact revA::revC``).
This change also updates the docs to provide a bit more guidance for users who may have encountered the error.Jason R. CoombsJason R. Coombshttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/460topic: use modern exit codes2022-11-04T04:16:58ZAnton Shestakovtopic: use modern exit codesPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/459dropping old compatibility code2022-10-09T13:18:46ZAnton Shestakovdropping old compatibility codeAnton ShestakovAnton Shestakovhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/458evolve: don't embed graft data when completing interrupted evolve operations2023-06-09T02:00:01ZMatt Harbisonevolve: don't embed graft data when completing interrupted evolve operationsThis data shows in TortoiseHg, and is a bit awkward since it wasn't added before
in the non interrupted case. It originated before 823031b51d81, when the
implementation changed away from using the graft command. According to
@marmoute,...This data shows in TortoiseHg, and is a bit awkward since it wasn't added before
in the non interrupted case. It originated before 823031b51d81, when the
implementation changed away from using the graft command. According to
@marmoute, it serves as noise to create a new hash and prevent a cycle, so use
the same noise as would happen in the uninterrupted case (as demonstrated by the
first change in test-stabilize-conflict.t).Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/457topic: invalidate the topic cache when branchcache is invalidated2022-10-11T08:19:51ZMatt Harbisontopic: invalidate the topic cache when branchcache is invalidatedThe branchmap is cleared in the superclass function, but I didn't see any sign
that this is ever cleared.
This fixes an issue in TortoiseHg where stale topic labels appear in certain
cases, such as if a commit has a topic and is strippe...The branchmap is cleared in the superclass function, but I didn't see any sign
that this is ever cleared.
This fixes an issue in TortoiseHg where stale topic labels appear in certain
cases, such as if a commit has a topic and is stripped, and an unrelated commit
is pulled in from a remote repo. Additionally, it fixes an issue with the topic
display in TortoiseHg and cmdserver when using `hg rollback`. In the new test,
the result of the command that applies `topic2` without this fix was:
6 d (topic2)
5 c (topic2)
4 b (topic1)
0 a ()
The tie in was that rev 4 used to be `topic1` before the rollback. Also note
that without the fix, the final log command printed the following, even though
it showed no signs of `topic1`, and nothing should have changed:
active topic 'topic1' grew its first changeset
(see 'hg help topics' for more information)Matt HarbisonMatt Harbisonhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/456tns: various follow-ups2022-11-03T17:30:37ZAnton Shestakovtns: various follow-upsPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/455doc: fix typo in revset/stack() help text2022-09-21T12:49:19ZPacien TRAN-GIRARDdoc: fix typo in revset/stack() help textAnton ShestakovAnton Shestakovhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/454topic: update a comment about branch:topic, use the modern version2022-08-11T06:19:20ZAnton Shestakovtopic: update a comment about branch:topic, use the modern versionPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/453topic: call a different wire protocol command to get tns-aware branchmap2022-09-12T19:59:48ZAnton Shestakovtopic: call a different wire protocol command to get tns-aware branchmapPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/45210.5.2: stable branch and tag2022-07-14T12:33:45ZAnton Shestakov10.5.2: stable branch and tagPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/45010.5.2: compat branches2022-07-14T12:32:54ZAnton Shestakov10.5.2: compat branchesPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/449topic: namespaces exchange step 12022-07-12T14:49:01ZAnton Shestakovtopic: namespaces exchange step 1Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/448topic: use shorter fqbn format by default2022-07-05T08:18:13ZAnton Shestakovtopic: use shorter fqbn format by defaultPierre-Yves DavidPierre-Yves David