Changelog

=========

9.1.0 - in progress

-------------------

  * evolve: use the same wording as core in case of unresolved conflict

  * evolve: minor output message improvements

  * evolve: improve `hg evolve --all` behavior when "." is obsolete

  * topic: fix confusion in branch heads checking logic

  * touch: now works on merge commit too

9.0.1 - in progress

-------------------

  * pick: no longer forget file in case of conflict (issue6037)

  * pick: properly report and cleanup "unfinished state"

  * prune: don't update wcp if pruned revision are unrelated (issue6137)

  * evolve: properly prune changeset with no change in case of conflict (issue5967)

9.0.0 -- 2019-06-06

-------------------

  * evolve: preserve the working directory after resolving instability (BC)

            (use `hg next` or `hg evolve --update` to get the old behavior)

  * evolve: evolve all relevant revision by default (BC)

            (use --no-all to evolve only one)

  * evolve: drop compatibility with 4.4

  * evolve: reinstalled compatibility with narrow repositories,

  * evolve: use "unstable" instead of "troubled"

  * evolve: run multiple stabilisation in the same transaction

  * evolve: improve users merging during content-divergence

  * evolve: reduce the verbosity of `content-divergence` resolution

  * documentation: various improvement and vocabulary update

  * packaging: fix documentation build step on debian

  * progress: improved support in various command

  * help: avoid duplicated entry for some templates

  * obsdiscovery: drop support for deprecated discovery protocol `obshash`

    (Make sure your servers are configured to use the obshashrange one.

    It is available in evolve 7.2 and above.)

(topic 0.15.0)

  * stack: handle hash sizes when --debug flag is provided

  * stack: remove 'topic.' prefix from colors/labels (BC)

  * stack: always provide (full) node hash to non-default --template

  * topic: drop the b# alias. It conflicted with normal hashes.

  * topic: add a `experimental.topic.allow-publish` option (default: True)

8.5.1 -- 2019-04-23

-------------------

  * evolve: make sure we use upstream merge code with 5.0,

  * evolve: restore compatibility with 4.4

            (This regress the narrow compatibility)

  * evolve: fix progress display with hg <= 4.6

  * topic: compatibility with mercurial-5.0,

  * topic: improve extensions isolation (issue6121).

8.5.0 -- 2019-04-12

-------------------

  * evolve: fix an recoverable state (issue6053),

  * evolve: share evolve related cache between `shares`,

  * evolve: make sure the extensions are only active on repository that

            enables it (issue6057).

  * evolve: improved compatibility with narrow repositories,

  * evolve: preserve --[no-]update value over --continue,

  * evolve: make sure divergence resolution keep the initial author (issue6113),

  * evolve: improved support for content-divergence with public changesets,

  * pick: align working dir branch with the one from the pick result (issue6089),

  * pick: add the standard `--tool` option,

  * prune: fix error message when pruning public changesets,

  * split: preserve phases (issue6048),

  * touch: fix error message when touching public changesets,

  * uncommit: abort if an explicitly given file cannot be uncommitted.

topic 0.14.0

  * stack: support ranges in revsets indexing,

  * stack: mention divergences unstability,

  * stack: improved and speed --children flag up.

8.4.0 -- 2019-01-22

-------------------

  * compat: add compatibility with Mercurial 4.9

  * compat: drop compatibility with Mercurial 4.3

  * evolve: avoid potential crash when stabilizing orphan merges

  * evolve: pick right destination in split+prune cases issue5686 (hg-4.9 only)

  * evolve: prioritize --rev/--any/--all option over obsolete working directory

  * fold: concatenate commit message in revision order

  * next: evolve aspiring children by default (use --no-evolve to skip)

  * next: pick lower part of a split as destination

  * push: have `--publish` overrule the `auto-publish` config

  * split: accept file patterns

  * split: improve and update the user prompt (BC)

  * split: make it possible to drop change during a split

  * split: no longer accept revision without --rev (BC)

  * split: support for non interactive splits

topic 0.13.0

  * stack: introduce a --children flag (see help for details)

  * stack: support for '#stack[idx]' absolute indexing in revset (hg-4.9+ only)

  * topic: support for '#topic[idx]' relative indexing in revset (hg-4.9+ only)

  * topic: make --age compatible with the usual other display for `hg topic`

  * topics: improve the message around topic changes

8.3.3 -- 2018-12-24

