Mercurial > hg
view hgext/color.py @ 31380:65d93d712777
rebase: allow rebasing children of wd to wd if a new branch has been set (BC)
The named branch of the leaf changeset can be changed by updating to it,
setting the branch, and amending.
But previously, there was no good way to *just* change the branch of several
linear changes. If rebasing changes with another parent to '.', it would pick
up a pending branch change up. But when rebasing changes that have the same
parent, it would fail with 'nothing to rebase', even when the branch name was
set differently.
To fix this, allow rebasing to same parent when a branch has been set.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sun, 12 Mar 2017 16:44:01 -0700 |
parents | df0a0734304a |
children | e86eb75e74ce |
line wrap: on
line source
# color.py color output for Mercurial commands # # Copyright (C) 2007 Kevin Christen <kevin.christen@gmail.com> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. '''enable Mercurial color mode (DEPRECATED) This extensions enable Mercurial color mode. The feature is now directly available in Mercurial core. You can access it using:: [ui] color = auto See :hg:`help color` for details. ''' from __future__ import absolute_import from mercurial import color # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. testedwith = 'ships-with-hg-core' def extsetup(ui): # change default color config color._enabledbydefault = True