3
from userinteractor import UserInteractor, UserOption
4
from errors import NoColor
10
def __init__(self, patches, color=None):
11
if color is True or color is None:
13
from colordiff import DiffWriter
14
from terminal import has_ansi_colors
16
self.diff_stream = DiffWriter(sys.stdout,
21
self.diff_stream = sys.stdout
24
raise NoBzrtoolsColor()
25
self.diff_stream = sys.stdout
27
self.diff_stream = sys.stdout
29
self.standard_options = [
30
UserOption('y', self._selected, self.strings['select_desc'],
32
UserOption('n', self._unselected, self.strings['unselect_desc']),
33
UserOption('d', UserInteractor.FINISH, 'done, skip to the end.'),
34
UserOption('i', self._invert,
35
'invert the current selection status of all hunks.'),
36
UserOption('s', self._status,
37
'show selection status of all hunks.'),
38
UserOption('q', UserInteractor.QUIT, 'quit')
42
UserOption('y', UserInteractor.FINISH, self.strings['finish_desc'],
44
UserOption('r', UserInteractor.RESTART,
45
'restart the hunk selection loop.'),
46
UserOption('s', self._status,
47
'show selection status of all hunks.'),
48
UserOption('i', self._invert,
49
'invert the current selection status of all hunks.'),
50
UserOption('q', UserInteractor.QUIT, 'quit')
7
def __init__(self, char, action, help, default=False):
10
self.default = default
14
Option('n', 'shelve', 'shelve this change for the moment.',
16
Option('y', 'keep', 'keep this change in your tree.'),
17
Option('d', 'done', 'done, skip to the end.'),
18
Option('i', 'invert', 'invert the current selection of all hunks.'),
19
Option('s', 'status', 'show status of hunks.'),
20
Option('q', 'quit', 'quit')
24
Option('y', 'continue', 'proceed to shelve selected changes.',
26
Option('r', 'restart', 'restart the hunk selection loop.'),
27
Option('s', 'status', 'show status of hunks.'),
28
Option('i', 'invert', 'invert the current selection of all hunks.'),
29
Option('q', 'quit', 'quit')
32
def __init__(self, patches):
53
33
self.patches = patches
54
34
self.total_hunks = 0
56
self.interactor = UserInteractor()
57
self.interactor.set_item_callback(self._hunk_callback)
58
self.interactor.set_start_callback(self._start_callback)
59
self.interactor.set_end_callback(self._end_callback)
61
35
for patch in patches:
62
36
for hunk in patch.hunks:
63
# everything's selected by default
37
# everything's shelved by default
64
38
hunk.selected = True
65
39
self.total_hunks += 1
66
# we need a back pointer in the callbacks
68
self.interactor.add_item(hunk)
70
# Called at the start of the main loop
71
def _start_callback(self):
72
self.last_printed = -1
73
self.interactor.set_prompt(self.strings['prompt'])
74
self.interactor.set_options(self.standard_options)
76
# Called at the end of the item loop, return False to indicate that the
77
# interaction isn't finished and the confirmation prompt should be displayed
78
def _end_callback(self):
80
self.interactor.set_prompt(self.strings['end_prompt'])
81
self.interactor.set_options(self.end_options)
84
# Called once for each hunk
85
def _hunk_callback(self, hunk, count):
86
if self.last_printed != count:
87
self.diff_stream.write(str(hunk.patch.get_header()))
88
self.diff_stream.write(str(hunk))
89
self.last_printed = count
92
self.interactor.get_option('y').default = True
93
self.interactor.get_option('n').default = False
95
self.interactor.get_option('y').default = False
96
self.interactor.get_option('n').default = True
98
# The user chooses to (un)shelve a hunk
99
def _selected(self, hunk):
103
# The user chooses to keep a hunk
104
def _unselected(self, hunk):
105
hunk.selected = False
108
# The user chooses to invert the selection
109
def _invert(self, hunk):
41
def __get_option(self, char):
42
for opt in self.standard_options:
45
raise Exception('Option "%s" not found!' % char)
47
def __select_loop(self):
49
for patch in self.patches:
52
while i < len(patch.hunks):
55
print patch.get_header(), hunk
59
prompt = 'Keep this change? (%d of %d)' \
60
% (j, self.total_hunks)
63
self.__get_option('n').default = True
64
self.__get_option('y').default = False
66
self.__get_option('n').default = False
67
self.__get_option('y').default = True
69
action = self.__ask_user(prompt, self.standard_options)
73
elif action == 'shelve':
75
elif action == 'done':
77
elif action == 'invert':
78
self.__invert_selection()
81
elif action == 'status':
84
elif action == 'quit':
91
if self.total_hunks == 0:
96
if not self.__select_loop():
101
prompt = "Shelve these changes, or restart?"
102
action = self.__ask_user(prompt, self.end_options)
104
if action == 'continue':
107
elif action == 'quit':
109
elif action == 'status':
111
elif action == 'invert':
112
self.__invert_selection()
113
elif action == 'restart':
117
for patch in self.patches:
119
for hunk in patch.hunks:
125
for patch in self.patches:
132
def __invert_selection(self):
110
133
for patch in self.patches:
111
134
for hunk in patch.hunks:
112
135
if hunk.__dict__.has_key('selected'):
113
136
hunk.selected = not hunk.selected
115
138
hunk.selected = True
119
# The user wants to see the status
120
def _status(self, hunk=None):
140
def __show_status(self):
121
141
print '\nStatus:'
122
142
for patch in self.patches:
123
143
print ' %s' % patch.oldname
126
146
for hunk in patch.hunks:
127
147
if hunk.selected:
132
print ' ', self.strings['status_selected'] % selected
133
print ' ', self.strings['status_unselected'] % unselected
152
print ' %d hunks to be shelved' % shelve
153
print ' %d hunks to be kept' % keep
136
# Tell the interactor we're not done with this item
140
if self.total_hunks == 0 or not self.interactor.interact():
141
# False from interact means they chose to quit
144
# Go through each patch and collect all selected/unselected hunks
145
for patch in self.patches:
147
patch.unselected = []
148
for hunk in patch.hunks:
150
patch.selected.append(hunk)
152
patch.unselected.append(hunk)
154
# Now build two lists, one of selected patches the other unselected
155
selected_patches = []
156
unselected_patches = []
158
for patch in self.patches:
159
if len(patch.selected):
160
tmp = copy.copy(patch)
161
tmp.hunks = tmp.selected
164
selected_patches.append(tmp)
166
if len(patch.unselected):
167
tmp = copy.copy(patch)
168
tmp.hunks = tmp.unselected
171
unselected_patches.append(tmp)
173
return (selected_patches, unselected_patches)
175
class ShelveHunkSelector(HunkSelector):
176
def __init__(self, patches, color=None):
178
self.strings['status_selected'] = '%d hunks to be shelved'
179
self.strings['status_unselected'] = '%d hunks to be kept'
180
self.strings['select_desc'] = 'shelve this change.'
181
self.strings['unselect_desc'] = 'keep this change in your tree.'
182
self.strings['finish_desc'] = 'shelve selected changes.'
183
self.strings['prompt'] = 'Shelve this change? (%(count)d of %(total)d)'
184
self.strings['end_prompt'] = 'Shelve these changes?'
185
HunkSelector.__init__(self, patches, color)
187
class UnshelveHunkSelector(HunkSelector):
188
def __init__(self, patches, color=None):
190
self.strings['status_selected'] = '%d hunks to be unshelved'
191
self.strings['status_unselected'] = '%d hunks left on shelf'
192
self.strings['select_desc'] = 'unshelve this change.'
193
self.strings['unselect_desc'] = 'leave this change on the shelf.'
194
self.strings['finish_desc'] = 'unshelve selected changes.'
195
self.strings['prompt'] = 'Unshelve this change? ' \
196
'(%(count)d of %(total)d)'
197
self.strings['end_prompt'] = 'Unshelve these changes?'
198
HunkSelector.__init__(self, patches, color)
156
if sys.platform == "win32":
159
return msvcrt.getche()
164
fd = sys.stdin.fileno()
165
settings = termios.tcgetattr(fd)
168
ch = sys.stdin.read(1)
170
termios.tcsetattr(fd, termios.TCSADRAIN, settings)
173
def __ask_user(self, prompt, options):
175
sys.stdout.write(prompt)
176
sys.stdout.write(' [')
180
sys.stdout.write(opt.char)
181
sys.stdout.write('?] (%s): ' % default.char)
183
response = self.__getchar()
185
# default, which we see as newline, is 'n'
186
if response in ['\n', '\r', '\r\n']:
187
response = default.char
189
print response # because echo is off
192
if opt.char == response:
196
print ' %s - %s' % (opt.char, opt.help)
added
removed
hunk_selector.py