-------------------

  * evolve: properly detect unresolved merge conflict (issue-5966)

  * evolve: fix possible crash when the repo changes during evolve (issue-6028)

  * test: avoid leaking `hg serve` process

  * topic: fix error message for the `ngtip` revset

8.3.2 -- 2018-11-27

-------------------

  * evolve: not longer attempt to translate revision's descriptions (issue6016)

  * evolve: fix compatibility with mercurial 4.8's narrow extension.

  * pick: fix summary help text

  * topic: only use pager when it make senses

8.3.1 -- 2018-10-25

-------------------

  * evolve+topic: fix possible crash during content-divergence evolution

  * use "new" unstabilities vocabulary in help

  * compat: compatibility with Mercurial 4.8rc0

8.3.0 -- 2018-10-12

-------------------

  * evolve: avoid redundant output when handling linear orphans

  * evolve: use stack alias s# in `hg evolve` messages

  * next, prev: use stack alias s# when relevant

  * rewind: add an undo alias

  * caches: skip warming the stablerange cache on strip in "auto" mode

  * topic: properly register the '{topicidx}' for mercurial <= 4.5

  * pullbundle: experimental extension to slice pull in multiple slices whose

                associated bundle can be cached. The extensions is shipped

                alongside evolve only for convenience. It it requires data

                structures that currently live in the evolve extensions.

8.2.1 -- 2018-09-14

-------------------

  * obshashrange: issue the "long stable cache" update message only once

  * obshashrange: reduce impact of cache invalidation from many new obsmarkers

  * caches: properly silence permission error related to caches

8.2.0 -- 2018-09-03

-------------------

  * prune: rename `--biject` flag to `--pair` (old flag is kept as an alias)

  * pick: rename the "grab" command to "pick" to avoid ambiguity with graft

  * discovery: enable obshashrange based discovery by default

topic

  * revset: `topic("patterns")` now handle standard patterns ("re:", etc)

  * revset: `topic(REVS)` matches revisions with same topic as REVS

  * topic: using `s#` alias instead of `t#` and `b#` alias

           (compat with old form is preserved)

8.1.2 -- 2018-08-28

-------------------

  * obshashrange: improved robusness of the cache under heavy load

  * obshashrange: force recomputation of the final obshash related cache

                  (to make sure people benefit from the 8.1.1 fixes)

8.1.1 -- 2018-08-21

-------------------

  * clone: fix possible crash when using clone bundle and forcing cache warming

  * evolve: properly set second parent during conflict (issue5927)

  * next: delete the evolvestate after aborting interrupted `next --evolve`

  * next: fix topic restriction when passing --evolve

  * obshashrange: fix speed and consistency issues during cache invalidation

  * obshashrange: properly persist all caches involved in obshashrange discovery

  * prune: improve documentation

8.1.0 -- 2018-08-03

-------------------

  * compatibility with mercurial 4.7

  * evolve: improve multiple aspect of content-divergence resolution

            * branch changes handling,

            * parent changes handling,

            * description changes handling,

            * divergent stack handling,

            * improved resume, stop and abort of divergent resolution

  * evolve: improved automatic resolution of phase-divergence

  * evolve: add a --update and --no-update flag to evolve to control final

            working copy parent

  * evolve: show `hg help evolve.interrupted-evolve` in error when conflicts

  * evolve: show unfinished state information in `hg status -v` (issue5886)

  * evolve: move bookmarks also when updating to successors (issue5923)

  * evolve: improve orphan resolution when combined with divergence (issue5946)

  * amend: abort `--patch` by saving an empty file (issue5925)

  *

  * evolve: add a new `--no-update` flag to keep working copy on the initial

            revision.

  * evolve: new help section dedicated to resuming operation interrupted by

            merge conflit, `hg help evolve.interrupted`.

  * obslog: --filternonlocal

  * rewind: first limited version of `rewind` command to restore stack of commit to a

            precusors state (check command help for detail and limitation)

topic (0.10.0)

  * display a hint when a topic becomes empty

8.0.1 -- 2018-06-11

-------------------

  * compatibility with mercurial 4.6.1

  * next-prev: respect commands.update.check config option (issue5808)

  * next-prev: fix `evolve --abort` on conflicts (issue5897)

  * obslog: fix breakage when commit has no description

  * amend: use context manager for locks (issue5887)

  * evolve: fix detection of interactive shell

topic (0.9.1)

  * topic: fix documentation formatting

8.0.0 -- 2018-04-25

