Mercurial > hg
annotate .gitlab/merge_request_templates/Default.md @ 52217:96b113d22b34 stable
rust-update: handle SIGINT from long-running update threads
The current code does not respond to ^C until after the Rust bit is finished
doing its work. This is expected, since Rust holds the GIL for the duration
of the call and does not call `PyErr_CheckSignals`. Freeing the GIL to do our
work does not really improve anything since the Rust threads are still going,
and the only way of cancelling a thread is by making it cooperate.
So we do the following:
- remember the SIGINT handler in hg-cpython and reset it after the call
into core (see inline comment in `update.rs` about this)
- make all update threads watch for a global `AtomicBool` being `true`,
and if so stop their work
- reset the global bool and exit early (i.e. before writing the dirstate)
- raise SIGINT from `hg-cpython` if update returns `InterruptReceived`
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Tue, 12 Nov 2024 12:52:13 +0100 |
parents | 7b6d3a9bd7be |
children |
rev | line source |
---|---|
49216
9ea9445c3223
workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
1 /assign_reviewer @mercurial.review |
9ea9445c3223
workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2 |
49535
7b6d3a9bd7be
mr-template: wrap the instructions inside a comment block
Matt Harbison <matt_harbison@yahoo.com>
parents:
49268
diff
changeset
|
3 |
7b6d3a9bd7be
mr-template: wrap the instructions inside a comment block
Matt Harbison <matt_harbison@yahoo.com>
parents:
49268
diff
changeset
|
4 <!-- |
7b6d3a9bd7be
mr-template: wrap the instructions inside a comment block
Matt Harbison <matt_harbison@yahoo.com>
parents:
49268
diff
changeset
|
5 |
49216
9ea9445c3223
workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
6 Welcome to the Mercurial Merge Request creation process: |
9ea9445c3223
workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
7 |
9ea9445c3223
workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
8 * Set a simple title for your MR, |
9ea9445c3223
workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
9 * All important information should be contained in your changesets' content or description, |
9ea9445c3223
workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
10 * You can add some workflow-relevant information here (eg: when this depends on another MR), |
9ea9445c3223
workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
11 * If your changes are not ready for review yet, click `Start the title with Draft:` under the title. |
9ea9445c3223
workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
12 |
9ea9445c3223
workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
13 More details here: |
9ea9445c3223
workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
14 |
9ea9445c3223
workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
15 * https://www.mercurial-scm.org/wiki/ContributingChanges |
9ea9445c3223
workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
16 * https://www.mercurial-scm.org/wiki/Heptapod |
49535
7b6d3a9bd7be
mr-template: wrap the instructions inside a comment block
Matt Harbison <matt_harbison@yahoo.com>
parents:
49268
diff
changeset
|
17 |
7b6d3a9bd7be
mr-template: wrap the instructions inside a comment block
Matt Harbison <matt_harbison@yahoo.com>
parents:
49268
diff
changeset
|
18 --> |