|
1 == New Features == |
|
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 purge` is now a core command using `--confirm` by default. |
|
21 |
|
22 * `hg strip`, from the strip extension, is now a core command, `hg |
|
23 debugstrip`. The extension remains for compatibility. |
|
24 |
|
25 * `hg diff` and `hg extdiff` now support `--from <rev>` and `--to <rev>` |
|
26 arguments as clearer alternatives to `-r <revs>`. `-r <revs>` has been |
|
27 deprecated. |
|
28 |
|
29 * The memory footprint per changeset during pull/unbundle |
|
30 operations has been further reduced. |
|
31 |
|
32 * There is a new internal merge tool called `internal:mergediff` (can |
|
33 be set as the value for the `merge` config in the `[ui]` |
|
34 section). It resolves merges the same was as `internal:merge` and |
|
35 `internal:merge3`, but it shows conflicts differently. Instead of |
|
36 showing 2 or 3 snapshots of the conflicting pieces of code, it |
|
37 shows one snapshot and a diff. This may be useful when at least one |
|
38 side of the conflict is similar to the base. The new marker style |
|
39 is also supported by "premerge" as |
|
40 `merge-tools.<tool>.premerge=keep-mergediff`. |
|
41 |
|
42 * External hooks are now called with `HGPLAIN=1` preset. This has the side |
|
43 effect of ignoring aliases, templates, revsetaliases, and a few other config |
|
44 options in any `hg` command spawned by the hook. The previous behavior |
|
45 can be restored by setting HGPLAINEXCEPT appropriately in the parent process. |
|
46 See `hg help environment` for the list of items, and how to set it. |
|
47 |
|
48 * The `branchmap` cache is updated more intelligently and can be |
|
49 significantly faster for repositories with many branches and changesets. |
|
50 |
|
51 * The `rev-branch-cache` is now updated incrementally whenever changesets |
|
52 are added. |
|
53 |
|
54 |
|
55 == New Experimental Features == |
|
56 |
|
57 * `experimental.single-head-per-branch:public-changes-only` can be used |
|
58 restrict the single head check to public revision. This is useful for |
|
59 overlay repository that have both a publishing and non-publishing view |
|
60 of the same storage. |
|
61 |
|
62 |
|
63 == Bug Fixes == |
|
64 |
|
65 |
|
66 |
|
67 == Backwards Compatibility Changes == |
|
68 |
|
69 * `--force-lock` and `--force-wlock` options on `hg debuglock` command are |
|
70 renamed to `--force-free-lock` and `--force-free-wlock` respectively. |
|
71 |
|
72 |
|
73 == Internal API Changes == |
|
74 |
|
75 * `changelog.branchinfo` is deprecated and will be removed after 5.8. |
|
76 It is superseded by `changelogrevision.branchinfo`. |