This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9943

relnotes: elaborate on the side effects of hooks having HGPLAIN=1
ClosedPublic

Authored by mharbison72 on Feb 1 2021, 3:37 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG38d76908c011: relnotes: elaborate on the side effects of hooks having HGPLAIN=1

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Feb 1 2021, 3:37 PM
mharbison72 added a commit: rHG38d76908c011: relnotes: elaborate on the side effects of hooks having HGPLAIN=1.Feb 1 2021, 3:41 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG38d76908c011: relnotes: elaborate on the side effects of hooks having HGPLAIN=1 (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrelnotes/next (6 lines)

Diff 25449

relnotes/next

section). It resolves merges the same was as `internal:merge` and section). It resolves merges the same was as `internal:merge` and
`internal:merge3`, but it shows conflicts differently. Instead of `internal:merge3`, but it shows conflicts differently. Instead of
showing 2 or 3 snapshots of the conflicting pieces of code, it showing 2 or 3 snapshots of the conflicting pieces of code, it
shows one snapshot and a diff. This may be useful when at least one shows one snapshot and a diff. This may be useful when at least one
side of the conflict is similar to the base. The new marker style side of the conflict is similar to the base. The new marker style
is also supported by "premerge" as is also supported by "premerge" as
`merge-tools.<tool>.premerge=keep-mergediff`. `merge-tools.<tool>.premerge=keep-mergediff`.
* External hooks are now called with `HGPLAIN=1` preset. * External hooks are now called with `HGPLAIN=1` preset. This has the side
effect of ignoring aliases, templates, revsetaliases, and a few other config
options in any `hg` command spawned by the hook. The previous behavior
can be restored by setting HGPLAINEXCEPT appropriately in the parent process.
See `hg help environment` for the list of items, and how to set it.
* The `branchmap` cache is updated more intelligently and can be * The `branchmap` cache is updated more intelligently and can be
significantly faster for repositories with many branches and changesets. significantly faster for repositories with many branches and changesets.
== New Experimental Features == == New Experimental Features ==
* `experimental.single-head-per-branch:public-changes-only` can be used * `experimental.single-head-per-branch:public-changes-only` can be used