← 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-07-13 13:25:20 UTC
  • Revision ID: abentley@panoramicfeedback.com-20060713132520-2fabfab51affb82f
Update clean-tree docs

Show diffs side-by-side

added added

removed removed

Lines of Context:
hunk_selector.py
 
1
#!/usr/bin/python
 
2
 
1
3
import sys
2
4
 
3
5
from userinteractor import UserInteractor, UserOption
4
 
from errors import NoColor
5
6
import copy
6
7
 
7
8
class HunkSelector:
8
9
    strings = {}
9
10
 
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
 
                                                  check_style=False)
18
 
                else:
19
 
                    if color is True:
20
 
                        raise NoColor()
21
 
                    self.diff_stream = sys.stdout
22
 
            except ImportError:
23
 
                if color is True:
24
 
                    raise NoBzrtoolsColor()
 
11
    def __init__(self, patches):
 
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:
25
18
                self.diff_stream = sys.stdout
26
 
        else:
 
19
        except ImportError:
27
20
            self.diff_stream = sys.stdout
28
 
            
29
21
        self.standard_options = [
30
22
            UserOption('y', self._selected, self.strings['select_desc'],
31
23
                default=True),
173
165
        return (selected_patches, unselected_patches)
174
166
 
175
167
class ShelveHunkSelector(HunkSelector):
176
 
    def __init__(self, patches, color=None):
 
168
    def __init__(self, patches):
177
169
        self.strings = {}
178
170
        self.strings['status_selected'] = '%d hunks to be shelved'
179
171
        self.strings['status_unselected'] = '%d hunks to be kept'
182
174
        self.strings['finish_desc'] = 'shelve selected changes.'
183
175
        self.strings['prompt'] = 'Shelve this change? (%(count)d of %(total)d)'
184
176
        self.strings['end_prompt'] = 'Shelve these changes?'
185
 
        HunkSelector.__init__(self, patches, color)
 
177
        HunkSelector.__init__(self, patches)
186
178
 
187
179
class UnshelveHunkSelector(HunkSelector):
188
 
    def __init__(self, patches, color=None):
 
180
    def __init__(self, patches):
189
181
        self.strings = {}
190
182
        self.strings['status_selected'] = '%d hunks to be unshelved'
191
183
        self.strings['status_unselected'] = '%d hunks left on shelf'
195
187
        self.strings['prompt'] = 'Unshelve this change? ' \
196
188
            '(%(count)d of %(total)d)'
197
189
        self.strings['end_prompt'] = 'Unshelve these changes?'
198
 
        HunkSelector.__init__(self, patches, color)
 
190
        HunkSelector.__init__(self, patches)