-------------------

  * evolve: a new `--abort` flag which aborts an interrupted evolve

            resolving orphans,

  * `hg evolve` now return 0 if there is nothing to evolve,

  * amend: a new `--patch` flag to make changes to wdir parent by editing patch,

  * evolve: fixed some memory leak issue,

  * evolve: prevent some crash with merge and split (issue5833 and issue5832),

  * evolve: improvemed support for solving phase-divergence situation,

  * evolve: improvemed support for solving orphan situation,

  * obsdiscovery: added unit to various progress bar,

  * evolve: record "operation" for command where it was missing,

  * compatibility with Mercurial 4.6

  * drop support for Mercurial 4.1 and 4.2

  * `--obsolete` and `--old-obsolete` flags for `hg graft` are dropped

  * templatekw: remove `obsfatedata` templatekw. Individuals fields are

    available in core as single template functions.

  * topic: restraining name to letter, '-', '_' and '.'

7.3.0 -- 2018-03-21

---------------------

  * grab: new command to grab a changeset, put in on wdir parent

          and update to it

  * resolve: shows how to continue evolve after resolving all conflicts

  * evolve: `--continue` flag now continue evolving all the remaining revisions

  * prev and next now prompts user to choose a changeset in case of ambiguity

  * evolve: a new `--stop` flag which can be used to stop interrupted evolution

  * fold: fix issue related to bookmarks movement (issue5772)

  * amend: take lock before parsing the commit description (issue5266)

  * legacy: respect 'server.bundle1' config if any is set

  * previous: fix behavior on obsolete rev when topic is involved (issue5708)

7.2.1 --2018-01-20

-------------------

  * compatibility with future Mercurial 4.5

  * fix a packaging issue affect `hg evolve --continue`

  * fix "automatic" cache warming mode for push (client side)

7.2.0 -- 2018-01-15

-------------------

  * evolve: changes to the on disk format for interrupted evolve

  * evolve: --continue now propertly preserve phase information (issue5720)

  * evolve: --continue now properly reports merges as evolve

  * commit: suggest using topic on new heads

  * uncommit: `--revert` flag added to clean the wdir after uncommit

  * obslog: add color support to content-diff output with --patch

  * fix `hg prev` behavior on obsolete changesets

  * no longer issues "obsolete working copy" message during no-op

  * use the new instabilities names from mercurial 4.4+

    (in `hg evolve --list` and other messages)

  * new algorithm for obshashrange discovery:

    The new algorithm is faster, simpler to cache and with better complexity. It

    is able to handle repository of any size (naive python implementation is a

    bit slow). Support for the previous experimental approach have been

    dropped, please update both clients and servers. The new approach is still

    hidden behind and experimental flag for now.

topic (0.7.0)

  * fix compatibility with Mercurial-4.3

  * new template keyword `topic` to get changesets topic

7.1.0 -- 2017-12-12

-------------------

  * verbosity: respect --quiet for prev, next and summary

  * note: add a `-n/--note` flag to all history rewritting commands

  * obslog: shows the obsmarkers notes

  * obsdiscover: Improved stable range slice for the experimental obshashrange

                 (client and server need to upgrade to this version)

  * split: preserve the branch of the source changeset

topic (0.6.0)

  * add a new 'serverminitopic' extension for minimal server support

    (see `hg help -e serverminitopic` for details)

  * add a new config option `experimental.topic-mode.server` using which a

    server can reject draft changesets without topic

  * fix behavior of `hg stack` in cases of split

  * makes code more resilient to partiel initialization

  * avoid over wrapping inside of long living process

7.0.1 -- 2017-11-14

-------------------

  * obsdiscovery: allow the config option to disable discovery server side

    (it was previously only honored on the client side)

  * server: avoid exposing 'abort' to evolution enabled client talking

            to server with the extension bu obsolescence marker exchange

            disabled.

topic (0.5.1)

  * fix new-heads check when pushing new topic with --publish.

7.0.0 -- 2017-11-02

-------------------

  * drop compatibility with Mercurial 3.8, 3.9 and 4.0,

  * drop support for old and deprecated method to exchange obsmarkers,

  * forbid usage of the old pushbey based protocol to exchange obsmarkers,

  * evolve: rename '--contentdivergent' flag to '--content-divergent',

  * evolve: rename '--phasedivergent' flag to '--phase-divergent'.

