rebase: use scmutil.cleanupnodes (issue5606) (BC) This patch migrates rebase to use scmutil.cleanupnodes API. It simplifies the code and makes rebase code reusable inside a transaction. This is a BC because the backup file is no longer strip-backup/*-backup.hg, but strip-backup/*-rebase.hg. The latter looks more reasonable since the directory name is "strip-backup" so there is no need to repeat "backup". I think the backup file name change is probably fine as a BC, since we have changed it before (aa4a1672583e) and didn't get complains. The end result of this series will be a much more consistent and unified backup names: command | old backup file suffix | new backup file suffix ------------------------------------------------------------------- amend | amend-backup.hg | amend.hg histedit | backup.hg (could be 2 files) | histedit.hg (single file) rebase | backup.hg | rebase.hg strip | backup.hg | backup.hg (note: backup files are under .hg/strip-backup) It also fixes issue5606 as a side effect because the new "delayedstrip" code path will carefully examine nodes (safestriproots) to make sure orphaned changesets won't get stripped by accident. Some warning messages are changed to the new "warning: orphaned descendants detected, not stripping HASHES", which provides more information about exactly what changesets are left behind. Another minor behavior change is when there is an obsoleted changeset with a successor in the destination branch, bookmarks pointing to that obsoleted changeset will not be moved. I have commented in test-rebase-obsolete.t explaining why that is more desirable.

     1

# color.py color output for Mercurial commands

     2

#

     3

# Copyright (C) 2007 Kevin Christen <kevin.christen@gmail.com>

     4

#

     5

# This software may be used and distributed according to the terms of the

     6

# GNU General Public License version 2 or any later version.

     7

     8

'''enable Mercurial color mode (DEPRECATED)

     9

    10

This extension enables Mercurial color mode. The feature is now directly

    11

available in Mercurial core. You can access it using::

    12

    13

  [ui]

    14

  color = auto

    15

    16

See :hg:`help color` for details.

    17

'''

    18

    19

from __future__ import absolute_import

    20

    21

from mercurial import color

    22

    23

# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for

    24

# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should

    25

# be specifying the version(s) of Mercurial they are tested with, or

    26

# leave the attribute unspecified.

    27

testedwith = 'ships-with-hg-core'

    28

    29

def extsetup(ui):

    30

    # change default color config

    31

    color._enabledbydefault = True