##// END OF EJS Templates
merge: remove direct rustmod reference...
merge: remove direct rustmod reference We shouldn't rely on this member being present in `dirstate.py`, this creates unnecessary coupling. This also can trigger certain issues in edge-cases where the policy is changed at runtime or multiple Python environments fight, which is an added bonus. Differential Revision: https://phab.mercurial-scm.org/D12217

File last commit:

r46405:84eb4c83 merge default
r49660:d4486810 6.1 stable
Show More
5.6
44 lines | 1.4 KiB | application/x-troff | GroffLexer
Martin von Zweigbergk
relnotes: copy "next" to "5.6" and clear "next"...
r46389 == New Features ==
* `hg mv -A` can now be used with `--at-rev`. It behaves just like
`hg cp -A --at-rev`, i.e. it marks the destination as a copy of the
source whether or not the source still exists (but the source must
exist in the parent revision).
* New revset predicate `diffcontains(pattern)` for filtering revisions
in the same way as `hg grep --diff pattern`.
Augie Fackler
merge with stable
r46405 * The memory footprint per changeset and per file during pull/unbundle
operations has been significantly reduced.
Martin von Zweigbergk
relnotes: copy "next" to "5.6" and clear "next"...
r46389
== New Experimental Features ==
== Bug Fixes ==
== Backwards Compatibility Changes ==
== Internal API Changes ==
* `merge.update()` is now private (renamed to `_update()`). Hopefully
the higher-level functions available in the same module cover your
use cases.
Augie Fackler
merge with stable
r46405 * `phases.registernew` now takes a set of revisions instead of a list
of nodes. `phases.advanceboundary` takes an optional set of revisions
in addition to the list of nodes. The corresponeding members of the
`phasecache` class follow this change.
* The `addgroup` member of `revlog` classes no longer keeps a list of
all found nodes. It now returns True iff a node was found in the group.
An optional callback for duplicated nodes can be used by callers to keep
track of all nodes themselve.
* The `_chaininfocache` of `revlog` classes has been changed from a dict
to a LRU cache.