topics: update current topic to the topic of newly rebased commit (issue5551)
The rebase code passes branchmerge equals to True while updating to the rebased
commit. We need to make sure topic is preserved even after rebase and hence we
need to update the topic even when branchmerge argument is set to True. But
there is a twist in the tale, merge also uses this part of code and we allow to
update topic when brancmerge is True, in merge cases the topic after merge will
the topic of the destination commit, not the topic of working directory parent.
So we need the function to have information about whether a rebase is going on,
and we do it by wrapping the rebase command and storing some value in the
config. This is a bit hacky but works for now. This patch fixes issue related to
loosing of topic while rebase.
Thanks to Boris Feld for the rigourous tests.
Topic Extension
================
This packages also provides the ``topic`` experiment in an independent
extension. It implements a new experimental concept to provide lightweight
feature branches for the mutable parts of the history. The experiments is still
at an early stage and have significant usability and performance issues when
enabled.
How to Install
==============
The ``topic`` extension is included into the ``evolve` package, so the same instruction apply.
Using Pip
---------
You can install the latest version using pip::
$ pip install --user hg-evolve
Then just enable it in you hgrc::
$ hg config --edit # adds the two line below:
[extensions]
topic =
From Source
-----------
To install a local version from source::
$ hg clone https://www.mercurial-scm.org/repo/evolve/
$ cd evolve
$ make install-home
Enable
------
The topic extensions is included in the evolve package. See the install instruction for evolve.
Then enable it in you configuration::
$ hg config --edit # adds the two line below:
[extensions]
topic =
Documentation
-------------
* See 'hg help -e topic' for a generic help.
* See 'hg help topics' and 'hg help stack' for help on specific commands.
* See the 'tests/test-topic-tutorial.t' file for a quick tutorial.