Show More
@@ -1,59 +1,78 b'' | |||||
1 | '''This is the last release to support Python 2. Mercurial is Python 3 only starting with 6.2''' |
|
1 | '''This is the last release to support Python 2. Mercurial is Python 3 only starting with 6.2''' | |
2 |
|
2 | |||
3 |
= Mercurial 6.1 |
|
3 | = Mercurial 6.1.1 = | |
|
4 | ||||
|
5 | * Fix Rust compilation on `aarcch64` | |||
|
6 | * Fix Rust compilation on architectures where `char` is unsigned | |||
|
7 | * When the merge tool uses `$output`, don't leave markers in `$local` | |||
|
8 | * Improve test suite support on big-endian platforms | |||
|
9 | * Cap the number of concurrent threads to 16 in Rust `hg status` to prevent huge speed regression at higher thread counts | |||
|
10 | * Fix `amend` with copies in extras | |||
|
11 | * Abort if commit we're trying to `unamend` was not created by `hg [un]amend` | |||
|
12 | * Fix file name in the pullbundle help text | |||
|
13 | * Fix an issue with data not being correctly reset in the C implementation of dirstate-v2 | |||
|
14 | * Fix issue6673 where some tags were missing from cache after a merge | |||
|
15 | * Fix stream-cloning a repo with empty requirements | |||
|
16 | * Fix a false warning about content-divergence creation | |||
|
17 | * Fix silly blackbox entries when hg is interrupted | |||
|
18 | * Fix unsoundness (no known exploits) in Rust extensions (see cfd270d83169 and dd6b67d5c256) | |||
|
19 | * Fix Rust dirstate counters not being updated correctly leading to some potential bugs (none known) | |||
|
20 | * Stop relying on a compiler implementation detail in Rust HgPath | |||
|
21 | ||||
|
22 | = Mercurial 6.1 = | |||
4 |
|
23 | |||
5 | == New Features == |
|
24 | == New Features == | |
6 | * Added a way of specifying required extensions that prevent Mercurial from starting if they are not found. See `hg help config.extensions`. |
|
25 | * Added a way of specifying required extensions that prevent Mercurial from starting if they are not found. See `hg help config.extensions`. | |
7 | * Merge conflict markers have been made clearer (see backwards compatibility below) |
|
26 | * Merge conflict markers have been made clearer (see backwards compatibility below) | |
8 | * Improve detailed error codes |
|
27 | * Improve detailed error codes | |
9 | * Added a hint about mangled whitespace on bad patch |
|
28 | * Added a hint about mangled whitespace on bad patch | |
10 | * Explain which order the commits are presented in `chistedit` |
|
29 | * Explain which order the commits are presented in `chistedit` | |
11 | * Introduce a `dirstate-tracked-hint` feature to help automation keep track of changes to tracked files. See `hg help config.use-dirstate-tracked-hint`. |
|
30 | * Introduce a `dirstate-tracked-hint` feature to help automation keep track of changes to tracked files. See `hg help config.use-dirstate-tracked-hint`. | |
12 | * Shared repositories can be upgraded if the upgrade is specific to the share. For now, this only applies to `dirstate-v2` and `dirstate-tracked-hint`. |
|
31 | * Shared repositories can be upgraded if the upgrade is specific to the share. For now, this only applies to `dirstate-v2` and `dirstate-tracked-hint`. | |
13 | * When using the `narrow` extension, non-conflicting changes to files outside of the narrow specification can now be merged. |
|
32 | * When using the `narrow` extension, non-conflicting changes to files outside of the narrow specification can now be merged. | |
14 | * When cloning a repository using stream-clone, the client can now control the repository format variants to use as long as the stream content does not restrict that variant. |
|
33 | * When cloning a repository using stream-clone, the client can now control the repository format variants to use as long as the stream content does not restrict that variant. | |
15 |
|
34 | |||
16 | == Default Format Change == |
|
35 | == Default Format Change == | |
17 |
|
36 | |||
18 | These changes affect newly created repositories (or new clones) done with Mercurial 6.1. |
|
37 | These changes affect newly created repositories (or new clones) done with Mercurial 6.1. | |
19 |
|
38 | |||
20 | * The `share-safe` format variant is now enabled by default. It makes configuration and requirements more consistent across repository and their shares. This introduces a behavior change as shares from a repository using the new format will also use their main repository's configuration. See `hg help config.format.use-share-safe` for details about the feature and the available options for auto-upgrading existing shares. |
|
39 | * The `share-safe` format variant is now enabled by default. It makes configuration and requirements more consistent across repository and their shares. This introduces a behavior change as shares from a repository using the new format will also use their main repository's configuration. See `hg help config.format.use-share-safe` for details about the feature and the available options for auto-upgrading existing shares. | |
21 |
|
40 | |||
22 |
|
41 | |||
23 | == New Experimental Features == |
|
42 | == New Experimental Features == | |
24 | * The pure Rust version of Mercurial called `rhg` added support for most common invocations of `hg status`. See `hg help rust.rhg` for details on how to try it out. |
|
43 | * The pure Rust version of Mercurial called `rhg` added support for most common invocations of `hg status`. See `hg help rust.rhg` for details on how to try it out. | |
25 | * `rhg` supports narrow clones and sparse checkouts. |
|
44 | * `rhg` supports narrow clones and sparse checkouts. | |
26 |
|
45 | |||
27 | == Bug Fixes == |
|
46 | == Bug Fixes == | |
28 |
|
47 | |||
29 | * '''Obsolete revisions are skipped while computing heads. In conjunction with the `evolve` extension >= 10.5.0, this leads to massive exchange (push/pull) speedups in repositories with a lot of heads and/or obsolete revisions.''' |
|
48 | * '''Obsolete revisions are skipped while computing heads. In conjunction with the `evolve` extension >= 10.5.0, this leads to massive exchange (push/pull) speedups in repositories with a lot of heads and/or obsolete revisions.''' | |
30 | * Stream-clones now properly advertise all requirements needed. This can result in the stream-clone feature being disabled for some clients using < 6.0.2. A small bugfix patch for these older client is available if necessary. |
|
49 | * Stream-clones now properly advertise all requirements needed. This can result in the stream-clone feature being disabled for some clients using < 6.0.2. A small bugfix patch for these older client is available if necessary. | |
31 | * The `--no-check` and `--no-merge` flags now properly overwrite the behavior from `commands.update.check` |
|
50 | * The `--no-check` and `--no-merge` flags now properly overwrite the behavior from `commands.update.check` | |
32 | * `rhg`'s fallback detection is more robust in general in the presence of more advanced configs |
|
51 | * `rhg`'s fallback detection is more robust in general in the presence of more advanced configs | |
33 | * `rhg`'s `blackbox` now supports milliseconds by default and uses the same ISO 8601 format as the Python implementation |
|
52 | * `rhg`'s `blackbox` now supports milliseconds by default and uses the same ISO 8601 format as the Python implementation | |
34 | * Fix `rhg` crash on non-generaldelta revlogs |
|
53 | * Fix `rhg` crash on non-generaldelta revlogs | |
35 | * The `lfs`, `largefiles` and `sparse` extensions now correctly take the appropriate lock before writing requirements |
|
54 | * The `lfs`, `largefiles` and `sparse` extensions now correctly take the appropriate lock before writing requirements | |
36 | * The `notify` extension does not produce errors anymore if a revision is not found |
|
55 | * The `notify` extension does not produce errors anymore if a revision is not found | |
37 | * Remove unnecessary and overly strict check for divergence in `hg fix` |
|
56 | * Remove unnecessary and overly strict check for divergence in `hg fix` | |
38 | * Windows compatibility improvements |
|
57 | * Windows compatibility improvements | |
39 | * Miscellaneous Python 3 and typing improvements |
|
58 | * Miscellaneous Python 3 and typing improvements | |
40 | * Many other small or internal fixes |
|
59 | * Many other small or internal fixes | |
41 |
|
60 | |||
42 | == Backwards Compatibility Changes == |
|
61 | == Backwards Compatibility Changes == | |
43 |
|
62 | |||
44 | * The use of `share-safe`, means shares (of new repositories) will also use their main repository's configuration see the `Default Format Change` section for details. |
|
63 | * The use of `share-safe`, means shares (of new repositories) will also use their main repository's configuration see the `Default Format Change` section for details. | |
45 | * The fix to stream-clone requirements advertising means some requirements previously (wrongly) omitted are now sent. This can confuse client using a Mercurial version < 6.0.2. The client would consider these requirements unsupported even if it actually know them. If you encounter this, either upgrade your client or apply the necessary patch. |
|
64 | * The fix to stream-clone requirements advertising means some requirements previously (wrongly) omitted are now sent. This can confuse client using a Mercurial version < 6.0.2. The client would consider these requirements unsupported even if it actually know them. If you encounter this, either upgrade your client or apply the necessary patch. | |
46 | * The labels passed to merge tools have changed slightly. Merge tools can get labels passed to them if you include `$labellocal`, `$labelbase`, and/or `$labelother` in the `merge-tool.<tool name>.args` configuration. These labels used to have some space-padding, and truncation to fit within 72 columns. Both the padding and the truncation has been removed. |
|
65 | * The labels passed to merge tools have changed slightly. Merge tools can get labels passed to them if you include `$labellocal`, `$labelbase`, and/or `$labelother` in the `merge-tool.<tool name>.args` configuration. These labels used to have some space-padding, and truncation to fit within 72 columns. Both the padding and the truncation has been removed. | |
47 | * Some of the text in labels passed to merge tools has changed. For example, in conflicts while running `hg histedit`, the labels used to be "local", "base", and "histedit". They are now "already edited", "parent of current change", and "current change", respectively. |
|
66 | * Some of the text in labels passed to merge tools has changed. For example, in conflicts while running `hg histedit`, the labels used to be "local", "base", and "histedit". They are now "already edited", "parent of current change", and "current change", respectively. | |
48 | * The computation of namedbranch heads now ignores obsolete revisions. User of the Changeset Evolution feature may see a change in location and numbers of heads of each named branches (and topic). |
|
67 | * The computation of namedbranch heads now ignores obsolete revisions. User of the Changeset Evolution feature may see a change in location and numbers of heads of each named branches (and topic). | |
49 | * The remotefilelog extension now requires an appropriate excludepattern for subrepositories. |
|
68 | * The remotefilelog extension now requires an appropriate excludepattern for subrepositories. | |
50 | * `debugsparse`'s interface has been reworked to be more flexible. Since it's a debug command it is not actually a breaking change, but it is worth noting here. |
|
69 | * `debugsparse`'s interface has been reworked to be more flexible. Since it's a debug command it is not actually a breaking change, but it is worth noting here. | |
51 | * Temporary files for merges are now all inside a `hgmerge` directory instead of at the root of `TMPDIR`. The corresponding experimental `mergetempdirprefix` config option has been removed. |
|
70 | * Temporary files for merges are now all inside a `hgmerge` directory instead of at the root of `TMPDIR`. The corresponding experimental `mergetempdirprefix` config option has been removed. | |
52 |
|
71 | |||
53 | == Internal API Changes == |
|
72 | == Internal API Changes == | |
54 |
|
73 | |||
55 | * The dirstate API received minor modifications. |
|
74 | * The dirstate API received minor modifications. | |
56 |
|
75 | |||
57 | == Miscellaneous == |
|
76 | == Miscellaneous == | |
58 |
|
77 | |||
59 | * Removed exchange-v2. It was a prototype that had never been in a working state and had been left untouched since 2017. |
|
78 | * Removed exchange-v2. It was a prototype that had never been in a working state and had been left untouched since 2017. |
General Comments 0
You need to be logged in to leave comments.
Login now