Merge lp:~jdahlin-deactivatedaccount/bzr-grep/color-option into lp:bzr-grep

[Johan Dahlin]

This adds a global option so you don't have to type --color=auto all the time.

[Jelmer Vernooij (jelmer)]

This seems reasonable, though it would be nice to have a test for the option.

review: Approve (code)

[Johan Dahlin (jdahlin-deactivatedaccount)]

I don't have the necessary permissions to merge it into lp:bzr-grep.

[Jelmer Vernooij (jelmer)]

Hi Johan,

On 28/06/11 15:51, Johan Dahlin wrote:
> I don't have the necessary permissions to merge it into lp:bzr-grep.
I don't have access either. Hopefully Parth will be able to review and
merge it.

Cheers,

Jelmer

[Parth Malwankar (parthm)]

Thanks for the patch Johan.

Sorry for the delay. Things are a little crazy at work. I will do the merge this weekend.
Could you please make a NEWS entry for this enhancement?

I am not sure why we have a permissions issue as the project maintainer is set to Bazaar Developers (~bzr).

Regards,
Parth

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-02-20 00:34:00 +0000
+++ cmds.py	2011-06-17 13:03:27 +0000
@@ -19,6 +19,7 @@
 from bzrlib import errors
 from bzrlib.commands import Command, display_command
 from bzrlib.option import Option, ListOption
+from bzrlib.config import GlobalConfig
 
 # FIXME: _parse_levels should be shared with bzrlib.builtins. this is a copy
 # to avoid the error
@@ -143,7 +144,7 @@
             from_root=False, null=False, levels=None, line_number=False,
             path_list=None, revision=None, pattern=None, include=None,
             exclude=None, fixed_string=False, files_with_matches=False,
-            files_without_match=False, color='never', diff=False):
+            files_without_match=False, color=None, diff=False):
         from bzrlib.plugins.grep import (
             grep,
             termcolor,
@@ -159,6 +160,14 @@
             raise errors.BzrCommandError('cannot specify both '
                 '-l/--files-with-matches and -L/--files-without-matches.')
 
+        global_config = GlobalConfig()
+
+        if color is None:
+            color = global_config.get_user_option('grep_color')
+
+        if color is None:
+            color = 'never'
+
         if color not in ['always', 'never', 'auto']:
             raise errors.BzrCommandError('Valid values for --color are '
                 '"always", "never" or "auto".')