Show More
1 | NO CONTENT: file copied from relnotes/next to relnotes/5.7 |
|
NO CONTENT: file copied from relnotes/next to relnotes/5.7 |
@@ -1,59 +1,8 b'' | |||||
1 | == New Features == |
|
1 | == New Features == | |
2 |
|
2 | |||
3 | * There is a new config section for templates used by hg commands. It |
|
|||
4 | is called `[command-templates]`. Some existing config options have |
|
|||
5 | been deprecated in favor of config options in the new |
|
|||
6 | section. These are: `ui.logtemplate` to `command-templates.log`, |
|
|||
7 | `ui.graphnodetemplate` to `command-templates.graphnode`, |
|
|||
8 | `ui.mergemarkertemplate` to `command-templates.mergemarker`, |
|
|||
9 | `ui.pre-merge-tool-output-template` to |
|
|||
10 | `command-templates.pre-merge-tool-output`. |
|
|||
11 |
|
||||
12 | * There is a new set of config options for the template used for the |
|
|||
13 | one-line commit summary displayed by various commands, such as `hg |
|
|||
14 | rebase`. The main one is `command-templates.oneline-summary`. That |
|
|||
15 | can be overridden per command with |
|
|||
16 | `command-templates.oneline-summary.<command>`, where `<command>` |
|
|||
17 | can be e.g. `rebase`. As part of this effort, the default format |
|
|||
18 | from `hg rebase` was reorganized a bit. |
|
|||
19 |
|
||||
20 | * `hg strip`, from the strip extension, is now a core command, `hg |
|
|||
21 | debugstrip`. The extension remains for compatibility. |
|
|||
22 |
|
||||
23 | * `hg diff` and `hg extdiff` now support `--from <rev>` and `--to <rev>` |
|
|||
24 | arguments as clearer alternatives to `-r <revs>`. `-r <revs>` has been |
|
|||
25 | deprecated. |
|
|||
26 |
|
||||
27 | * The memory footprint per changeset during pull/unbundle |
|
|||
28 | operations has been further reduced. |
|
|||
29 |
|
||||
30 | * There is a new internal merge tool called `internal:mergediff` (can |
|
|||
31 | be set as the value for the `merge` config in the `[ui]` |
|
|||
32 | section). It resolves merges the same was as `internal:merge` and |
|
|||
33 | `internal:merge3`, but it shows conflicts differently. Instead of |
|
|||
34 | showing 2 or 3 snapshots of the conflicting pieces of code, it |
|
|||
35 | shows one snapshot and a diff. This may be useful when at least one |
|
|||
36 | side of the conflict is similar to the base. The new marker style |
|
|||
37 | is also supported by "premerge" as |
|
|||
38 | `merge-tools.<tool>.premerge=keep-mergediff`. |
|
|||
39 |
|
||||
40 | * External hooks are now called with `HGPLAIN=1` preset. This has the side |
|
|||
41 | effect of ignoring aliases, templates, revsetaliases, and a few other config |
|
|||
42 | options in any `hg` command spawned by the hook. The previous behavior |
|
|||
43 | can be restored by setting HGPLAINEXCEPT appropriately in the parent process. |
|
|||
44 | See `hg help environment` for the list of items, and how to set it. |
|
|||
45 |
|
||||
46 | * The `branchmap` cache is updated more intelligently and can be |
|
|||
47 | significantly faster for repositories with many branches and changesets. |
|
|||
48 |
|
||||
49 |
|
3 | |||
50 | == New Experimental Features == |
|
4 | == New Experimental Features == | |
51 |
|
5 | |||
52 | * `experimental.single-head-per-branch:public-changes-only` can be used |
|
|||
53 | restrict the single head check to public revision. This is useful for |
|
|||
54 | overlay repository that have both a publishing and non-publishing view |
|
|||
55 | of the same storage. |
|
|||
56 |
|
||||
57 |
|
6 | |||
58 | == Bug Fixes == |
|
7 | == Bug Fixes == | |
59 |
|
8 | |||
@@ -61,9 +10,6 b'' | |||||
61 |
|
10 | |||
62 | == Backwards Compatibility Changes == |
|
11 | == Backwards Compatibility Changes == | |
63 |
|
12 | |||
64 | * `--force-lock` and `--force-wlock` options on `hg debuglock` command are |
|
|||
65 | renamed to `--force-free-lock` and `--force-free-wlock` respectively. |
|
|||
66 |
|
||||
67 |
|
13 | |||
68 | == Internal API Changes == |
|
14 | == Internal API Changes == | |
69 |
|
15 |
General Comments 0
You need to be logged in to leave comments.
Login now