← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to hunk_selector.py

  • Committer: Aaron Bentley
  • Date: 2006-08-07 03:07:35 UTC
  • mto: This revision was merged to the branch mainline in revision 425.
  • Revision ID: aaron.bentley@utoronto.ca-20060807030735-0a9f8330ce1a836a
Add --no-color option to shelf

Show diffs side-by-side

added added

removed removed

Lines of Context:
hunk_selector.py
1
1
import sys
2
2
 
3
3
from userinteractor import UserInteractor, UserOption
 
4
from errors import NoColor
4
5
import copy
5
6
 
6
7
class HunkSelector:
7
8
    strings = {}
8
9
 
9
 
    def __init__(self, patches):
10
 
        try:
11
 
            from colordiff import DiffWriter
12
 
            from terminal import has_ansi_colors
13
 
            if has_ansi_colors():
14
 
                self.diff_stream = DiffWriter(sys.stdout)
15
 
            else:
 
10
    def __init__(self, patches, color=None):
 
11
        if color is True or color is None:
 
12
            try:
 
13
                from colordiff import DiffWriter
 
14
                from terminal import has_ansi_colors
 
15
                if has_ansi_colors():
 
16
                    self.diff_stream = DiffWriter(sys.stdout)
 
17
                else:
 
18
                    if color is True:
 
19
                        raise NoColor()
 
20
                    self.diff_stream = sys.stdout
 
21
            except ImportError:
 
22
                if color is True:
 
23
                    raise NoBzrtoolsColor()
16
24
                self.diff_stream = sys.stdout
17
 
        except ImportError:
 
25
        else:
18
26
            self.diff_stream = sys.stdout
 
27
            
19
28
        self.standard_options = [
20
29
            UserOption('y', self._selected, self.strings['select_desc'],
21
30
                default=True),
163
172
        return (selected_patches, unselected_patches)
164
173
 
165
174
class ShelveHunkSelector(HunkSelector):
166
 
    def __init__(self, patches):
 
175
    def __init__(self, patches, color=None):
167
176
        self.strings = {}
168
177
        self.strings['status_selected'] = '%d hunks to be shelved'
169
178
        self.strings['status_unselected'] = '%d hunks to be kept'
172
181
        self.strings['finish_desc'] = 'shelve selected changes.'
173
182
        self.strings['prompt'] = 'Shelve this change? (%(count)d of %(total)d)'
174
183
        self.strings['end_prompt'] = 'Shelve these changes?'
175
 
        HunkSelector.__init__(self, patches)
 
184
        HunkSelector.__init__(self, patches, color)
176
185
 
177
186
class UnshelveHunkSelector(HunkSelector):
178
 
    def __init__(self, patches):
 
187
    def __init__(self, patches, color=None):
179
188
        self.strings = {}
180
189
        self.strings['status_selected'] = '%d hunks to be unshelved'
181
190
        self.strings['status_unselected'] = '%d hunks left on shelf'
185
194
        self.strings['prompt'] = 'Unshelve this change? ' \
186
195
            '(%(count)d of %(total)d)'
187
196
        self.strings['end_prompt'] = 'Unshelve these changes?'
188
 
        HunkSelector.__init__(self, patches)
 
197
        HunkSelector.__init__(self, patches, color)