annotate hgext/color.py @ 31515:527a247f114f

merge: remove unnecessary matcher checks

As part of changing manifest.diff to accept a matcher, a previous patch added
matcher calls to each location in merge.manifestmerge that tested if 'x in mf'
to maintain the same behavior as before. After analyzing it further, this
matcher call isn't needed, and in fact hurts future patches ability to use the
matcher here.

Basically, all these 'if x in mf' checks were checking if a matched file's copy
source was in the matcher as well. This meant if you passed a matcher for just
file foo, it would not return file bar even if foo was a copy of bar. Since
manifestmerge cares about copy information, let's allow all lookups of copy
sources.

We also update one spot with a 'is not None' check, since it wasn't obvious that
the value could sometimes be None before, which broke when we called
matcher(None).

A future patch adds matcher optimizations to manifestmerge which causes this
code path to get covered by existing tests.

# color.py color output for Mercurial commands
#
# Copyright (C) 2007 Kevin Christen <[e-mail]>
#
# 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