topic (0.5.0)

  * add an experimental flag to enforce one head per name policy,

    (off by default, see 'hg help -e topic' for details)

  * add an experimental flag to have changesets without topic published on push,

    (off by default, see 'hg help -e topic' for details)

  * add a '--publish' flag to `hg push` (4.4+ only).

6.8.0 -- 2017-10-23

-------------------

  * compatibility with Mercurial 4.4

    (use upstream implementation for obsfate and effect-flags starting hg 4.4+)

  * pager: pager support to `obslog` and `evolve --list`

topic(0.4.0)

  * topic: fix handling of bookmarks and phases while changing topics.

           (mercurial 4.2 and above only)

  * topic: fix 'topic-mode' behavior when amending

  * pager: pager support to `topics` and `stack`

6.7.1 -- 2017-10-10

-------------------

  * obsfate: fix case were current user would disapear from the user list

topic (0.3.1)

  * topic: introduce a documented 'experimental.topic-mode' config

  * topic: add support for 'random' topic mode (see documentation for details)

  * stack: fix evolution preview for simple split.

  * fix a performance regression affecting all transactions.

    (the more non public changeset (hidden included), the slower)

6.7.0 -- 2017-09-27

-------------------

  * compatibility with change in future 4.4 at this release date,

  * documentation: improvement to content, wording and graphs,

  * obslog: improved templatability,

  * obslog/log: improve verb used to describe and evolution,

  * pstatus/pdiff: update to full command. They now appears in the help,

  * uncommit: add a --interactive option (4.3+ only).

topic (0.3.0)

  * push: add a --topic option to mirror --bookmark and --branch,

  * stack: improve display of interleaved topic,

  * stack: improve display of merge commit,

  * topic: add a new 'debugconvertbookmark' commands (4.3+ only),

    It helps migrating from bookmark feature branch to topic feature branch,

  * topic: --age flag also shows the user who last touched the topic,

  * topic: be more informative about topic activation and deactivation,

  * topic: gain a --current flag,

  * topic: small clarification and cleanup on various output.

6.6.0 -- 2017-07-25

-------------------

  - amend: add a --extract flag to move change back to the working copy,

    (same as uncommit, but accessible through the amend commit)

  - split: now properly refuse to split public changeset,

  - commands: unify and improve the pre-rewrite validation and error message,

  - uncommit: add support for --current-date and --current-user option,

  - fold: add support for --current-date and --current-user option,

  - metaedit: add support for --current-date and --current-user option,

  - split: add support for --current-date and --current-user option,

  - compat: use various new API instead of the one deprecated in 4.3,

    (when available)

  - documentation: various minor documentation update.

topic (0.2.0):

  - topic: add --age option to sort topic by the most recently touched,

  - topic: add a 't0' to access the root of a topic while keeping it active,

  - topic: allow 'hg prev' to me move to 't0',

  - topic: add a config option to enforce topic on new commit,

    (experimental.enforce-topic)

  - topic: make command names valid as expected, even if ui.strict=true.

6.5.0 -- 2017-07-02

-------------------

features:

 - obslog: gain a --patch flag to display changes introduced by the evolution

  (Currently limited to in simple case only)

 - log: display obsolescence fate by default, (future 4.3 only)

 - doc: various minor improvement.

bugfixes:

 - evolve: fix branch preservation for merge,

 - obsfate: improve support for advanced template reformating,

 - split: preserve author of the splitted changeset.

 - grab: properly fix hg executable on windows.

topic (0.1.0):

 - stack: also show the unstable status for the current changeset, (issue5553)

 - stack: properly abort when and unknown topic is requested,

 - stack: add basic and raw support for named branches,

 - topic: changing topic on revs no longer adds extra instability, (issue5441)

 - topic: topics: rename '--change' flag to '--rev' flag,

 - topic: multiple large performance improvements,

 - topic: various small output improvement,

 - topic: improved topic preservation for various commands.

6.4.0 -- 2017-06-16

-------------------

 - template: signifiant improvement to the '{obsfate}' template (now 4.2+ only)

 - template: fix 'successors' and 'precursors' template to expose hex-node

 - effect flag: the experiment is now active by default,

   (see 'hg help -e evolve' to opt out)

 - effect flag: fix a small bug related to hidden changeset,

 - obscache: reduce impact on large repository

 - obshashrange: install a '.max-revs' option see extension help for details

6.3.1 -- 2017-06-01

-------------------

 - also backport the "revelant-markers" fix when using "evolve.serveronly"

6.3.0 -- 2017-05-31

-------------------

 - olog: add an 'obslog' alias